diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-09 05:30:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-09 05:30:59 -0700 |
| commit | b873ed19e54be342f6e2f10c5e7900db56f5ed7f (patch) | |
| tree | 56743addfe1f4103486aa396ba031e3fc2646520 /include | |
| parent | 583bcb779ef58645b108d2bb9a5b294d3336de9c (diff) | |
| parent | 820447aa8bd2e3824f6ea0237e4283c25615ea18 (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/pal.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-alpha/pal.h b/include/asm-alpha/pal.h index 510d13326de4..9b4ba0d6f00b 100644 --- a/include/asm-alpha/pal.h +++ b/include/asm-alpha/pal.h @@ -45,7 +45,7 @@ #define PAL_wrperfmon 57 #define PAL_rdusp 58 #define PAL_whami 60 -#define PAL_rtsys 61 +#define PAL_retsys 61 #define PAL_rti 63 #endif /* __ALPHA_PAL_H */ diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 363f1477ac16..e35f02b4713b 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -331,19 +331,19 @@ #define __NR_removexattr 391 #define __NR_lremovexattr 392 #define __NR_fremovexattr 393 -#define __NR_futex 394 -#define __NR_sched_setaffinity 395 -#define __NR_sched_getaffinity 396 -#define __NR_tuxcall 397 -#define __NR_io_setup 398 -#define __NR_io_destroy 399 -#define __NR_io_getevents 400 -#define __NR_io_submit 401 -#define __NR_io_cancel 402 -#define __NR_alloc_hugepages 403 -#define __NR_free_hugepages 404 -#define __NR_exit_group 405 - +#define __NR_futex 394 +#define __NR_sched_setaffinity 395 +#define __NR_sched_getaffinity 396 +#define __NR_tuxcall 397 +#define __NR_io_setup 398 +#define __NR_io_destroy 399 +#define __NR_io_getevents 400 +#define __NR_io_submit 401 +#define __NR_io_cancel 402 +#define __NR_alloc_hugepages 403 +#define __NR_free_hugepages 404 +#define __NR_exit_group 405 +#define NR_SYSCALLS 406 #if defined(__GNUC__) @@ -598,7 +598,7 @@ static inline pid_t waitpid(int pid, int * wait_stat, int flags) return sys_wait4(pid, wait_stat, flags, NULL); } -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls |