[PATCH] x86: Fix sys_call_table type in asm/syscall.h

[PATCH] x86: Fix sys_call_table type in asm/syscall.h

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

Make the sys_call_table type defined in asm/syscall.h match
the definition in syscall_64.c

Cc: x86@kernel.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 arch/x86/include/asm/syscall.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index c4a348f..32295b7 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -16,7 +16,8 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 
-extern const unsigned long sys_call_table[];
+typedef void (*sys_call_ptr_t)(void);
+extern const sys_call_ptr_t sys_call_table[];
 
 /*
  * Only the low 32 bits of orig_ax are meaningful, so we return int.
-- 
1.7.4.4

Re: [PATCH] x86: Fix sys_call_table type in asm/syscall.h

[Ingo Molnar]

* Andi Kleen <andi@firstfloor.org> wrote:

> From: Andi Kleen <ak@linux.intel.com>
> 
> Make the sys_call_table type defined in asm/syscall.h match
> the definition in syscall_64.c
> 
> Cc: x86@kernel.org
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
>  arch/x86/include/asm/syscall.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
> index c4a348f..32295b7 100644
> --- a/arch/x86/include/asm/syscall.h
> +++ b/arch/x86/include/asm/syscall.h
> @@ -16,7 +16,8 @@
>  #include <linux/sched.h>
>  #include <linux/err.h>
>  
> -extern const unsigned long sys_call_table[];
> +typedef void (*sys_call_ptr_t)(void);
> +extern const sys_call_ptr_t sys_call_table[];
>  
>  /*
>   * Only the low 32 bits of orig_ax are meaningful, so we return int.

There's an obvious problem with this patch, please fix it and resend.

Thanks,

	Ingo

Re: [PATCH] x86: Fix sys_call_table type in asm/syscall.h

[Andi Kleen]

> There's an obvious problem with this patch, please fix it and resend.

Nothing obvious to me. Can you be more specific?

-Andi

Re: [PATCH] x86: Fix sys_call_table type in asm/syscall.h

[Ingo Molnar]

* Andi Kleen <andi@firstfloor.org> wrote:

> > There's an obvious problem with this patch, please fix it and resend.
> 
> Nothing obvious to me. Can you be more specific?

Sure, a trivial git grep of the sys_call_ptr_t typedef you added to 
syscall.h shows:

 ~/tip> git grep sys_call_ptr_t
 arch/um/sys-x86_64/syscall_table.c:typedef void (*sys_call_ptr_t)(void);
 arch/x86/include/asm/syscall.h:typedef void (*sys_call_ptr_t)(void);
 arch/x86/kernel/syscall_64.c:typedef void (*sys_call_ptr_t)(void);

So you've now added a third typedef in addition to the two existing 
ones. We obivously only want one in the kernel - the one you added to 
the header file.

Thanks,

	Ingo