diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/x86/xen/xen-head.S | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
| download | kernel-crypto-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.gz kernel-crypto-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.xz kernel-crypto-bd45ac0c5daae35e7c71138172e63df5cf644cf6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/xen/xen-head.S')
| -rw-r--r-- | arch/x86/xen/xen-head.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index f8d6937db2e..288d587ce73 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -4,16 +4,18 @@ #ifdef CONFIG_XEN #include <linux/elfnote.h> +#include <linux/init.h> #include <asm/boot.h> #include <xen/interface/elfnote.h> -.pushsection .init.text + __INIT ENTRY(startup_xen) movl %esi,xen_start_info cld movl $(init_thread_union+THREAD_SIZE),%esp jmp xen_start_kernel -.popsection + + __FINIT .pushsection .bss.page_aligned .align PAGE_SIZE_asm |