From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 22:13:55 +0000 (-0700)
Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.37-rc1~55
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c9e2a72ff1acfdffdecb338b3d997f90c507e665

Merge branch 'kbuild' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Fix build break on symbol-prefixed archs
  initramfs: fix initramfs size calculation
  initramfs: generalize initramfs_data.xxx.S variants
  scripts/kallsyms: Enable error messages while hush up unnecessary warnings
  scripts/setlocalversion: update comment
  kbuild: Use a single clean rule for kernel and external modules
  kbuild: Do not run make clean in $(srctree)
  scripts/mod/modpost.c: fix commentary accordingly to last changes
  kbuild: Really don't clean bounds.h and asm-offsets.h
---

c9e2a72ff1acfdffdecb338b3d997f90c507e665
diff --cc include/asm-generic/vmlinux.lds.h
index 2c0fc10956ba,0c6387d6a6ae..bd69d79208de
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -637,10 -630,11 +637,11 @@@
  
  #ifdef CONFIG_BLK_DEV_INITRD
  #define INIT_RAM_FS							\
 -	. = ALIGN(PAGE_SIZE);						\
 +	. = ALIGN(4);							\
  	VMLINUX_SYMBOL(__initramfs_start) = .;				\
  	*(.init.ramfs)							\
- 	VMLINUX_SYMBOL(__initramfs_end) = .;
+ 	. = ALIGN(8);							\
+ 	*(.init.ramfs.info)
  #else
  #define INIT_RAM_FS
  #endif
diff --cc scripts/mod/modpost.c
index 1ec7158b6c1f,859bee4972e9..33122ca04e7c
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -1230,9 -1218,9 +1233,9 @@@ static char *sec2annotation(const char 
  			strcat(p, "data ");
  		else
  			strcat(p, " ");
- 		return r; /* we leak her but we do not care */
+ 		return r;
  	} else {
 -		return "";
 +		return strdup("");
  	}
  }