From 25353354795de447538886735c44ccd5765b6204 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Dec 2012 02:59:14 +0000 Subject: Move DMI table from 8000:0000 to 7f00:0000 and shrink APCI by 0100:0000, once all kernels contain a patch make this find a location automatically --- master/jmm/copy-acpi-and-dmi-for-mb-kernels | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/master/jmm/copy-acpi-and-dmi-for-mb-kernels b/master/jmm/copy-acpi-and-dmi-for-mb-kernels index 0b11871..aaa5a68 100644 --- a/master/jmm/copy-acpi-and-dmi-for-mb-kernels +++ b/master/jmm/copy-acpi-and-dmi-for-mb-kernels @@ -1,5 +1,5 @@ diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 85ae791..fec513f 100644 +index 85ae791..07bfdda 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -407,6 +407,94 @@ grub_linux_setup_video (struct linux_kernel_params *params) @@ -14,7 +14,7 @@ index 85ae791..fec513f 100644 +#define EBDA_SEG_ADDR 0x40e +#define LOW_MEM_ADDR 0x413 +#define FAKE_EBDA_SEG 0x7000 -+#define FAKE_SMBIOS_SEG 0x8000 ++#define FAKE_SMBIOS_SEG 0x7f00 + +static void +inject_bios_acpi (void) @@ -55,7 +55,7 @@ index 85ae791..fec513f 100644 + *low_mem_ptr = FAKE_EBDA_SEG >> 6; + + grub_printf("Copying acpi %p to %x\n",acpi,(int) (FAKE_EBDA_SEG << 4)); -+ grub_memcpy ((char *) (FAKE_EBDA_SEG << 4), acpi, 0x10000); ++ grub_memcpy ((char *) (FAKE_EBDA_SEG << 4), acpi, 0xf000); + +} + @@ -82,7 +82,7 @@ index 85ae791..fec513f 100644 + return; + + grub_printf("Copying smbios %p to %x\n",smbios,(int) (FAKE_SMBIOS_SEG << 4)); -+ grub_memcpy ((char *) (FAKE_SMBIOS_SEG << 4), smbios, 0x10000); ++ grub_memcpy ((char *) (FAKE_SMBIOS_SEG << 4), smbios, 0x1000); +} + + @@ -103,7 +103,7 @@ index 85ae791..fec513f 100644 grub_mmap_iterate (hook); +#ifdef GRUB_MACHINE_EFI + grub_e820_add_region (params->e820_map, &e820_num, -+ 0x70000, 0x20000, GRUB_E820_RESERVED); ++ 0x70000, 0x10000, GRUB_E820_RESERVED); +#endif params->mmap_size = e820_num; -- cgit v1.2.3