Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild changes from Michal Marek:
 - Unification of cmd_uimage among archs that use it
 - make headers_check tries harder before reporting a missing
   <linux/types.h> include
 - kbuild portability fix for shells that do not support echo -e
 - make clean descends into samples/
 - setlocalversion grep fix
 - modpost typo fix
 - dtc warnings fix

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  setlocalversion: Use "grep -q" instead of piping output to "read dummy"
  modpost: fix ALL_INIT_DATA_SECTIONS
  Kbuild: centralize MKIMAGE and cmd_uimage definitions
  headers_check: recursively search for linux/types.h inclusion
  scripts/Kbuild.include: Fix portability problem of "echo -e"
  scripts: dtc: fix compile warnings
  kbuild: clean up samples directory
  kbuild: disable -Wmissing-field-initializers for W=1

diff --combined Makefile
index 1932984,b3c944e..fd4b3d0
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 3
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = Saber-toothed Squirrel
  
  # *DOCUMENTATION*
@@@ -1170,7 -1170,7 +1170,7 @@@ MRPROPER_FILES += .config .config.old .
  #
  clean: rm-dirs  := $(CLEAN_DIRS)
  clean: rm-files := $(CLEAN_FILES)
- clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation)
+ clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)
  
  PHONY += $(clean-dirs) clean archclean
  $(clean-dirs):

diff --combined arch/microblaze/boot/Makefile
index 34940c8,ca76ecd..fa83ea4
--- 1/arch/microblaze/boot/Makefile
--- 2/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@@ -2,13 -2,11 +2,11 @@@
  # arch/microblaze/boot/Makefile
  #
  
- MKIMAGE := $(srctree)/scripts/mkuboot.sh
- 
  obj-y += linked_dtb.o
  
  targets := linux.bin linux.bin.gz simpleImage.%
  
 -OBJCOPYFLAGS := -O binary
 +OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
  
  # Ensure system.dtb exists
  $(obj)/linked_dtb.o: $(obj)/system.dtb
@@@ -35,11 -33,9 +33,9 @@@ quiet_cmd_strip = STRIP   $
        cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
                                -K _fdt_start vmlinux -o $@
  
- quiet_cmd_uimage = UIMAGE  $@.ub
-       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A microblaze -O linux -T kernel \
-               -C none -n 'Linux-$(KERNELRELEASE)' \
-               -a $(CONFIG_KERNEL_BASE_ADDR) -e $(CONFIG_KERNEL_BASE_ADDR) \
-               -d $@ $@.ub
+ UIMAGE_IN = $@
+ UIMAGE_OUT = $@.ub
+ UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)
  
  $(obj)/simpleImage.%: vmlinux FORCE
        $(call if_changed,cp,.unstrip)

diff --combined scripts/mod/modpost.c
index 9adb667,159b4cc..3f01fd9
--- 1/scripts/mod/modpost.c
--- 2/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -849,7 -849,7 +849,7 @@@ static void check_section(const char *m
  
  #define ALL_INIT_DATA_SECTIONS \
        ".init.setup$", ".init.rodata$", \
-       ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$" \
+       ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$", \
        ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"
  #define ALL_EXIT_DATA_SECTIONS \
        ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"
@@@ -1494,13 -1494,6 +1494,13 @@@ static int addend_386_rel(struct elf_in
        return 0;
  }
  
 +#ifndef R_ARM_CALL
 +#define R_ARM_CALL    28
 +#endif
 +#ifndef R_ARM_JUMP24
 +#define R_ARM_JUMP24  29
 +#endif
 +
  static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
  {
        unsigned int r_typ = ELF_R_TYPE(r->r_info);
@@@ -1512,8 -1505,6 +1512,8 @@@
                              (elf->symtab_start + ELF_R_SYM(r->r_info));
                break;
        case R_ARM_PC24:
 +      case R_ARM_CALL:
 +      case R_ARM_JUMP24:
                /* From ARM ABI: ((S + A) | T) - P */
                r->r_addend = (int)(long)(elf->hdr +
                              sechdr->sh_offset +