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/include | |
parent | 4e909124f8ed54b13e07e42273c3452b7deb5a0b (diff) | |
parent | 3381df0954199458fa3993db72fb427f0ed1e43b (diff) |
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/include')
-rw-r--r-- | arch/m68k/include/asm/mac_via.h | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/uaccess_mm.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/mac_via.h b/arch/m68k/include/asm/mac_via.h index de1470c4d829..1149251ea58d 100644 --- a/arch/m68k/include/asm/mac_via.h +++ b/arch/m68k/include/asm/mac_via.h @@ -257,6 +257,7 @@ extern int rbv_present,via_alt_mapping; struct irq_desc; +extern void via_l2_flush(int writeback); extern void via_register_interrupts(void); extern void via_irq_enable(int); extern void via_irq_disable(int); diff --git a/arch/m68k/include/asm/uaccess_mm.h b/arch/m68k/include/asm/uaccess_mm.h index 7e85de984df1..9ae9f8d05925 100644 --- a/arch/m68k/include/asm/uaccess_mm.h +++ b/arch/m68k/include/asm/uaccess_mm.h @@ -142,7 +142,7 @@ asm volatile ("\n" \ __get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \ break; \ case 8: { \ - const void *__gu_ptr = (ptr); \ + const void __user *__gu_ptr = (ptr); \ union { \ u64 l; \ __typeof__(*(ptr)) t; \ |