From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755434Ab1G1Pyn (ORCPT ); Thu, 28 Jul 2011 11:54:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14184 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755958Ab1G1Pyj (ORCPT ); Thu, 28 Jul 2011 11:54:39 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells Subject: [PATCH 30/40] UAPI: Fix x86_64 system call count and generation [ver #3] To: torvalds@osdl.org Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, David Howells Date: Thu, 28 Jul 2011 16:54:05 +0100 Message-ID: <20110728155405.16618.5376.stgit@warthog.procyon.org.uk> In-Reply-To: <20110728154920.16618.89358.stgit@warthog.procyon.org.uk> References: <20110728154920.16618.89358.stgit@warthog.procyon.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The x86_64 system call count and system call pointer table are generated by #undef'ing the guard on asm/unistd.h and reincluding it with the __SYSCALL() macro suitably set. To achieve this once the header has been split, the UAPI header guard must also be #undef'd. Signed-off-by: David Howells --- arch/x86/kernel/asm-offsets_64.c | 1 + arch/x86/kernel/syscall_64.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index e72a119..8cad3e3 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -3,6 +3,7 @@ #define __NO_STUBS 1 #undef __SYSCALL #undef _ASM_X86_UNISTD_64_H +#undef _UAPI_ASM_X86_UNISTD_64_H #define __SYSCALL(nr, sym) [nr] = 1, static char syscalls[] = { #include diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c index de87d60..b659abc 100644 --- a/arch/x86/kernel/syscall_64.c +++ b/arch/x86/kernel/syscall_64.c @@ -9,11 +9,13 @@ #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; #undef _ASM_X86_UNISTD_64_H +#undef _UAPI_ASM_X86_UNISTD_64_H #include #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, #undef _ASM_X86_UNISTD_64_H +#undef _UAPI_ASM_X86_UNISTD_64_H typedef void (*sys_call_ptr_t)(void);