diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
| commit | 0a759b2466d19c619257fec36f988f93424cf3ae (patch) | |
| tree | 910e531540bda17c484b53b89fb2f1d6dd41a454 /arch/m68k/include/asm/uaccess.h | |
| parent | 78d4a42069b4815040a857a4e9bb0e4fb0aa1dc8 (diff) | |
| parent | 77a42796786c2ea2d3a67262fb5f1f707c3e0594 (diff) | |
| download | op-kernel-dev-0a759b2466d19c619257fec36f988f93424cf3ae.zip op-kernel-dev-0a759b2466d19c619257fec36f988f93424cf3ae.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- __put_user_unaligned may/will be used by btrfs
- m68k part of a global cleanup"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove deprecated IRQF_DISABLED
m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
Diffstat (limited to 'arch/m68k/include/asm/uaccess.h')
| -rw-r--r-- | arch/m68k/include/asm/uaccess.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess.h index 639c731..3fadc4a 100644 --- a/arch/m68k/include/asm/uaccess.h +++ b/arch/m68k/include/asm/uaccess.h @@ -3,3 +3,10 @@ #else #include <asm/uaccess_mm.h> #endif + +#ifdef CONFIG_CPU_HAS_NO_UNALIGNED +#include <asm-generic/uaccess-unaligned.h> +#else +#define __get_user_unaligned(x, ptr) __get_user((x), (ptr)) +#define __put_user_unaligned(x, ptr) __put_user((x), (ptr)) +#endif |
