1. 12 1月, 2006 1 次提交
    • J
      [PATCH] uml: fix missing KBUILD_BASENAME · 4ee189a9
      Jeff Dike 提交于
      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: NJeff Dike <jdike@addtoit.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      4ee189a9
  2. 10 9月, 2005 1 次提交