diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
| commit | 9f5a405b6843933c1cae5826046a5dd6357f142a (patch) | |
| tree | bcdbb0175d37b780551b71c40abcde964a8905eb /arch/i386/kernel/head.S | |
| parent | b7cffb028abbffff3ba0b87268ecb775ed354049 (diff) | |
| parent | 051d3cbd96909b2fe6b5038e7bbe77f41356db05 (diff) | |
Merge branch 'from-linus'
Diffstat (limited to 'arch/i386/kernel/head.S')
| -rw-r--r-- | arch/i386/kernel/head.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 2bee6499edd9..e0b7c632efbc 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
| @@ -534,5 +534,3 @@ ENTRY(cpu_gdt_table) | |||
| 534 | .quad 0x0000000000000000 /* 0xf0 - unused */ | 534 | .quad 0x0000000000000000 /* 0xf0 - unused */ |
| 535 | .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ | 535 | .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ |
| 536 | 536 | ||
| 537 | /* Be sure this is zeroed to avoid false validations in Xen */ | ||
| 538 | .fill PAGE_SIZE_asm / 8 - GDT_ENTRIES,8,0 | ||