Merge commit 'v2.6.35' into kbuild/kbuild
Michal Marek [Wed, 4 Aug 2010 11:59:13 +0000 (13:59 +0200)]
Conflicts:
arch/powerpc/Makefile

1  2 
Makefile
arch/blackfin/Makefile
arch/ia64/Makefile
arch/mips/Makefile
arch/powerpc/Makefile
arch/s390/Makefile
lib/Kconfig.debug
scripts/mod/file2alias.c
scripts/mod/modpost.c

diff --cc Makefile
Simple merge
@@@ -14,9 -14,12 +14,12 @@@ OBJCOPYFLAGS     := -O binary -R .note 
  GZFLAGS          := -9
  
  KBUILD_CFLAGS           += $(call cc-option,-mno-fdpic)
+ ifeq ($(CONFIG_ROMKERNEL),y)
+ KBUILD_CFLAGS           += -mlong-calls
+ endif
  KBUILD_AFLAGS           += $(call cc-option,-mno-fdpic)
 -CFLAGS_MODULE    += -mlong-calls
 -LDFLAGS_MODULE   += -m elf32bfin
 +KBUILD_CFLAGS_MODULE    += -mlong-calls
 +KBUILD_LDFLAGS_MODULE   += -m elf32bfin
  KALLSYMS         += --symbol-prefix=_
  
  KBUILD_DEFCONFIG := BF537-STAMP_defconfig
Simple merge
Simple merge
@@@ -92,10 -92,10 +92,10 @@@ endi
  else
        KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
  endif
- else
- KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  endif
  
 -LDFLAGS_MODULE        += arch/powerpc/lib/crtsavres.o
++KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  ifeq ($(CONFIG_TUNE_CELL),y)
        KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
  endif
@@@ -21,9 -22,9 +22,10 @@@ UTS_MACHINE  := s39
  STACK_SIZE    := 8192
  CHECKFLAGS    += -D__s390__ -msize-long
  else
+ LD_BFD                := elf64-s390
  LDFLAGS               := -m elf64_s390
 -MODFLAGS      += -fpic -D__PIC__
 +KBUILD_AFLAGS_MODULE += -fpic -D__PIC__
 +KBUILD_CFLAGS_MODULE += -fpic -D__PIC__
  KBUILD_CFLAGS += -m64
  KBUILD_AFLAGS += -m64
  UTS_MACHINE   := s390x
Simple merge
Simple merge
@@@ -1389,10 -1344,10 +1394,10 @@@ static unsigned int *reloc_location(str
                                    Elf_Shdr *sechdr, Elf_Rela *r)
  {
        Elf_Shdr *sechdrs = elf->sechdrs;
 -      int section = sechdr->sh_info;
 +      int section = shndx2secindex(sechdr->sh_info);
  
        return (void *)elf->hdr + sechdrs[section].sh_offset +
-               (r->r_offset - sechdrs[section].sh_addr);
+               r->r_offset - sechdrs[section].sh_addr;
  }
  
  static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)