diff options
author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 14:25:08 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 14:25:08 -0700 |
commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/kernel/vmlinux.lds.S | |
parent | 50fbe56c127efde659c686495eb1f925fd84ff0a (diff) | |
parent | 7120569c76028a6883697b7643564f0c419cfe07 (diff) | |
download | blackbird-op-linux-c66b31f3926165bc1d4128adc97a064dcbab421a.tar.gz blackbird-op-linux-c66b31f3926165bc1d4128adc97a064dcbab421a.zip |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 3765efc5f963..4a95e86b9ac2 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S @@ -169,6 +169,30 @@ SECTIONS __end___mckinley_e9_bundles = .; } +#if defined(CONFIG_PARAVIRT) + . = ALIGN(16); + .paravirt_bundles : AT(ADDR(.paravirt_bundles) - LOAD_OFFSET) + { + __start_paravirt_bundles = .; + *(.paravirt_bundles) + __stop_paravirt_bundles = .; + } + . = ALIGN(16); + .paravirt_insts : AT(ADDR(.paravirt_insts) - LOAD_OFFSET) + { + __start_paravirt_insts = .; + *(.paravirt_insts) + __stop_paravirt_insts = .; + } + . = ALIGN(16); + .paravirt_branches : AT(ADDR(.paravirt_branches) - LOAD_OFFSET) + { + __start_paravirt_branches = .; + *(.paravirt_branches) + __stop_paravirt_branches = .; + } +#endif + #if defined(CONFIG_IA64_GENERIC) /* Machine Vector */ . = ALIGN(16); @@ -201,6 +225,12 @@ SECTIONS __start_gate_section = .; *(.data.gate) __stop_gate_section = .; +#ifdef CONFIG_XEN + . = ALIGN(PAGE_SIZE); + __xen_start_gate_section = .; + *(.data.gate.xen) + __xen_stop_gate_section = .; +#endif } . = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose * kernel data |