From: Mikael Pettersson <mikpe@csd.uu.se> The perfctr syscall numbers changed in the i386 kernel recently, but the x86-64 kernel's ia32 emulation was not updated at the same time. This patch fixes that. Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> --- 25-akpm/arch/x86_64/ia32/ia32entry.S | 6 +++++- 25-akpm/include/asm-x86_64/ia32_unistd.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff -puN arch/x86_64/ia32/ia32entry.S~perfctr-x86-64-ia32-emulation-fix arch/x86_64/ia32/ia32entry.S --- 25/arch/x86_64/ia32/ia32entry.S~perfctr-x86-64-ia32-emulation-fix 2004-10-24 23:26:31.995520104 -0700 +++ 25-akpm/arch/x86_64/ia32/ia32entry.S 2004-10-24 23:26:32.000519344 -0700 @@ -587,8 +587,12 @@ ia32_sys_call_table: .quad compat_sys_mq_getsetattr .quad quiet_ni_syscall /* reserved for kexec */ .quad sys32_waitid + .quad quiet_ni_syscall /* sys_setaltroot */ /* 285 */ + .quad quiet_ni_syscall /* add_key */ + .quad quiet_ni_syscall /* request_key */ + .quad quiet_ni_syscall /* keyctl */ .quad sys_perfctr_info - .quad sys_vperfctr_open + .quad sys_vperfctr_open /* 290 */ .quad sys_vperfctr_control .quad sys_vperfctr_unlink .quad sys_vperfctr_iresume diff -puN include/asm-x86_64/ia32_unistd.h~perfctr-x86-64-ia32-emulation-fix include/asm-x86_64/ia32_unistd.h --- 25/include/asm-x86_64/ia32_unistd.h~perfctr-x86-64-ia32-emulation-fix 2004-10-24 23:26:31.997519800 -0700 +++ 25-akpm/include/asm-x86_64/ia32_unistd.h 2004-10-24 23:26:32.001519192 -0700 @@ -290,13 +290,13 @@ #define __NR_ia32_mq_getsetattr (__NR_ia32_mq_open+5) #define __NR_ia32_kexec 283 #define __NR_ia32_waitid 284 -#define __NR_ia32_perfctr_info 285 +#define __NR_ia32_perfctr_info 289 #define __NR_ia32_vperfctr_open (__NR_ia32_perfctr_info+1) #define __NR_ia32_vperfctr_control (__NR_ia32_perfctr_info+2) #define __NR_ia32_vperfctr_unlink (__NR_ia32_perfctr_info+3) #define __NR_ia32_vperfctr_iresume (__NR_ia32_perfctr_info+4) #define __NR_ia32_vperfctr_read (__NR_ia32_perfctr_info+5) -#define IA32_NR_syscalls 291 /* must be > than biggest syscall! */ +#define IA32_NR_syscalls 295 /* must be > than biggest syscall! */ #endif /* _ASM_X86_64_IA32_UNISTD_H_ */ _