The ia32 perfctr syscalls were moved due to addition of ioprio
syscalls, but the ia32 emulation code in x86-64 wasn't updated.
Simple fix below.

Signed-off-by: Mikael Pettersson <[EMAIL PROTECTED]>

/Mikael

 arch/x86_64/ia32/ia32entry.S     |    4 +++-
 include/asm-x86_64/ia32_unistd.h |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff -rupN linux-2.6.11-mm3/arch/x86_64/ia32/ia32entry.S 
linux-2.6.11-mm3.perfctr-x86_64-ia32-syscalls-fixes/arch/x86_64/ia32/ia32entry.S
--- linux-2.6.11-mm3/arch/x86_64/ia32/ia32entry.S       2005-03-12 
19:26:24.000000000 +0100
+++ 
linux-2.6.11-mm3.perfctr-x86_64-ia32-syscalls-fixes/arch/x86_64/ia32/ia32entry.S
    2005-03-12 19:53:32.000000000 +0100
@@ -595,8 +595,10 @@ ia32_sys_call_table:
        .quad sys_add_key
        .quad sys_request_key
        .quad sys_keyctl
+       .quad quiet_ni_syscall          /* sys_ioprio_set */
+       .quad quiet_ni_syscall          /* sys_ioprio_get */    /* 290 */
        .quad sys_vperfctr_open
-       .quad sys_vperfctr_control      /* 290 */
+       .quad sys_vperfctr_control
        .quad sys_vperfctr_write
        .quad sys_vperfctr_read
        /* don't forget to change IA32_NR_syscalls */
diff -rupN linux-2.6.11-mm3/include/asm-x86_64/ia32_unistd.h 
linux-2.6.11-mm3.perfctr-x86_64-ia32-syscalls-fixes/include/asm-x86_64/ia32_unistd.h
--- linux-2.6.11-mm3/include/asm-x86_64/ia32_unistd.h   2005-03-12 
19:26:26.000000000 +0100
+++ 
linux-2.6.11-mm3.perfctr-x86_64-ia32-syscalls-fixes/include/asm-x86_64/ia32_unistd.h
        2005-03-12 19:53:32.000000000 +0100
@@ -294,11 +294,11 @@
 #define __NR_ia32_add_key              286
 #define __NR_ia32_request_key  287
 #define __NR_ia32_keyctl               288
-#define __NR_ia32_vperfctr_open                289
+#define __NR_ia32_vperfctr_open                291
 #define __NR_ia32_vperfctr_control     (__NR_ia32_vperfctr_open+1)
 #define __NR_ia32_vperfctr_write       (__NR_ia32_vperfctr_open+2)
 #define __NR_ia32_vperfctr_read                (__NR_ia32_vperfctr_open+3)
 
-#define IA32_NR_syscalls 293   /* must be > than biggest syscall! */
+#define IA32_NR_syscalls 295   /* must be > than biggest syscall! */
 
 #endif /* _ASM_X86_64_IA32_UNISTD_H_ */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to