mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-08 07:38:10 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: [x86 setup] Work around bug in Xen HVM
This commit is contained in:
commit
83dc3d43ce
1 changed files with 5 additions and 1 deletions
|
@ -122,7 +122,11 @@ static void setup_gdt(void)
|
||||||
/* DS: data, read/write, 4 GB, base 0 */
|
/* DS: data, read/write, 4 GB, base 0 */
|
||||||
[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
|
[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
|
||||||
};
|
};
|
||||||
struct gdt_ptr gdt;
|
/* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead
|
||||||
|
of the gdt_ptr contents. Thus, make it static so it will
|
||||||
|
stay in memory, at least long enough that we switch to the
|
||||||
|
proper kernel GDT. */
|
||||||
|
static struct gdt_ptr gdt;
|
||||||
|
|
||||||
gdt.len = sizeof(boot_gdt)-1;
|
gdt.len = sizeof(boot_gdt)-1;
|
||||||
gdt.ptr = (u32)&boot_gdt + (ds() << 4);
|
gdt.ptr = (u32)&boot_gdt + (ds() << 4);
|
||||||
|
|
Loading…
Add table
Reference in a new issue