Skip to contentSkip to conversation

x86_64: uml: fix rename header guard

PATCH Applied Hiroshi Shimamoto 3 participants 4 messages Aug 15, 2008 User-mode Linux (UML)

lore
Share & tools
lore

Hiroshi Shimamoto

author
#0 lore raw

PATCH 1/1 x86_64: uml: fix rename header guard

From: Hiroshi Shimamoto <[email protected]>

In unistd_64.h, the guard macro _ASM_X86_64_UNISTD_H_ is renamed to ASM_X86__UNISTD_64_H.

This change should be applied to arch/um/sys-x86_64/syscall_table.c.

Signed-off-by Hiroshi Shimamoto <[email protected]>
---
 arch/um/sys-x86_64/syscall_table.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/um/sys-x86_64/syscall_table.c +2 -2
index c128eb8..32f5fbe 100644
@@ -41,12 +41,12 @@
 #define stub_rt_sigreturn sys_rt_sigreturn
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
-#undef _ASM_X86_64_UNISTD_H_
+#undef ASM_X86__UNISTD_64_H
 #include <asm-x86/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);
Signature · 1 line
1.5.6
#1 lore raw
Quoted 8 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

In unistd_64.h, the guard macro _ASM_X86_64_UNISTD_H_ is renamed to ASM_X86__UNISTD_64_H.

This change should be applied to arch/um/sys-x86_64/syscall_table.c.

Signed-off-by Hiroshi Shimamoto <[email protected]>

I guess I screwed up again. Forgot to look for #undefs :-(

Thanks, and acked.

Vegard

Signature · 4 lines
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
	-- E. W. Dijkstra, EWD1036
#2 lore raw
Quoted 4 lines · Vegard Nossum
Quoted 2 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

Quoted 8 lines
Quoted 6 lines

In unistd_64.h, the guard macro _ASM_X86_64_UNISTD_H_ is renamed to ASM_X86__UNISTD_64_H.

This change should be applied to arch/um/sys-x86_64/syscall_table.c.

Signed-off-by Hiroshi Shimamoto <[email protected]>

I guess I screwed up again. Forgot to look for #undefs :-(

that's OK from a change of this width. And the #undefs are definitely #unnice as well.

Ingo

Applied
#3 lore raw
In reply to Hiroshi Shimamoto
Quoted 6 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

In unistd_64.h, the guard macro _ASM_X86_64_UNISTD_H_ is renamed to ASM_X86__UNISTD_64_H.

This change should be applied to arch/um/sys-x86_64/syscall_table.c.

applied to tip/x86/core - thanks!

Ingo