diff options
Diffstat (limited to 'arch/x86/boot/compressed/head_32.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index a0ae2e7f6cec..036e635f18a3 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S | |||
| @@ -33,24 +33,20 @@ | |||
| 33 | .globl startup_32 | 33 | .globl startup_32 |
| 34 | 34 | ||
| 35 | startup_32: | 35 | startup_32: |
| 36 | /* check to see if KEEP_SEGMENTS flag is meaningful */ | 36 | cld |
| 37 | cmpw $0x207, BP_version(%esi) | ||
| 38 | jb 1f | ||
| 39 | |||
| 40 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking | 37 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking |
| 41 | * us to not reload segments */ | 38 | * us to not reload segments */ |
| 42 | testb $(1<<6), BP_loadflags(%esi) | 39 | testb $(1<<6), BP_loadflags(%esi) |
| 43 | jnz 2f | 40 | jnz 1f |
| 44 | 41 | ||
| 45 | 1: cli | 42 | cli |
| 46 | movl $(__BOOT_DS),%eax | 43 | movl $(__BOOT_DS),%eax |
| 47 | movl %eax,%ds | 44 | movl %eax,%ds |
| 48 | movl %eax,%es | 45 | movl %eax,%es |
| 49 | movl %eax,%fs | 46 | movl %eax,%fs |
| 50 | movl %eax,%gs | 47 | movl %eax,%gs |
| 51 | movl %eax,%ss | 48 | movl %eax,%ss |
| 52 | 49 | 1: | |
| 53 | 2: cld | ||
| 54 | 50 | ||
| 55 | /* Calculate the delta between where we were compiled to run | 51 | /* Calculate the delta between where we were compiled to run |
| 56 | * at and where we were actually loaded at. This can only be done | 52 | * at and where we were actually loaded at. This can only be done |