diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 13:02:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 13:02:24 -0500 |
| commit | eaa0eda56223815cd9dc1225f715ff673ae77198 (patch) | |
| tree | 12ed5208dda2ecbf2a652d6c54f83c58f362707d /arch/m68k | |
| parent | cad3ab5883b35b044200820bf2e1fbabe742740a (diff) | |
| parent | 643165c8bbc8617d8222cb50c89e34fe64d226cf (diff) | |
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic uaccess.h cleanup from Arnd Bergmann:
"Like in 3.19, I once more have a multi-stage cleanup for one
asm-generic header file, this time the work was done by Michael
Tsirkin and cleans up the uaccess.h file in asm-generic, as well as
all architectures for which the respective maintainers did not pick up
his patches directly"
* tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (37 commits)
sparc32: nocheck uaccess coding style tweaks
sparc64: nocheck uaccess coding style tweaks
xtensa: macro whitespace fixes
sh: macro whitespace fixes
parisc: macro whitespace fixes
m68k: macro whitespace fixes
m32r: macro whitespace fixes
frv: macro whitespace fixes
cris: macro whitespace fixes
avr32: macro whitespace fixes
arm64: macro whitespace fixes
arm: macro whitespace fixes
alpha: macro whitespace fixes
blackfin: macro whitespace fixes
sparc64: uaccess_64 macro whitespace fixes
sparc32: uaccess_32 macro whitespace fixes
avr32: whitespace fix
sh: fix put_user sparse errors
metag: fix put_user sparse errors
ia64: fix put_user sparse errors
...
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/segment.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/uaccess_mm.h | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h index 0fa80e97ed2d..98216b8111f0 100644 --- a/arch/m68k/include/asm/segment.h +++ b/arch/m68k/include/asm/segment.h | |||
| @@ -58,7 +58,7 @@ static inline mm_segment_t get_ds(void) | |||
| 58 | #define set_fs(x) (current_thread_info()->addr_limit = (x)) | 58 | #define set_fs(x) (current_thread_info()->addr_limit = (x)) |
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||
| 61 | #define segment_eq(a,b) ((a).seg == (b).seg) | 61 | #define segment_eq(a, b) ((a).seg == (b).seg) |
| 62 | 62 | ||
| 63 | #endif /* __ASSEMBLY__ */ | 63 | #endif /* __ASSEMBLY__ */ |
| 64 | 64 | ||
diff --git a/arch/m68k/include/asm/uaccess_mm.h b/arch/m68k/include/asm/uaccess_mm.h index 15901db435b9..d228601b3afc 100644 --- a/arch/m68k/include/asm/uaccess_mm.h +++ b/arch/m68k/include/asm/uaccess_mm.h | |||
| @@ -128,25 +128,25 @@ asm volatile ("\n" \ | |||
| 128 | #define put_user(x, ptr) __put_user(x, ptr) | 128 | #define put_user(x, ptr) __put_user(x, ptr) |
| 129 | 129 | ||
| 130 | 130 | ||
| 131 | #define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({ \ | 131 | #define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({ \ |
| 132 | type __gu_val; \ | 132 | type __gu_val; \ |
| 133 | asm volatile ("\n" \ | 133 | asm volatile ("\n" \ |
| 134 | "1: "MOVES"."#bwl" %2,%1\n" \ | 134 | "1: "MOVES"."#bwl" %2,%1\n" \ |
| 135 | "2:\n" \ | 135 | "2:\n" \ |
| 136 | " .section .fixup,\"ax\"\n" \ | 136 | " .section .fixup,\"ax\"\n" \ |
| 137 | " .even\n" \ | 137 | " .even\n" \ |
| 138 | "10: move.l %3,%0\n" \ | 138 | "10: move.l %3,%0\n" \ |
| 139 | " sub.l %1,%1\n" \ | 139 | " sub.l %1,%1\n" \ |
| 140 | " jra 2b\n" \ | 140 | " jra 2b\n" \ |
| 141 | " .previous\n" \ | 141 | " .previous\n" \ |
| 142 | "\n" \ | 142 | "\n" \ |
| 143 | " .section __ex_table,\"a\"\n" \ | 143 | " .section __ex_table,\"a\"\n" \ |
| 144 | " .align 4\n" \ | 144 | " .align 4\n" \ |
| 145 | " .long 1b,10b\n" \ | 145 | " .long 1b,10b\n" \ |
| 146 | " .previous" \ | 146 | " .previous" \ |
| 147 | : "+d" (res), "=&" #reg (__gu_val) \ | 147 | : "+d" (res), "=&" #reg (__gu_val) \ |
| 148 | : "m" (*(ptr)), "i" (err)); \ | 148 | : "m" (*(ptr)), "i" (err)); \ |
| 149 | (x) = (typeof(*(ptr)))(unsigned long)__gu_val; \ | 149 | (x) = (__force typeof(*(ptr)))(__force unsigned long)__gu_val; \ |
| 150 | }) | 150 | }) |
| 151 | 151 | ||
| 152 | #define __get_user(x, ptr) \ | 152 | #define __get_user(x, ptr) \ |
| @@ -188,7 +188,7 @@ asm volatile ("\n" \ | |||
| 188 | "+a" (__gu_ptr) \ | 188 | "+a" (__gu_ptr) \ |
| 189 | : "i" (-EFAULT) \ | 189 | : "i" (-EFAULT) \ |
| 190 | : "memory"); \ | 190 | : "memory"); \ |
| 191 | (x) = (typeof(*(ptr)))__gu_val; \ | 191 | (x) = (__force typeof(*(ptr)))__gu_val; \ |
| 192 | break; \ | 192 | break; \ |
| 193 | } */ \ | 193 | } */ \ |
| 194 | default: \ | 194 | default: \ |