diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-01 11:05:23 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 11:05:23 +0200 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /include/asm-powerpc | |
| parent | [PATCH] remove powerpc bitops in favor of existing generic bitops (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-c029cc66cb3d83f70c02e0c182f0eed1419f8020.tar.xz linux-c029cc66cb3d83f70c02e0c182f0eed1419f8020.zip | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/termbits.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/unistd.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h index ebf6055481dc..6d533b07aaf5 100644 --- a/include/asm-powerpc/termbits.h +++ b/include/asm-powerpc/termbits.h @@ -153,6 +153,7 @@ struct termios { #define HUPCL 00040000 #define CLOCAL 00100000 +#define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 908acb44cb8a..edde2462bf52 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -321,8 +321,10 @@ #define __NR_readlinkat 296 #define __NR_fchmodat 297 #define __NR_faccessat 298 +#define __NR_get_robust_list 299 +#define __NR_set_robust_list 300 -#define __NR_syscalls 299 +#define __NR_syscalls 301 #ifdef __KERNEL__ #define __NR__exit __NR_exit |