diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/i386/boot/compressed | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/i386/boot/compressed')
| -rw-r--r-- | arch/i386/boot/compressed/head.S | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S index eb2a9a2c5..51e0fc893 100644 --- a/arch/i386/boot/compressed/head.S +++ b/arch/i386/boot/compressed/head.S @@ -12,10 +12,6 @@ * the page directory. [According to comments etc elsewhere on a compressed * kernel it will end up at 0x1000 + 1Mb I hope so as I assume this. - AC] * - * In SMP mode we keep this page safe. Really we ought to shuffle things and - * put the trampoline here. - AC. An SMP trampoline enters with %cx holding - * the stack base. - * * Page 0 is deliberately kept safe, since System Management Mode code in * laptops may need to access the BIOS data stored there. This is also * useful for future device drivers that either access the BIOS via VM86 @@ -41,24 +37,7 @@ startup_32: movl %ax,%es movl %ax,%fs movl %ax,%gs -#ifdef __SMP__ - orw %bx,%bx # What state are we in BX=1 for SMP - # 0 for boot - jz 2f # Initial boot - -/* - * We are trampolining an SMP processor - */ - mov %ax,%ss - xorl %eax,%eax # Back to 0 - mov %cx,%ax # SP low 16 bits - movl %eax,%esp - pushl $0 # Clear NT - popfl - ljmp $(__KERNEL_CS), $0x100000 # Into C and sanity -2: -#endif lss SYMBOL_NAME(stack_start),%esp xorl %eax,%eax 1: incl %eax # check that A20 really IS enabled |