diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 21:13:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 21:13:02 -0400 |
| commit | 44a5085162f3d3231b359784319a207032e09523 (patch) | |
| tree | 8edc17bb33586f4e05b06af8155ea8896bed6346 /include | |
| parent | 27d30b0f4e0c8e63f48ef400a64fc073b71bfe59 (diff) | |
| parent | 54f565ea895b383b67a2d6e31d2e2fcac5e6c345 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix TIF_USEDFPU flag atomicity
[SPARC64]: Fix atomicity of TIF update in flush_thread()
[BW2]: Fix section mismatch warnings.
[CG14]: Fix section mismatch warnings.
[SPARC]: We do not need OLD_GETRLIMIT.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index d5b2f8053b3b..16098acfe300 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -345,7 +345,6 @@ | |||
| 345 | #define __ARCH_WANT_SYS_GETPGRP | 345 | #define __ARCH_WANT_SYS_GETPGRP |
| 346 | #define __ARCH_WANT_SYS_LLSEEK | 346 | #define __ARCH_WANT_SYS_LLSEEK |
| 347 | #define __ARCH_WANT_SYS_NICE | 347 | #define __ARCH_WANT_SYS_NICE |
| 348 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | ||
| 349 | #define __ARCH_WANT_SYS_OLDUMOUNT | 348 | #define __ARCH_WANT_SYS_OLDUMOUNT |
| 350 | #define __ARCH_WANT_SYS_SIGPENDING | 349 | #define __ARCH_WANT_SYS_SIGPENDING |
| 351 | #define __ARCH_WANT_SYS_SIGPROCMASK | 350 | #define __ARCH_WANT_SYS_SIGPROCMASK |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 47047536f261..a9f7bd9ca38c 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -359,7 +359,6 @@ | |||
| 359 | #define __ARCH_WANT_SYS_GETPGRP | 359 | #define __ARCH_WANT_SYS_GETPGRP |
| 360 | #define __ARCH_WANT_SYS_LLSEEK | 360 | #define __ARCH_WANT_SYS_LLSEEK |
| 361 | #define __ARCH_WANT_SYS_NICE | 361 | #define __ARCH_WANT_SYS_NICE |
| 362 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | ||
| 363 | #define __ARCH_WANT_SYS_OLDUMOUNT | 362 | #define __ARCH_WANT_SYS_OLDUMOUNT |
| 364 | #define __ARCH_WANT_SYS_SIGPENDING | 363 | #define __ARCH_WANT_SYS_SIGPENDING |
| 365 | #define __ARCH_WANT_SYS_SIGPROCMASK | 364 | #define __ARCH_WANT_SYS_SIGPROCMASK |