Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

4 files changed, 55 insertions, 37 deletions

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index 32dd62b36ff7..cbdf9bacc575 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -384,9 +384,6 @@ static void __init runtime_code_page_mkexec(void)
         efi_memory_desc_t *md;
         void *p;
 
-        if (!(__supported_pte_mask & _PAGE_NX))
-                return;
-
         /* Make EFI runtime service code area executable */
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
@@ -428,9 +425,6 @@ void __init efi_enter_virtual_mode(void)
                 else
                         va = efi_ioremap(md->phys_addr, size);
 
-                if (md->attribute & EFI_MEMORY_WB)
-                        set_memory_uc(md->virt_addr, size);
-
                 md->virt_addr = (u64) (unsigned long) va;
 
                 if (!va) {
@@ -439,6 +433,9 @@ void __init efi_enter_virtual_mode(void)
                         continue;
                 }
 
+                if (!(md->attribute & EFI_MEMORY_WB))
+                        set_memory_uc(md->virt_addr, size);
+
                 systab = (u64) (unsigned long) efi_phys.systab;
                 if (md->phys_addr <= systab && systab < end) {
                         systab += md->virt_addr - md->phys_addr;
@@ -476,7 +473,8 @@ void __init efi_enter_virtual_mode(void)
         efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
         efi.reset_system = virt_efi_reset_system;
         efi.set_virtual_address_map = virt_efi_set_virtual_address_map;
-        runtime_code_page_mkexec();
+        if (__supported_pte_mask & _PAGE_NX)
+                runtime_code_page_mkexec();
         early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
         memmap.map = NULL;
 }
diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c
index 09d5c2330934..d143a1e76b30 100644
--- a/arch/x86/kernel/efi_64.c
+++ b/arch/x86/kernel/efi_64.c
@@ -35,6 +35,7 @@
 #include <asm/tlbflush.h>
 #include <asm/proto.h>
 #include <asm/efi.h>
+#include <asm/cacheflush.h>
 
 static pgd_t save_pgd __initdata;
 static unsigned long efi_flags __initdata;
@@ -43,22 +44,15 @@ static void __init early_mapping_set_exec(unsigned long start,
                                           unsigned long end,
                                           int executable)
 {
-        pte_t *kpte;
-        unsigned int level;
-
-        while (start < end) {
-                kpte = lookup_address((unsigned long)__va(start), &level);
-                BUG_ON(!kpte);
-                if (executable)
-                        set_pte(kpte, pte_mkexec(*kpte));
-                else
-                        set_pte(kpte, __pte((pte_val(*kpte) | _PAGE_NX) & \
-                                            __supported_pte_mask));
-                if (level == PG_LEVEL_4K)
-                        start = (start + PAGE_SIZE) & PAGE_MASK;
-                else
-                        start = (start + PMD_SIZE) & PMD_MASK;
-        }
+        unsigned long num_pages;
+
+        start &= PMD_MASK;
+        end = (end + PMD_SIZE - 1) & PMD_MASK;
+        num_pages = (end - start) >> PAGE_SHIFT;
+        if (executable)
+                set_memory_x((unsigned long)__va(start), num_pages);
+        else
+                set_memory_nx((unsigned long)__va(start), num_pages);
 }
 
 static void __init early_runtime_code_mapping_set_exec(int executable)
@@ -74,7 +68,7 @@ static void __init early_runtime_code_mapping_set_exec(int executable)
                 md = p;
                 if (md->type == EFI_RUNTIME_SERVICES_CODE) {
                         unsigned long end;
-                        end = md->phys_addr + (md->num_pages << PAGE_SHIFT);
+                        end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
                         early_mapping_set_exec(md->phys_addr, end, executable);
                 }
         }
@@ -84,8 +78,8 @@ void __init efi_call_phys_prelog(void)
 {
         unsigned long vaddress;
 
-        local_irq_save(efi_flags);
         early_runtime_code_mapping_set_exec(1);
+        local_irq_save(efi_flags);
         vaddress = (unsigned long)__va(0x0UL);
         save_pgd = *pgd_offset_k(0x0UL);
         set_pgd(pgd_offset_k(0x0UL), *pgd_offset_k(vaddress));
@@ -98,9 +92,9 @@ void __init efi_call_phys_epilog(void)
          * After the lock is released, the original page table is restored.
          */
         set_pgd(pgd_offset_k(0x0UL), save_pgd);
-        early_runtime_code_mapping_set_exec(0);
         __flush_tlb_all();
         local_irq_restore(efi_flags);
+        early_runtime_code_mapping_set_exec(0);
 }
 
 void __init efi_reserve_bootmem(void)
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index ef62b07b2b48..8540abe86ade 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -95,7 +95,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
  * registered. This mechanism replaces the previous #ifdef LOCAL_APIC -
  * !using_apic_timer decisions in do_timer_interrupt_hook()
  */
-struct clock_event_device pit_clockevent = {
+static struct clock_event_device pit_clockevent = {
         .name           = "pit",
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = init_pit_timer,
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 5818dc28167d..7fd6ac43e4a1 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -326,7 +326,7 @@ static inline void kb_wait(void)
         }
 }
 
-void machine_emergency_restart(void)
+static void native_machine_emergency_restart(void)
 {
         int i;
 
@@ -376,7 +376,7 @@ void machine_emergency_restart(void)
         }
 }
 
-void machine_shutdown(void)
+static void native_machine_shutdown(void)
 {
         /* Stop the cpus and apics */
 #ifdef CONFIG_SMP
@@ -420,7 +420,7 @@ void machine_shutdown(void)
 #endif
 }
 
-void machine_restart(char *__unused)
+static void native_machine_restart(char *__unused)
 {
         printk("machine restart\n");
 
@@ -429,11 +429,11 @@ void machine_restart(char *__unused)
         machine_emergency_restart();
 }
 
-void machine_halt(void)
+static void native_machine_halt(void)
 {
 }
 
-void machine_power_off(void)
+static void native_machine_power_off(void)
 {
         if (pm_power_off) {
                 if (!reboot_force)
@@ -443,9 +443,35 @@ void machine_power_off(void)
 }
 
 struct machine_ops machine_ops = {
-        .power_off = machine_power_off,
-        .shutdown = machine_shutdown,
-        .emergency_restart = machine_emergency_restart,
-        .restart = machine_restart,
-        .halt = machine_halt
+        .power_off = native_machine_power_off,
+        .shutdown = native_machine_shutdown,
+        .emergency_restart = native_machine_emergency_restart,
+        .restart = native_machine_restart,
+        .halt = native_machine_halt
 };
+
+void machine_power_off(void)
+{
+        machine_ops.power_off();
+}
+
+void machine_shutdown(void)
+{
+        machine_ops.shutdown();
+}
+
+void machine_emergency_restart(void)
+{
+        machine_ops.emergency_restart();
+}
+
+void machine_restart(char *cmd)
+{
+        machine_ops.restart(cmd);
+}
+
+void machine_halt(void)
+{
+        machine_ops.halt();
+}
+