diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
commit | ac58c9059da8886b5e8cde012a80266b18ca146e (patch) | |
tree | 40bf486843a2cace6c3a959d73423e50e6aa0c00 /arch/sparc64/kernel/vmlinux.lds.S | |
parent | df6db302cb236ac3a683d535a3e2073d9f4b2833 (diff) | |
parent | c4a1745aa09fc110afdefea0e5d025043e348bae (diff) |
Merge branch 'linus'
Diffstat (limited to 'arch/sparc64/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/sparc64/kernel/vmlinux.lds.S | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S index 467d13a0d5c1..b097379a49a8 100644 --- a/arch/sparc64/kernel/vmlinux.lds.S +++ b/arch/sparc64/kernel/vmlinux.lds.S | |||
@@ -70,6 +70,22 @@ SECTIONS | |||
70 | .con_initcall.init : { *(.con_initcall.init) } | 70 | .con_initcall.init : { *(.con_initcall.init) } |
71 | __con_initcall_end = .; | 71 | __con_initcall_end = .; |
72 | SECURITY_INIT | 72 | SECURITY_INIT |
73 | . = ALIGN(4); | ||
74 | __tsb_ldquad_phys_patch = .; | ||
75 | .tsb_ldquad_phys_patch : { *(.tsb_ldquad_phys_patch) } | ||
76 | __tsb_ldquad_phys_patch_end = .; | ||
77 | __tsb_phys_patch = .; | ||
78 | .tsb_phys_patch : { *(.tsb_phys_patch) } | ||
79 | __tsb_phys_patch_end = .; | ||
80 | __cpuid_patch = .; | ||
81 | .cpuid_patch : { *(.cpuid_patch) } | ||
82 | __cpuid_patch_end = .; | ||
83 | __sun4v_1insn_patch = .; | ||
84 | .sun4v_1insn_patch : { *(.sun4v_1insn_patch) } | ||
85 | __sun4v_1insn_patch_end = .; | ||
86 | __sun4v_2insn_patch = .; | ||
87 | .sun4v_2insn_patch : { *(.sun4v_2insn_patch) } | ||
88 | __sun4v_2insn_patch_end = .; | ||
73 | . = ALIGN(8192); | 89 | . = ALIGN(8192); |
74 | __initramfs_start = .; | 90 | __initramfs_start = .; |
75 | .init.ramfs : { *(.init.ramfs) } | 91 | .init.ramfs : { *(.init.ramfs) } |