From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Dec 2009 15:23:42 +0000 (-0800)
Subject: Merge branch 'for-33' of git://repo.or.cz/linux-kbuild
X-Git-Tag: v2.6.33-rc1~37
X-Git-Url: https://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff_plain;h=5a865c0606eb44d5d12cabb429751c83712183de

Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

* 'for-33' of git://repo.or.cz/linux-kbuild: (29 commits)
  net: fix for utsrelease.h moving to generated
  gen_init_cpio: fixed fwrite warning
  kbuild: fix make clean after mismerge
  kbuild: generate modules.builtin
  genksyms: properly consider  EXPORT_UNUSED_SYMBOL{,_GPL}()
  score: add asm/asm-offsets.h wrapper
  unifdef: update to upstream revision 1.190
  kbuild: specify absolute paths for cscope
  kbuild: create include/generated in silentoldconfig
  scripts/package: deb-pkg: use fakeroot if available
  scripts/package: add KBUILD_PKG_ROOTCMD variable
  scripts/package: tar-pkg: use tar --owner=root
  Kbuild: clean up marker
  net: add net_tstamp.h to headers_install
  kbuild: move utsrelease.h to include/generated
  kbuild: move autoconf.h to include/generated
  drop explicit include of autoconf.h
  kbuild: move compile.h to include/generated
  kbuild: drop include/asm
  kbuild: do not check for include/asm-$ARCH
  ...

Fixed non-conflicting clean merge of modpost.c as per comments from
Stephen Rothwell (modpost.c had grown an include of linux/autoconf.h
that needed to be changed to generated/autoconf.h)
---

5a865c0606eb44d5d12cabb429751c83712183de
diff --cc scripts/mod/modpost.c
index 6c4ffc767b91,801a16a17545..20923613467c
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -15,17 -15,8 +15,17 @@@
  #include <stdio.h>
  #include <ctype.h>
  #include "modpost.h"
- #include "../../include/linux/autoconf.h"
++#include "../../include/generated/autoconf.h"
  #include "../../include/linux/license.h"
  
 +/* Some toolchains use a `_' prefix for all user symbols. */
 +#ifdef CONFIG_SYMBOL_PREFIX
 +#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
 +#else
 +#define MODULE_SYMBOL_PREFIX ""
 +#endif
 +
 +
  /* Are we using CONFIG_MODVERSIONS? */
  int modversions = 0;
  /* Warn about undefined symbols? (do so if we have vmlinux) */