forked from Minki/linux
4ee189a926
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> |
||
|---|---|---|
| .. | ||
| sysdep-i386 | ||
| sysdep-ia64 | ||
| sysdep-ppc | ||
| sysdep-x86_64 | ||
| aio.h | ||
| chan_kern.h | ||
| chan_user.h | ||
| choose-mode.h | ||
| common-offsets.h | ||
| elf_user.h | ||
| frame_kern.h | ||
| init.h | ||
| initrd.h | ||
| irq_kern.h | ||
| irq_user.h | ||
| kern_util.h | ||
| kern.h | ||
| line.h | ||
| mconsole_kern.h | ||
| mconsole.h | ||
| mem_kern.h | ||
| mem_user.h | ||
| mem.h | ||
| mode_kern.h | ||
| mode.h | ||
| net_kern.h | ||
| net_user.h | ||
| os.h | ||
| process.h | ||
| ptrace_user.h | ||
| registers.h | ||
| sigcontext.h | ||
| sigio.h | ||
| signal_kern.h | ||
| skas_ptrace.h | ||
| skas_ptregs.h | ||
| syscall.h | ||
| sysrq.h | ||
| task.h | ||
| tempfile.h | ||
| time_user.h | ||
| tlb.h | ||
| ubd_user.h | ||
| um_mmu.h | ||
| um_uaccess.h | ||
| umid.h | ||
| uml_uaccess.h | ||
| user_util.h | ||
| user.h | ||