diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 15:17:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 15:17:16 -0700 |
| commit | 3ee3723b40d55f473b8c82c60ed0e67f1f9ec6b9 (patch) | |
| tree | bf6539d49582552ce4904e589a3f07abdc0167dc /arch/m68k/amiga/config.c | |
| parent | Merge tag 'x86-vdso-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | m68k: tools: Replace zero-length array with flexible-array member (diff) | |
| download | linux-dev-3ee3723b40d55f473b8c82c60ed0e67f1f9ec6b9.tar.xz linux-dev-3ee3723b40d55f473b8c82c60ed0e67f1f9ec6b9.zip | |
Merge tag 'm68k-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- several Mac fixes
- defconfig updates
- minor cleanups and fixes
* tag 'm68k-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: tools: Replace zero-length array with flexible-array member
m68k: Add missing __user annotation in get_user()
m68k: mac: Avoid stuck ISM IOP interrupt on Quadra 900/950
m68k: mac: Remove misleading comment
m68k: mac: Don't call via_flush_cache() on Mac IIfx
m68k: defconfig: Update defconfigs for v5.7-rc1
m68k: amiga: config: Replace zero-length array with flexible-array member
m68k: amiga: config: Mark expected switch fall-through
Diffstat (limited to 'arch/m68k/amiga/config.c')
| -rw-r--r-- | arch/m68k/amiga/config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index c32ab8041cf6..4eb911d64e8d 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -221,6 +221,7 @@ static void __init amiga_identify(void) case AMI_1200: AMIGAHW_SET(A1200_IDE); AMIGAHW_SET(PCMCIA); + fallthrough; case AMI_500: case AMI_500PLUS: case AMI_1000: @@ -233,7 +234,7 @@ static void __init amiga_identify(void) case AMI_3000T: AMIGAHW_SET(AMBER_FF); AMIGAHW_SET(MAGIC_REKICK); - /* fall through */ + fallthrough; case AMI_3000PLUS: AMIGAHW_SET(A3000_SCSI); AMIGAHW_SET(A3000_CLK); @@ -242,7 +243,7 @@ static void __init amiga_identify(void) case AMI_4000T: AMIGAHW_SET(A4000_SCSI); - /* fall through */ + fallthrough; case AMI_4000: AMIGAHW_SET(A4000_IDE); AMIGAHW_SET(A3000_CLK); @@ -628,7 +629,7 @@ struct savekmsg { unsigned long magic2; /* SAVEKMSG_MAGIC2 */ unsigned long magicptr; /* address of magic1 */ unsigned long size; - char data[0]; + char data[]; }; static struct savekmsg *savekmsg; |