[PATCH] uml: fix missing KBUILD_BASENAME
authorJeff Dike <jdike@addtoit.com>
Wed, 11 Jan 2006 20:17:23 +0000 (12:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 02:42:09 +0000 (18:42 -0800)
commit4ee189a9260849ebacbdd3caf1fd5eb077fcf6a9
tree016e90e4f3d7da648e3739e08849457ffbc50cfd
parent10b5aabddd1e8f26fdccc56666ddcad653e02fd6
[PATCH] uml: fix missing KBUILD_BASENAME

2.6.15-mm1 caused kernel-offsets.c to stop compiling with a syntax error in a
header.  The problem was with KBUILD_BASENAME, which didn't get a definition
with the by-hand compilation in the main UML Makefile.

This was OK before since the expansion was syntactically the same as the
KBUILD_BASENAME token.  With -mm1, the expansion is now a quote-delimited
string, so there needs to be a definition of it.

Since kernel-offsets.c is basically the same as other arches' asm-offsets.c,
and those seem to build OK, this patch turns kernel-offsets.c into
asm-offsets.c.  kernel-offsets.c is in arch/um/sys-$(SUBARCH), i.e.  sys-i386
and sys-x86_64, while kbuild expects it to be in arch/um/kernel.
kernel-offsets.c is moved to
arch/um/include/sysdep-$(SUBARCH)/kernel-offsets.h, which is included by
arch/um/kernel/asm-offsets.c.  With that, include/asm-um/asm-offsets.h is
generated automatically.  kernel-offsets.h continues to exist because it needs
to be accessible to userspace UML code, and include/asm-um isn't.  So, a
symlink is made from arch/um/include/kernel-offsets.h to
include/asm-um/asm-offsets.h.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/um/Makefile
arch/um/include/sysdep-i386/kernel-offsets.h [new file with mode: 0644]
arch/um/include/sysdep-x86_64/kernel-offsets.h [new file with mode: 0644]
arch/um/kernel/asm-offsets.c
arch/um/sys-i386/kernel-offsets.c [deleted file]
arch/um/sys-x86_64/kernel-offsets.c [deleted file]