diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 14:09:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 14:09:44 -0400 |
commit | 576c25eb5954035b64112188d9a2683144600f3d (patch) | |
tree | 7cef36c33078f18dcfb5614674044c4c10df8a0c /arch/arm64/kernel/vmlinux.lds.S | |
parent | 5872c84027fdcc982e8109ca26d11e1117995745 (diff) | |
parent | 4d5e0b1527dd330940e8b7180b8d7016fc900352 (diff) |
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull ARM64 update from Catalin Marinas:
- User tagged pointers support (top 8-bit of user pointers
automatically ignored by the CPU).
- Kernel mode NEON (no users for arm64 yet but work in progress).
- arm64 kernel Image header extended to accommodate future EFI stub.
- Remove BogoMIPS reporting (not relevant, it's just the timer
frequency).
- Clean-up (EM_AARCH64/EM_ARM to elf-em.h, ELF notes in read-only
segment, unused variable).
- Bug-fixes (RAM boundaries not 2MB aligned, perf, includes).
* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
Documentation/arm64: clarify requirements for DTB placement
arm64: mm: permit use of tagged pointers at EL0
Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
arm64: Remove unused cpu_name ascii in arch/arm64/mm/proc.S
arm64: delay: don't bother reporting bogomips in /proc/cpuinfo
arm64: Fix mapping of memory banks not ending on a PMD_SIZE boundary
arm64: move elf notes into readonly segment
arm64: Enable interrupts in the EL0 undef handler
arm64: Expand arm64 image header
ARM64: include: asm: include "asm/types.h" in "pgtable-2level-types.h" and "pgtable-3level-types.h"
arm64: add support for kernel mode NEON
arm64: perf: fix ARMv8 EVTYPE_MASK to include NSH bit
arm64: perf: fix group validation when using enable_on_exec
Diffstat (limited to 'arch/arm64/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/arm64/kernel/vmlinux.lds.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index f5e55747242f..f8ab9d8e2ea3 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S | |||
@@ -71,6 +71,7 @@ SECTIONS | |||
71 | 71 | ||
72 | RO_DATA(PAGE_SIZE) | 72 | RO_DATA(PAGE_SIZE) |
73 | EXCEPTION_TABLE(8) | 73 | EXCEPTION_TABLE(8) |
74 | NOTES | ||
74 | _etext = .; /* End of text and rodata section */ | 75 | _etext = .; /* End of text and rodata section */ |
75 | 76 | ||
76 | . = ALIGN(PAGE_SIZE); | 77 | . = ALIGN(PAGE_SIZE); |
@@ -122,8 +123,6 @@ SECTIONS | |||
122 | } | 123 | } |
123 | _edata_loc = __data_loc + SIZEOF(.data); | 124 | _edata_loc = __data_loc + SIZEOF(.data); |
124 | 125 | ||
125 | NOTES | ||
126 | |||
127 | BSS_SECTION(0, 0, 0) | 126 | BSS_SECTION(0, 0, 0) |
128 | _end = .; | 127 | _end = .; |
129 | 128 | ||