projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
| 2 | Subject: Upstream 2.6.27.25 release from kernel.org | |
| 3 | ||
| 4 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 5 | ||
| 6 | Automatically created from "patches.kernel.org/patch-2.6.27.24-25" by xen-port-patches.py | |
| 7 | ||
| 8 | --- sle11-2009-06-29.orig/arch/x86/kernel/setup-xen.c 2008-12-23 09:40:12.000000000 +0100 | |
| 9 | +++ sle11-2009-06-29/arch/x86/kernel/setup-xen.c 2009-06-29 15:38:34.000000000 +0200 | |
| 10 | @@ -852,6 +852,9 @@ void __init setup_arch(char **cmdline_p) | |
| 11 | ||
| 12 | finish_e820_parsing(); | |
| 13 | ||
| 14 | + if (efi_enabled) | |
| 15 | + efi_init(); | |
| 16 | + | |
| 17 | if (is_initial_xendomain()) { | |
| 18 | dmi_scan_machine(); | |
| 19 | dmi_check_system(bad_bios_dmi_table); | |
| 20 | @@ -867,8 +870,6 @@ void __init setup_arch(char **cmdline_p) | |
| 21 | insert_resource(&iomem_resource, &data_resource); | |
| 22 | insert_resource(&iomem_resource, &bss_resource); | |
| 23 | ||
| 24 | - if (efi_enabled) | |
| 25 | - efi_init(); | |
| 26 | ||
| 27 | #ifdef CONFIG_X86_32 | |
| 28 | if (ppro_with_ram_bug()) { | |
| 29 | --- sle11-2009-06-29.orig/arch/x86/mm/pageattr-xen.c 2009-03-16 16:38:38.000000000 +0100 | |
| 30 | +++ sle11-2009-06-29/arch/x86/mm/pageattr-xen.c 2009-06-29 15:39:29.000000000 +0200 | |
| 31 | @@ -585,6 +585,17 @@ static int split_large_page(pte_t *kpte, | |
| 32 | ref_prot = pte_pgprot(pte_mkexec(pte_clrhuge(*kpte))); | |
| 33 | pgprot_val(ref_prot) |= _PAGE_PRESENT; | |
| 34 | __set_pmd_pte(kpte, address, level, mk_pte(base, ref_prot)); | |
| 35 | + | |
| 36 | + /* | |
| 37 | + * Intel Atom errata AAH41 workaround. | |
| 38 | + * | |
| 39 | + * The real fix should be in hw or in a microcode update, but | |
| 40 | + * we also probabilistically try to reduce the window of having | |
| 41 | + * a large TLB mixed with 4K TLBs while instruction fetches are | |
| 42 | + * going on. | |
| 43 | + */ | |
| 44 | + __flush_tlb_all(); | |
| 45 | + | |
| 46 | base = NULL; | |
| 47 | ||
| 48 | out_unlock: |