Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 16 insertions, 3 deletions

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 83ef8724c833..0c9e6c6d2a64 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -14,6 +14,7 @@
 #
 
 ifndef CONFIG_64BIT
+LD_BFD          := elf32-s390
 LDFLAGS         := -m elf_s390
 KBUILD_CFLAGS   += -m31
 KBUILD_AFLAGS   += -m31
@@ -21,6 +22,7 @@ UTS_MACHINE	:= s390
 STACK_SIZE      := 8192
 CHECKFLAGS      += -D__s390__ -msize-long
 else
+LD_BFD          := elf64-s390
 LDFLAGS         := -m elf64_s390
 KBUILD_AFLAGS_MODULE += -fpic -D__PIC__
 KBUILD_CFLAGS_MODULE += -fpic -D__PIC__
@@ -31,6 +33,8 @@ STACK_SIZE	:= 16384
 CHECKFLAGS      += -D__s390__ -D__s390x__
 endif
 
+export LD_BFD
+
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
 cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
 cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
@@ -86,7 +90,9 @@ KBUILD_AFLAGS	+= $(aflags-y)
 OBJCOPYFLAGS    := -O binary
 LDFLAGS_vmlinux := -e start
 
-head-y          := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
+head-y          := arch/s390/kernel/head.o
+head-y          += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
+head-y          += arch/s390/kernel/init_task.o
 
 core-y          += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \
                    arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/
@@ -100,21 +106,28 @@ drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/
 
 boot            := arch/s390/boot
 
-all: image
+all: image bzImage
 
 install: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
-image: vmlinux
+image bzImage: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 zfcpdump:
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
+vdso_install:
+ifeq ($(CONFIG_64BIT),y)
+        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
+endif
+        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
+
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
 # Don't use tabs in echo arguments
 define archhelp
   echo  '* image           - Kernel image for IPL ($(boot)/image)'
+  echo  '* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'
 endef