git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
syscall_64.c
diff --git
a/arch/x86/kernel/syscall_64.c
b/arch/x86/kernel/syscall_64.c
index
170d43c
..
3d1be4f
100644
(file)
--- a/
arch/x86/kernel/syscall_64.c
+++ b/
arch/x86/kernel/syscall_64.c
@@
-8,12
+8,12
@@
#define __NO_STUBS
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#define __NO_STUBS
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
-#undef
_ASM_X86_64_UNISTD_H_
+#undef
ASM_X86__UNISTD_64_H
#include <asm/unistd_64.h>
#undef __SYSCALL
#define __SYSCALL(nr, sym) [nr] = sym,
#include <asm/unistd_64.h>
#undef __SYSCALL
#define __SYSCALL(nr, sym) [nr] = sym,
-#undef
_ASM_X86_64_UNISTD_H_
+#undef
ASM_X86__UNISTD_64_H
typedef void (*sys_call_ptr_t)(void);
typedef void (*sys_call_ptr_t)(void);