From: Michal Marek <mmarek@suse.cz>
Date: Wed, 4 Aug 2010 11:59:13 +0000 (+0200)
Subject: Merge commit 'v2.6.35' into kbuild/kbuild
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lisovros/linux_canprio.git/commitdiff_plain/772320e84588dcbe1600ffb83e5f328f2209ac2a

Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile
---

772320e84588dcbe1600ffb83e5f328f2209ac2a
diff --cc arch/blackfin/Makefile
index f7ef923297f,5a97a31d4bb..9d5ffaf5492
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@@ -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
diff --cc arch/powerpc/Makefile
index b68a83853e1,77cfe7a29e2..5d42f5eae70
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -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
diff --cc arch/s390/Makefile
index 83ef8724c83,30c5f01f93b..0c9e6c6d2a6
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@@ -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
diff --cc scripts/mod/modpost.c
index 7249ab44f44,f6127b9f5ac..c827309c29c
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -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)