Commit cbbb5f84 authored by David Mosberger's avatar David Mosberger

Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
parents b1b782f7 8bb62dfa
...@@ -1245,7 +1245,7 @@ sys_call_table: ...@@ -1245,7 +1245,7 @@ sys_call_table:
data8 sys_alloc_hugepages data8 sys_alloc_hugepages
data8 sys_free_hugepages // 1235 data8 sys_free_hugepages // 1235
data8 sys_exit_group data8 sys_exit_group
data8 ia64_ni_syscall data8 sys_lookup_dcookie
data8 sys_io_setup data8 sys_io_setup
data8 sys_io_destroy data8 sys_io_destroy
data8 sys_io_getevents // 1240 data8 sys_io_getevents // 1240
......
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
#define __NR_alloc_hugepages 1234 #define __NR_alloc_hugepages 1234
#define __NR_free_hugepages 1235 #define __NR_free_hugepages 1235
#define __NR_exit_group 1236 #define __NR_exit_group 1236
/* 1237 currently unused */ #define __NR_lookup_dcookie 1237
#define __NR_io_setup 1238 #define __NR_io_setup 1238
#define __NR_io_destroy 1239 #define __NR_io_destroy 1239
#define __NR_io_getevents 1240 #define __NR_io_getevents 1240
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment