Merge branch 'linux-2.6'

14 files changed, 79 insertions, 89 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 96986b46bc..edb5108e5d 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -849,7 +849,7 @@ void __init init_bsp_APIC(void)
 /**
  * setup_local_APIC - setup the local APIC
  */
-void __devinit setup_local_APIC(void)
+void __cpuinit setup_local_APIC(void)
 {
         unsigned long oldvalue, value, maxlvt, integrated;
         int i, j;
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 606fe4d55a..9f530ff43c 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -49,6 +49,7 @@ static struct _cache_table cache_table[] __cpuinitdata =
         { 0x3c, LVL_2,      256 },      /* 4-way set assoc, sectored cache, 64 byte line size */
         { 0x3d, LVL_2,      384 },      /* 6-way set assoc, sectored cache, 64 byte line size */
         { 0x3e, LVL_2,      512 },      /* 4-way set assoc, sectored cache, 64 byte line size */
+        { 0x3f, LVL_2,      256 },      /* 2-way set assoc, 64 byte line size */
         { 0x41, LVL_2,      128 },      /* 4-way set assoc, 32 byte line size */
         { 0x42, LVL_2,      256 },      /* 4-way set assoc, 32 byte line size */
         { 0x43, LVL_2,      512 },      /* 4-way set assoc, 32 byte line size */
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 6cf27319a9..c3a565bba1 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -1882,13 +1882,16 @@ __setup("no_timer_check", notimercheck);
 static int __init timer_irq_works(void)
 {
         unsigned long t1 = jiffies;
+        unsigned long flags;
 
         if (no_timer_check)
                 return 1;
 
+        local_save_flags(flags);
         local_irq_enable();
         /* Let ten ticks pass... */
         mdelay((10 * 1000) / HZ);
+        local_irq_restore(flags);
 
         /*
          * Expect a few ticks at least, to be sure some possible
@@ -2167,6 +2170,9 @@ static inline void __init check_timer(void)
         int apic1, pin1, apic2, pin2;
         int vector;
         unsigned int ver;
+        unsigned long flags;
+
+        local_irq_save(flags);
 
         ver = apic_read(APIC_LVR);
         ver = GET_APIC_VERSION(ver);
@@ -2219,7 +2225,7 @@ static inline void __init check_timer(void)
                         }
                         if (disable_timer_pin_1 > 0)
                                 clear_IO_APIC_pin(0, pin1);
-                        return;
+                        goto out;
                 }
                 clear_IO_APIC_pin(apic1, pin1);
                 printk(KERN_ERR "..MP-BIOS bug: 8254 timer not connected to "
@@ -2242,7 +2248,7 @@ static inline void __init check_timer(void)
                         if (nmi_watchdog == NMI_IO_APIC) {
                                 setup_nmi();
                         }
-                        return;
+                        goto out;
                 }
                 /*
                  * Cleanup, just in case ...
@@ -2266,7 +2272,7 @@ static inline void __init check_timer(void)
 
         if (timer_irq_works()) {
                 printk(" works.\n");
-                return;
+                goto out;
         }
         apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector);
         printk(" failed.\n");
@@ -2282,11 +2288,13 @@ static inline void __init check_timer(void)
 
         if (timer_irq_works()) {
                 printk(" works.\n");
-                return;
+                goto out;
         }
         printk(" failed :(.\n");
         panic("IO-APIC + timer doesn't work!  Boot with apic=debug and send a "
                 "report.  Then try booting with the 'noapic' option");
+out:
+        local_irq_restore(flags);
 }
 
 /*
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 435a8c9b55..cbac1670c7 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1281,10 +1281,13 @@ void disable_IO_APIC(void)
 static int __init timer_irq_works(void)
 {
         unsigned long t1 = jiffies;
+        unsigned long flags;
 
+        local_save_flags(flags);
         local_irq_enable();
         /* Let ten ticks pass... */
         mdelay((10 * 1000) / HZ);
+        local_irq_restore(flags);
 
         /*
          * Expect a few ticks at least, to be sure some possible
@@ -1655,6 +1658,9 @@ static inline void check_timer(void)
 {
         struct irq_cfg *cfg = irq_cfg + 0;
         int apic1, pin1, apic2, pin2;
+        unsigned long flags;
+
+        local_irq_save(flags);
 
         /*
          * get/set the timer IRQ vector:
@@ -1696,7 +1702,7 @@ static inline void check_timer(void)
                         }
                         if (disable_timer_pin_1 > 0)
                                 clear_IO_APIC_pin(0, pin1);
-                        return;
+                        goto out;
                 }
                 clear_IO_APIC_pin(apic1, pin1);
                 apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: 8254 timer not "
@@ -1718,7 +1724,7 @@ static inline void check_timer(void)
                         if (nmi_watchdog == NMI_IO_APIC) {
                                 setup_nmi();
                         }
-                        return;
+                        goto out;
                 }
                 /*
                  * Cleanup, just in case ...
@@ -1741,7 +1747,7 @@ static inline void check_timer(void)
 
         if (timer_irq_works()) {
                 apic_printk(APIC_VERBOSE," works.\n");
-                return;
+                goto out;
         }
         apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector);
         apic_printk(APIC_VERBOSE," failed.\n");
@@ -1756,10 +1762,12 @@ static inline void check_timer(void)
 
         if (timer_irq_works()) {
                 apic_printk(APIC_VERBOSE," works.\n");
-                return;
+                goto out;
         }
         apic_printk(APIC_VERBOSE," failed :(.\n");
         panic("IO-APIC + timer doesn't work! Try using the 'noapic' kernel parameter\n");
+out:
+        local_irq_restore(flags);
 }
 
 static int __init notimercheck(char *s)
diff --git a/arch/x86/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c
index d87a523070..3a020f79f8 100644
--- a/arch/x86/kernel/kprobes_32.c
+++ b/arch/x86/kernel/kprobes_32.c
@@ -727,9 +727,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 
         if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) {
                 if (&regs->esp != kcb->jprobe_saved_esp) {
-                        struct pt_regs *saved_regs =
-                            container_of(kcb->jprobe_saved_esp,
-                                            struct pt_regs, esp);
+                        struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;
                         printk("current esp %p does not match saved esp %p\n",
                                &regs->esp, kcb->jprobe_saved_esp);
                         printk("Saved registers for jprobe %p\n", jp);
diff --git a/arch/x86/kernel/kprobes_64.c b/arch/x86/kernel/kprobes_64.c
index 0c46764458..5df19a9f92 100644
--- a/arch/x86/kernel/kprobes_64.c
+++ b/arch/x86/kernel/kprobes_64.c
@@ -485,7 +485,6 @@ static void __kprobes resume_execution(struct kprobe *p,
                 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
 {
         unsigned long *tos = (unsigned long *)regs->rsp;
-        unsigned long next_rip = 0;
         unsigned long copy_rip = (unsigned long)p->ainsn.insn;
         unsigned long orig_rip = (unsigned long)p->addr;
         kprobe_opcode_t *insn = p->ainsn.insn;
@@ -494,46 +493,42 @@ static void __kprobes resume_execution(struct kprobe *p,
         if (*insn >= 0x40 && *insn <= 0x4f)
                 insn++;
 
+        regs->eflags &= ~TF_MASK;
         switch (*insn) {
-        case 0x9c:              /* pushfl */
+        case 0x9c:      /* pushfl */
                 *tos &= ~(TF_MASK | IF_MASK);
                 *tos |= kcb->kprobe_old_rflags;
                 break;
-        case 0xc3:              /* ret/lret */
-        case 0xcb:
-        case 0xc2:
+        case 0xc2:      /* iret/ret/lret */
+        case 0xc3:
         case 0xca:
-                regs->eflags &= ~TF_MASK;
-                /* rip is already adjusted, no more changes required*/
-                return;
-        case 0xe8:              /* call relative - Fix return addr */
+        case 0xcb:
+        case 0xcf:
+        case 0xea:      /* jmp absolute -- ip is correct */
+                /* ip is already adjusted, no more changes required */
+                goto no_change;
+        case 0xe8:      /* call relative - Fix return addr */
                 *tos = orig_rip + (*tos - copy_rip);
                 break;
         case 0xff:
                 if ((insn[1] & 0x30) == 0x10) {
                         /* call absolute, indirect */
-                        /* Fix return addr; rip is correct. */
-                        next_rip = regs->rip;
+                        /* Fix return addr; ip is correct. */
                         *tos = orig_rip + (*tos - copy_rip);
+                        goto no_change;
                 } else if (((insn[1] & 0x31) == 0x20) ||        /* jmp near, absolute indirect */
                            ((insn[1] & 0x31) == 0x21)) {        /* jmp far, absolute indirect */
-                        /* rip is correct. */
-                        next_rip = regs->rip;
+                        /* ip is correct. */
+                        goto no_change;
                 }
-                break;
-        case 0xea:              /* jmp absolute -- rip is correct */
-                next_rip = regs->rip;
-                break;
         default:
                 break;
         }
 
-        regs->eflags &= ~TF_MASK;
-        if (next_rip) {
-                regs->rip = next_rip;
-        } else {
-                regs->rip = orig_rip + (regs->rip - copy_rip);
-        }
+        regs->rip = orig_rip + (regs->rip - copy_rip);
+no_change:
+
+        return;
 }
 
 int __kprobes post_kprobe_handler(struct pt_regs *regs)
@@ -716,10 +711,8 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
         struct jprobe *jp = container_of(p, struct jprobe, kp);
 
         if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) {
-                if ((long *)regs->rsp != kcb->jprobe_saved_rsp) {
-                        struct pt_regs *saved_regs =
-                            container_of(kcb->jprobe_saved_rsp,
-                                            struct pt_regs, rsp);
+                if ((unsigned long *)regs->rsp != kcb->jprobe_saved_rsp) {
+                        struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;
                         printk("current rsp %p does not match saved rsp %p\n",
                                (long *)regs->rsp, kcb->jprobe_saved_rsp);
                         printk("Saved registers for jprobe %p\n", jp);
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 7b899584d2..9663c2a748 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -261,7 +261,7 @@ static void mwait_idle(void)
         mwait_idle_with_hints(0, 0);
 }
 
-void __devinit select_idle_routine(const struct cpuinfo_x86 *c)
+void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
 {
         if (cpu_has(c, X86_FEATURE_MWAIT)) {
                 printk("monitor/mwait feature present.\n");
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index e1e18c34c8..9c24b45b51 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -67,7 +67,7 @@
    address, and must not be in the .bss segment! */
 unsigned long init_pg_tables_end __initdata = ~0UL;
 
-int disable_pse __devinitdata = 0;
+int disable_pse __cpuinitdata = 0;
 
 /*
  * Machine setup..
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index ef0f34ede1..4ea80cbe52 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -60,7 +60,7 @@
 #include <asm/mtrr.h>
 
 /* Set if we find a B stepping CPU */
-static int __devinitdata smp_b_stepping;
+static int __cpuinitdata smp_b_stepping;
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
@@ -745,8 +745,8 @@ static inline int alloc_cpu_id(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static struct task_struct * __devinitdata cpu_idle_tasks[NR_CPUS];
-static inline struct task_struct * alloc_idle_task(int cpu)
+static struct task_struct * __cpuinitdata cpu_idle_tasks[NR_CPUS];
+static inline struct task_struct * __cpuinit alloc_idle_task(int cpu)
 {
         struct task_struct *idle;
 
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 500670c93d..594889521d 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -141,8 +141,8 @@ static void __cpuinit smp_store_cpu_info(int id)
         struct cpuinfo_x86 *c = &cpu_data(id);
 
         *c = boot_cpu_data;
-        c->cpu_index = id;
         identify_cpu(c);
+        c->cpu_index = id;
         print_cpu_info(c);
 }
 
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
index db284ef44d..2e5efaaf88 100644
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -192,42 +192,25 @@ static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long en
         return 0;
 }
 
-static int res_kernel_text_pud_init(pud_t *pud, unsigned long start)
-{
-        pmd_t *pmd;
-        unsigned long paddr;
-
-        pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);
-        if (!pmd)
-                return -ENOMEM;
-        set_pud(pud + pud_index(start), __pud(__pa(pmd) | _KERNPG_TABLE));
-        for (paddr = 0; paddr < KERNEL_TEXT_SIZE; pmd++, paddr += PMD_SIZE) {
-                unsigned long pe;
-
-                pe = __PAGE_KERNEL_LARGE_EXEC | _PAGE_GLOBAL | paddr;
-                pe &= __supported_pte_mask;
-                set_pmd(pmd, __pmd(pe));
-        }
-
-        return 0;
-}
-
 static int set_up_temporary_mappings(void)
 {
         unsigned long start, end, next;
-        pud_t *pud;
         int error;
 
         temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);
         if (!temp_level4_pgt)
                 return -ENOMEM;
 
+        /* It is safe to reuse the original kernel mapping */
+        set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
+                init_level4_pgt[pgd_index(__START_KERNEL_map)]);
+
         /* Set up the direct mapping from scratch */
         start = (unsigned long)pfn_to_kaddr(0);
         end = (unsigned long)pfn_to_kaddr(end_pfn);
 
         for (; start < end; start = next) {
-                pud = (pud_t *)get_safe_page(GFP_ATOMIC);
+                pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);
                 if (!pud)
                         return -ENOMEM;
                 next = start + PGDIR_SIZE;
@@ -238,17 +221,7 @@ static int set_up_temporary_mappings(void)
                 set_pgd(temp_level4_pgt + pgd_index(start),
                         mk_kernel_pgd(__pa(pud)));
         }
-
-        /* Set up the kernel text mapping from scratch */
-        pud = (pud_t *)get_safe_page(GFP_ATOMIC);
-        if (!pud)
-                return -ENOMEM;
-        error = res_kernel_text_pud_init(pud, __START_KERNEL_map);
-        if (!error)
-                set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
-                        __pgd(__pa(pud) | _PAGE_TABLE));
-
-        return error;
+        return 0;
 }
 
 int swsusp_arch_resume(void)
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index ef60102625..c88bbffcaa 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -373,14 +373,13 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (die.lock_owner != raw_smp_processor_id()) {
                 console_verbose();
+                raw_local_irq_save(flags);
                 __raw_spin_lock(&die.lock);
-                raw_local_save_flags(flags);
                 die.lock_owner = smp_processor_id();
                 die.lock_owner_depth = 0;
                 bust_spinlocks(1);
-        }
-        else
-                raw_local_save_flags(flags);
+        } else
+                raw_local_irq_save(flags);
 
         if (++die.lock_owner_depth < 3) {
                 unsigned long esp;
diff --git a/arch/x86/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_athlon.c
index 3057a19e46..c3ee43333f 100644
--- a/arch/x86/oprofile/op_model_athlon.c
+++ b/arch/x86/oprofile/op_model_athlon.c
@@ -1,6 +1,6 @@
 /**
  * @file op_model_athlon.h
- * athlon / K7 model-specific MSR operations
+ * athlon / K7 / K8 / Family 10h model-specific MSR operations
  *
  * @remark Copyright 2002 OProfile authors
  * @remark Read the file COPYING
@@ -31,12 +31,16 @@
 #define CTRL_WRITE(l,h,msrs,c) do {wrmsr(msrs->controls[(c)].addr, (l), (h));} while (0)
 #define CTRL_SET_ACTIVE(n) (n |= (1<<22))
 #define CTRL_SET_INACTIVE(n) (n &= ~(1<<22))
-#define CTRL_CLEAR(x) (x &= (1<<21))
+#define CTRL_CLEAR_LO(x) (x &= (1<<21))
+#define CTRL_CLEAR_HI(x) (x &= 0xfffffcf0)
 #define CTRL_SET_ENABLE(val) (val |= 1<<20)
 #define CTRL_SET_USR(val,u) (val |= ((u & 1) << 16))
 #define CTRL_SET_KERN(val,k) (val |= ((k & 1) << 17))
 #define CTRL_SET_UM(val, m) (val |= (m << 8))
-#define CTRL_SET_EVENT(val, e) (val |= e)
+#define CTRL_SET_EVENT_LOW(val, e) (val |= (e & 0xff))
+#define CTRL_SET_EVENT_HIGH(val, e) (val |= ((e >> 8) & 0xf))
+#define CTRL_SET_HOST_ONLY(val, h) (val |= ((h & 1) << 9))
+#define CTRL_SET_GUEST_ONLY(val, h) (val |= ((h & 1) << 8))
 
 static unsigned long reset_value[NUM_COUNTERS];
  
@@ -70,7 +74,8 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs)
                 if (unlikely(!CTRL_IS_RESERVED(msrs,i)))
                         continue;
                 CTRL_READ(low, high, msrs, i);
-                CTRL_CLEAR(low);
+                CTRL_CLEAR_LO(low);
+                CTRL_CLEAR_HI(high);
                 CTRL_WRITE(low, high, msrs, i);
         }
 
@@ -89,12 +94,17 @@ static void athlon_setup_ctrs(struct op_msrs const * const msrs)
                         CTR_WRITE(counter_config[i].count, msrs, i);
 
                         CTRL_READ(low, high, msrs, i);
-                        CTRL_CLEAR(low);
+                        CTRL_CLEAR_LO(low);
+                        CTRL_CLEAR_HI(high);
                         CTRL_SET_ENABLE(low);
                         CTRL_SET_USR(low, counter_config[i].user);
                         CTRL_SET_KERN(low, counter_config[i].kernel);
                         CTRL_SET_UM(low, counter_config[i].unit_mask);
-                        CTRL_SET_EVENT(low, counter_config[i].event);
+                        CTRL_SET_EVENT_LOW(low, counter_config[i].event);
+                        CTRL_SET_EVENT_HIGH(high, counter_config[i].event);
+                        CTRL_SET_HOST_ONLY(high, 0);
+                        CTRL_SET_GUEST_ONLY(high, 0);
+
                         CTRL_WRITE(low, high, msrs, i);
                 } else {
                         reset_value[i] = 0;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 94c39aaf69..b6af3ea43c 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1131,7 +1131,7 @@ asmlinkage void __init xen_start_kernel(void)
         if (!xen_start_info)
                 return;
 
-        BUG_ON(memcmp(xen_start_info->magic, "xen-3.0", 7) != 0);
+        BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
 
         /* Install Xen paravirt ops */
         pv_info = xen_info;