diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /arch/s390/kernel/vmlinux.lds.S | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'arch/s390/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index ff5f7bb34f75..af9e69a03011 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -24,6 +24,7 @@ SECTIONS | |||
| 24 | *(.text) | 24 | *(.text) |
| 25 | SCHED_TEXT | 25 | SCHED_TEXT |
| 26 | LOCK_TEXT | 26 | LOCK_TEXT |
| 27 | KPROBES_TEXT | ||
| 27 | *(.fixup) | 28 | *(.fixup) |
| 28 | *(.gnu.warning) | 29 | *(.gnu.warning) |
| 29 | } = 0x0700 | 30 | } = 0x0700 |
| @@ -117,7 +118,7 @@ SECTIONS | |||
| 117 | 118 | ||
| 118 | /* Sections to be discarded */ | 119 | /* Sections to be discarded */ |
| 119 | /DISCARD/ : { | 120 | /DISCARD/ : { |
| 120 | *(.exitcall.exit) | 121 | *(.exit.text) *(.exit.data) *(.exitcall.exit) |
| 121 | } | 122 | } |
| 122 | 123 | ||
| 123 | /* Stabs debugging sections. */ | 124 | /* Stabs debugging sections. */ |