提交 0852ec8c 编写于 作者: M Mathieu Desnoyers 提交者: Linus Torvalds

Xen i386 xen-head.S fix sections mixup

Xen i386 xen-head.S fix sections mixup

xen-head.S does not come back to the data section, leaving the text section
as current section. It causes problems with a slightly enhanced DEBUG_RODATA
that supports CONFIG_HOTPLUG and bringing a CPU up after the text has been
marked read-only: reference to early_gdt_descr causes a page fault.

Updates:

- It should be using pushsection/popsection.
- Actually, the push/popsections around the ELFNOTEs are redundant; ELFNOTE()
  does its own push/popsection to put things into the appropriate .note* section
  anyway.
Signed-off-by: NMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: NJeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 abd96ecb
...@@ -7,20 +7,20 @@ ...@@ -7,20 +7,20 @@
#include <asm/boot.h> #include <asm/boot.h>
#include <xen/interface/elfnote.h> #include <xen/interface/elfnote.h>
.section .init.text .pushsection .init.text
ENTRY(startup_xen) ENTRY(startup_xen)
movl %esi,xen_start_info movl %esi,xen_start_info
cld cld
movl $(init_thread_union+THREAD_SIZE),%esp movl $(init_thread_union+THREAD_SIZE),%esp
jmp xen_start_kernel jmp xen_start_kernel
.popsection
.pushsection ".bss.page_aligned" .pushsection .bss.page_aligned
.align PAGE_SIZE_asm .align PAGE_SIZE_asm
ENTRY(hypercall_page) ENTRY(hypercall_page)
.skip 0x1000 .skip 0x1000
.popsection .popsection
.section .text
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux")
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6")
ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册