diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 09:02:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 09:02:10 -0800 |
| commit | 883120eb324a16aec6a9b0db651f0c0cfc02b89c (patch) | |
| tree | 9476a585bcababa20be6f4ba284fde2ed5346240 /arch | |
| parent | f07d4a76474045ac1b6d17662d2f6f041f5ce093 (diff) | |
| parent | f16330316321d1c388d13096f6858f5d2dac29dc (diff) | |
| download | linux-stable-883120eb324a16aec6a9b0db651f0c0cfc02b89c.tar.gz linux-stable-883120eb324a16aec6a9b0db651f0c0cfc02b89c.tar.bz2 linux-stable-883120eb324a16aec6a9b0db651f0c0cfc02b89c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
[S390] dasd: revalidate server for new pathgroup
[S390] dasd: revert LCU optimization
[S390] cleanup entry point definition
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/Makefile | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index e9f353341693..0ad2f1e1ce9e 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -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) diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index e4c79ebb40e6..21109c63eb12 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -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 |