Commit e0a15d5b authored Jan 18, 2012 by Christian Borntraeger Committed by Martin Schwidefsky Jan 18, 2012

[S390] cleanup entry point definition



The vmlinux file for s390 contains a currently unused entry point,
which is specified in two different locations: the linker script
and the makefile. As it happens both definitions are different and
the linker file is broken (_start does not exist) and the makefile
specifies an entry point which makes no sense (the SALIPL loader
entry point).

So lets get rid of one definition (the makefile) and use the entry
point of all other ipl methods (0x10000 -> startup) to be consistent.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent ccb19d26

arch/s390/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ KBUILD_CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare
		KBUILD_AFLAGS += $(aflags-y)

		OBJCOPYFLAGS := -O binary
		LDFLAGS_vmlinux := -e start

		head-y := arch/s390/kernel/head.o
		head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)

arch/s390/kernel/vmlinux.lds.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@
		#ifndef CONFIG_64BIT
		OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")
		OUTPUT_ARCH(s390)
		ENTRY(_start)
		ENTRY(startup)
		jiffies = jiffies_64 + 4;
		#else
		OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
		OUTPUT_ARCH(s390:64-bit)
		ENTRY(_start)
		ENTRY(startup)
		jiffies = jiffies_64;
		#endif