diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-m68k/unistd.h | 4 | ||||
-rw-r--r-- | include/linux/dio.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index 965abb8bc7ff..3c19027331fa 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h | |||
@@ -5,6 +5,7 @@ | |||
5 | * This file contains the system call numbers. | 5 | * This file contains the system call numbers. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #define __NR_restart_syscall 0 | ||
8 | #define __NR_exit 1 | 9 | #define __NR_exit 1 |
9 | #define __NR_fork 2 | 10 | #define __NR_fork 2 |
10 | #define __NR_read 3 | 11 | #define __NR_read 3 |
@@ -359,9 +360,6 @@ | |||
359 | #define __ARCH_WANT_SYS_SIGPROCMASK | 360 | #define __ARCH_WANT_SYS_SIGPROCMASK |
360 | #define __ARCH_WANT_SYS_RT_SIGACTION | 361 | #define __ARCH_WANT_SYS_RT_SIGACTION |
361 | 362 | ||
362 | /* whitelist for checksyscalls */ | ||
363 | #define __IGNORE_restart_syscall | ||
364 | |||
365 | /* | 363 | /* |
366 | * "Conditional" syscalls | 364 | * "Conditional" syscalls |
367 | * | 365 | * |
diff --git a/include/linux/dio.h b/include/linux/dio.h index 1e65ebc2a3db..b2dd31ca1710 100644 --- a/include/linux/dio.h +++ b/include/linux/dio.h | |||
@@ -241,7 +241,7 @@ struct dio_driver { | |||
241 | 241 | ||
242 | extern int dio_find(int deviceid); | 242 | extern int dio_find(int deviceid); |
243 | extern unsigned long dio_scodetophysaddr(int scode); | 243 | extern unsigned long dio_scodetophysaddr(int scode); |
244 | extern void dio_create_sysfs_dev_files(struct dio_dev *); | 244 | extern int dio_create_sysfs_dev_files(struct dio_dev *); |
245 | 245 | ||
246 | /* New-style probing */ | 246 | /* New-style probing */ |
247 | extern int dio_register_driver(struct dio_driver *); | 247 | extern int dio_register_driver(struct dio_driver *); |