2008-08-15 00:25:48

by Hiroshi Shimamoto

Subject: [PATCH -tip] 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(-)

diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
index c128eb8..32f5fbe 100644
--- a/arch/um/sys-x86_64/syscall_table.c
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -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);

--
1.5.6

2008-08-15 06:33:58

by Vegard Nossum

Subject: Re: [PATCH -tip] x86_64: uml: fix rename header guard

On Fri, Aug 15, 2008 at 2:25 AM, Hiroshi Shimamoto
<[email protected]> wrote:
> 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

--
"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

2008-08-15 10:26:26

by Ingo Molnar

Subject: Re: [PATCH -tip] x86_64: uml: fix rename header guard

* Hiroshi Shimamoto <[email protected]> wrote:

> 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

2008-08-15 11:37:49

by Ingo Molnar

Subject: Re: [PATCH -tip] x86_64: uml: fix rename header guard

* Vegard Nossum <[email protected]> wrote:

> On Fri, Aug 15, 2008 at 2:25 AM, Hiroshi Shimamoto
> <[email protected]> wrote:
> > 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 :-(

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

Ingo