diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-01-28 13:54:34 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-01-28 13:54:34 +0000 |
| commit | 4a7e2e6fbfb1bc73c8f0384ae37a088b42c794fd (patch) | |
| tree | fc4351a81ec449dc15835370be83085ca59becfd /xen/arch/x86/boot/x86_64.S | |
| parent | 4a069b686a98979c2b3da6a902d270f6f9add6fb (diff) | |
| download | xen-4a7e2e6fbfb1bc73c8f0384ae37a088b42c794fd.tar.gz xen-4a7e2e6fbfb1bc73c8f0384ae37a088b42c794fd.tar.bz2 xen-4a7e2e6fbfb1bc73c8f0384ae37a088b42c794fd.zip | |
bitkeeper revision 1.1159.231.14 (41fa441azB6742PriyqlRlCP_gJ0Tw)
Build and x86/64 fixes.
Signed-off-by: keir.fraser@cl.cam.ac.uk
Diffstat (limited to 'xen/arch/x86/boot/x86_64.S')
| -rw-r--r-- | xen/arch/x86/boot/x86_64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 875584126e..73a513f9b6 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -156,7 +156,8 @@ __high_start: lea start(%rip),%rax sub $0x100000,%rax add %rax,%rdi - call cmain + call __start_xen + ud2 /* Force a panic (invalid opcode). */ /* This is the default interrupt handler. */ int_msg: @@ -264,10 +265,9 @@ phys_to_machine_mapping: copy_from_user: show_registers: do_iopl: -.globl idt_table, copy_user_generic, memcmp, idt_tables, new_thread +.globl idt_table, copy_user_generic, idt_tables, new_thread idt_table: copy_user_generic: -memcmp: idt_tables: new_thread: .globl switch_to, __get_user_1, __get_user_4, __get_user_8, trap_init |