diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:36:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:36:43 -0800 |
| commit | 9ca4c6429f92598a84e4c3292ea7d187c9d7b033 (patch) | |
| tree | cfee3dec5dd6643de99969245ac83a82aa65ef42 /arch/sparc/kernel/vmlinux.lds.S | |
| parent | 11f2534bae8c9dc6dace2018226733e4899a57c3 (diff) | |
| parent | d68712ee35069455ea4043d443c8d4fb9a1ee956 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
1) Add a proper .exit.data section.
2) Fix ipc64_perm type definition, from Arnd Bergmann.
3) Support folded p4d page tables on sparc64, from Mike Rapport.
4) Remove uses of struct timex, also from Arnd Bergmann.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
y2038: sparc: remove use of struct timex
sparc64: add support for folded p4d page tables
sparc/console: kill off obsolete declarations
sparc32: fix struct ipc64_perm type definition
sparc32, leon: Stop adding vendor and device id to prom ambapp path components
sparc: Add .exit.data section.
sparc: remove unneeded uapi/asm/statfs.h
Diffstat (limited to 'arch/sparc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/sparc/kernel/vmlinux.lds.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index 7ec79918b566..f99e99e58075 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S @@ -171,12 +171,14 @@ SECTIONS } PERCPU_SECTION(SMP_CACHE_BYTES) -#ifdef CONFIG_JUMP_LABEL . = ALIGN(PAGE_SIZE); .exit.text : { EXIT_TEXT } -#endif + + .exit.data : { + EXIT_DATA + } . = ALIGN(PAGE_SIZE); __init_end = .; |