diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
commit | cee4cca740d209bcb4b9857baa2253d5ba4e3fbe (patch) | |
tree | 88a23004393ea4a32cad79839479c8e653e401d6 /include/asm-m32r/unistd.h | |
parent | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (diff) | |
parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) |
Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
[S390] __FD_foo definitions.
Switch to __s32 types in joystick.h instead of C99 types for consistency.
Add <sys/types.h> to headers included for userspace in <linux/input.h>
Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
Remove struct fddi_statistics from user view in <linux/if_fddi.h>
Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
Use __uXX types in <linux/divert.h> for struct divert_blk et al.
Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
Use __uXX types in user-visible structures in <linux/nbd.h>
Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
Use __uXX types for S390 DASD volume label definitions which are user-visible
S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
Fix private integer types used in V4L2 ioctls.
...
Manually resolve conflict in include/linux/mtd/physmap.h
Diffstat (limited to 'include/asm-m32r/unistd.h')
-rw-r--r-- | include/asm-m32r/unistd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index be0eb014c3b0..cc31790d8077 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h | |||
@@ -295,6 +295,8 @@ | |||
295 | #define __NR_kexec_load 283 | 295 | #define __NR_kexec_load 283 |
296 | #define __NR_waitid 284 | 296 | #define __NR_waitid 284 |
297 | 297 | ||
298 | #ifdef __KERNEL__ | ||
299 | |||
298 | #define NR_syscalls 285 | 300 | #define NR_syscalls 285 |
299 | 301 | ||
300 | /* user-visible error numbers are in the range -1 - -124: see | 302 | /* user-visible error numbers are in the range -1 - -124: see |
@@ -405,7 +407,6 @@ __asm__ __volatile__ (\ | |||
405 | __syscall_return(type,__res); \ | 407 | __syscall_return(type,__res); \ |
406 | } | 408 | } |
407 | 409 | ||
408 | #ifdef __KERNEL__ | ||
409 | #define __ARCH_WANT_IPC_PARSE_VERSION | 410 | #define __ARCH_WANT_IPC_PARSE_VERSION |
410 | #define __ARCH_WANT_STAT64 | 411 | #define __ARCH_WANT_STAT64 |
411 | #define __ARCH_WANT_SYS_ALARM | 412 | #define __ARCH_WANT_SYS_ALARM |
@@ -421,7 +422,6 @@ __syscall_return(type,__res); \ | |||
421 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/ | 422 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/ |
422 | #define __ARCH_WANT_SYS_OLDUMOUNT | 423 | #define __ARCH_WANT_SYS_OLDUMOUNT |
423 | #define __ARCH_WANT_SYS_RT_SIGACTION | 424 | #define __ARCH_WANT_SYS_RT_SIGACTION |
424 | #endif | ||
425 | 425 | ||
426 | #ifdef __KERNEL_SYSCALLS__ | 426 | #ifdef __KERNEL_SYSCALLS__ |
427 | 427 | ||
@@ -470,4 +470,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
470 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 470 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
471 | #endif | 471 | #endif |
472 | 472 | ||
473 | #endif /* __KERNEL__ */ | ||
473 | #endif /* _ASM_M32R_UNISTD_H */ | 474 | #endif /* _ASM_M32R_UNISTD_H */ |