scummvm random work
[patches.git] / linux-move-cond-syscall-to-kernel.patch
1 diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h
2 index 4df8790..0df9f2d 100644
3 --- a/include/asm-blackfin/unistd.h
4 +++ b/include/asm-blackfin/unistd.h
5 @@ -369,7 +369,6 @@
6 #define __ARCH_WANT_SYS_NICE
7 #define __ARCH_WANT_SYS_RT_SIGACTION
8 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
9 -#endif
10
11 /*
12 * "Conditional" syscalls
13 @@ -379,4 +378,6 @@
14 */
15 #define cond_syscall(x) asm(".weak\t_" #x "\n\t.set\t_" #x ",_sys_ni_syscall");
16
17 +#endif /* __KERNEL__ */
18 +
19 #endif /* __ASM_BFIN_UNISTD_H */
20 diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
21 index ae1ed05..f5d627c 100644
22 --- a/include/asm-x86_64/unistd.h
23 +++ b/include/asm-x86_64/unistd.h
24 @@ -674,6 +674,7 @@ asmlinkage long sys_rt_sigaction(int sig,
25 #endif /* __KERNEL__ */
26 #endif /* __NO_STUBS */
27
28 +#ifdef __KERNEL__
29 /*
30 * "Conditional" syscalls
31 *
32 @@ -681,5 +682,6 @@ asmlinkage long sys_rt_sigaction(int sig,
33 * but it doesn't work on all toolchains, so we just do it by hand
34 */
35 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
36 +#endif /* __KERNEL__ */
37
38 #endif /* _ASM_X86_64_UNISTD_H_ */