diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 12:02:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 12:02:10 -0500 |
commit | 883120eb324a16aec6a9b0db651f0c0cfc02b89c (patch) | |
tree | 9476a585bcababa20be6f4ba284fde2ed5346240 /arch/s390 | |
parent | f07d4a76474045ac1b6d17662d2f6f041f5ce093 (diff) | |
parent | f16330316321d1c388d13096f6858f5d2dac29dc (diff) |
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/s390')
-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 | |||
88 | KBUILD_AFLAGS += $(aflags-y) | 88 | KBUILD_AFLAGS += $(aflags-y) |
89 | 89 | ||
90 | OBJCOPYFLAGS := -O binary | 90 | OBJCOPYFLAGS := -O binary |
91 | LDFLAGS_vmlinux := -e start | ||
92 | 91 | ||
93 | head-y := arch/s390/kernel/head.o | 92 | head-y := arch/s390/kernel/head.o |
94 | head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o) | 93 | 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 @@ | |||
9 | #ifndef CONFIG_64BIT | 9 | #ifndef CONFIG_64BIT |
10 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") | 10 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") |
11 | OUTPUT_ARCH(s390) | 11 | OUTPUT_ARCH(s390) |
12 | ENTRY(_start) | 12 | ENTRY(startup) |
13 | jiffies = jiffies_64 + 4; | 13 | jiffies = jiffies_64 + 4; |
14 | #else | 14 | #else |
15 | OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") | 15 | OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") |
16 | OUTPUT_ARCH(s390:64-bit) | 16 | OUTPUT_ARCH(s390:64-bit) |
17 | ENTRY(_start) | 17 | ENTRY(startup) |
18 | jiffies = jiffies_64; | 18 | jiffies = jiffies_64; |
19 | #endif | 19 | #endif |
20 | 20 | ||