Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
  Remove references to "make dep"
  kconfig: document use of HAVE_*
  Introduce new section reference annotations tags: __ref, __refdata, __refconst
  kbuild: warn about ld added unique sections
  kbuild: add verbose option to Section mismatch reporting in modpost
  kconfig: tristate choices with mixed tristate and boolean values
  asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
  remove __attribute_used__
  kbuild: support ARCH=x86 in buildtar
  kconfig: remove "enable"
  kbuild: simplified warning report in modpost
  kbuild: introduce a few helpers in modpost
  kbuild: use simpler section mismatch warnings in modpost
  kbuild: link vmlinux.o before kallsyms passes
  kbuild: introduce new option to enhance section mismatch analysis
  Use separate sections for __dev/__cpu/__mem code/data
  compiler.h: introduce __section()
  all archs: consolidate init and exit sections in vmlinux.lds.h
  kbuild: check section names consistently in modpost
  kbuild: introduce blacklisting in modpost
  ...

3 files changed, 9 insertions, 9 deletions

diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S
index 97a7876ed681..93c9f0ea286b 100644
--- a/arch/cris/arch-v10/vmlinux.lds.S
+++ b/arch/cris/arch-v10/vmlinux.lds.S
@@ -57,10 +57,10 @@ SECTIONS
         __init_begin = .;
         .init.text : { 
                    _sinittext = .;
-                   *(.init.text)
+                   INIT_TEXT
                    _einittext = .;
         }
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
         . = ALIGN(16);
         __setup_start = .;
         .init.setup : { *(.init.setup) }
@@ -109,8 +109,8 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.text.exit)
-                *(.data.exit)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile
index 9f77eda914ba..609692f9d5eb 100644
--- a/arch/cris/arch-v32/boot/compressed/Makefile
+++ b/arch/cris/arch-v32/boot/compressed/Makefile
@@ -7,7 +7,7 @@
 target = $(target_compressed_dir)
 src    = $(src_compressed_dir)
 
-CC = gcc-cris -mlinux -march=v32 -I $(TOPDIR)/include
+CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
 CFLAGS = -O2
 LD = gcc-cris -mlinux -march=v32 -nostdlib
 OBJCOPY = objcopy-cris
diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S
index b076c134c0bb..fead8c59ea63 100644
--- a/arch/cris/arch-v32/vmlinux.lds.S
+++ b/arch/cris/arch-v32/vmlinux.lds.S
@@ -61,10 +61,10 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                    _sinittext = .;
-                   *(.init.text)
+                   INIT_TEXT
                    _einittext = .;
         }
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
         . = ALIGN(16);
         __setup_start = .;
         .init.setup : { *(.init.setup) }
@@ -124,8 +124,8 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.text.exit)
-                *(.data.exit)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }