11 files changed, 35 insertions, 31 deletions

diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index 4554cc6fb96a..091508b533b4 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
@@ -16,7 +16,6 @@
 #endif
 
 .macro altinstruction_entry orig alt feature orig_len alt_len
-        .align 8
         .long \orig - .
         .long \alt - .
         .word \feature
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 23fb6d79f209..37ad100a2210 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -48,9 +48,6 @@ struct alt_instr {
         u16 cpuid;              /* cpuid bit set for replacement */
         u8  instrlen;           /* length of original instruction */
         u8  replacementlen;     /* length of new instruction, <= instrlen */
-#ifdef CONFIG_X86_64
-        u32 pad2;
-#endif
 };
 
 extern void alternative_instructions(void);
@@ -83,7 +80,6 @@ static inline int alternatives_text_reserved(void *start, void *end)
                                                                         \
       "661:\n\t" oldinstr "\n662:\n"                                    \
       ".section .altinstructions,\"a\"\n"                               \
-      _ASM_ALIGN "\n"                                                   \
       "  .long 661b - .\n"                      /* label           */   \
       "  .long 663f - .\n"                      /* new instruction */   \
       "  .word " __stringify(feature) "\n"      /* feature bit     */   \
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 4258aac99a6e..88b23a43f340 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -332,7 +332,6 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
                 asm goto("1: jmp %l[t_no]\n"
                          "2:\n"
                          ".section .altinstructions,\"a\"\n"
-                         _ASM_ALIGN "\n"
                          " .long 1b - .\n"
                          " .long 0\n"           /* no replacement */
                          " .word %P0\n"         /* feature bit */
@@ -350,7 +349,6 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
                 asm volatile("1: movb $0,%0\n"
                              "2:\n"
                              ".section .altinstructions,\"a\"\n"
-                             _ASM_ALIGN "\n"
                              " .long 1b - .\n"
                              " .long 3f - .\n"
                              " .word %P1\n"             /* feature bit */
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 3f2ad2640d85..ccdbc16b8941 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -42,8 +42,11 @@ int mach_set_rtc_mmss(unsigned long nowtime)
 {
         int real_seconds, real_minutes, cmos_minutes;
         unsigned char save_control, save_freq_select;
+        unsigned long flags;
         int retval = 0;
 
+        spin_lock_irqsave(&rtc_lock, flags);
+
          /* tell the clock it's being set */
         save_control = CMOS_READ(RTC_CONTROL);
         CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
@@ -93,12 +96,17 @@ int mach_set_rtc_mmss(unsigned long nowtime)
         CMOS_WRITE(save_control, RTC_CONTROL);
         CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
 
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
         return retval;
 }
 
 unsigned long mach_get_cmos_time(void)
 {
         unsigned int status, year, mon, day, hour, min, sec, century = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
 
         /*
          * If UIP is clear, then we have >= 244 microseconds before
@@ -125,6 +133,8 @@ unsigned long mach_get_cmos_time(void)
         status = CMOS_READ(RTC_CONTROL);
         WARN_ON_ONCE(RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));
 
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
         if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) {
                 sec = bcd2bin(sec);
                 min = bcd2bin(min);
@@ -169,24 +179,15 @@ EXPORT_SYMBOL(rtc_cmos_write);
 
 int update_persistent_clock(struct timespec now)
 {
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        retval = x86_platform.set_wallclock(now.tv_sec);
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
-        return retval;
+        return x86_platform.set_wallclock(now.tv_sec);
 }
 
 /* not static: needed by APM */
 void read_persistent_clock(struct timespec *ts)
 {
-        unsigned long retval, flags;
+        unsigned long retval;
 
-        spin_lock_irqsave(&rtc_lock, flags);
         retval = x86_platform.get_wallclock();
-        spin_unlock_irqrestore(&rtc_lock, flags);
 
         ts->tv_sec = retval;
         ts->tv_nsec = 0;
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 6f08bc940fa8..8b4cc5f067de 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -3603,7 +3603,7 @@ done_prefixes:
                 break;
         case Src2CL:
                 ctxt->src2.bytes = 1;
-                ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0x8;
+                ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0xff;
                 break;
         case Src2ImmByte:
                 rc = decode_imm(ctxt, &ctxt->src2, 1, true);
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 1c5b69373a00..8e8da7960dbe 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -400,7 +400,8 @@ static u64 __update_clear_spte_slow(u64 *sptep, u64 spte)
 
         /* xchg acts as a barrier before the setting of the high bits */
         orig.spte_low = xchg(&ssptep->spte_low, sspte.spte_low);
-        orig.spte_high = ssptep->spte_high = sspte.spte_high;
+        orig.spte_high = ssptep->spte_high;
+        ssptep->spte_high = sspte.spte_high;
         count_spte_clear(sptep, spte);
 
         return orig.spte;
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 73d70d65e76e..6d5dbcdd444a 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -58,8 +58,11 @@ EXPORT_SYMBOL_GPL(vrtc_cmos_write);
 unsigned long vrtc_get_time(void)
 {
         u8 sec, min, hour, mday, mon;
+        unsigned long flags;
         u32 year;
 
+        spin_lock_irqsave(&rtc_lock, flags);
+
         while ((vrtc_cmos_read(RTC_FREQ_SELECT) & RTC_UIP))
                 cpu_relax();
 
@@ -70,6 +73,8 @@ unsigned long vrtc_get_time(void)
         mon = vrtc_cmos_read(RTC_MONTH);
         year = vrtc_cmos_read(RTC_YEAR);
 
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
         /* vRTC YEAR reg contains the offset to 1960 */
         year += 1960;
 
@@ -83,8 +88,10 @@ unsigned long vrtc_get_time(void)
 int vrtc_set_mmss(unsigned long nowtime)
 {
         int real_sec, real_min;
+        unsigned long flags;
         int vrtc_min;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         vrtc_min = vrtc_cmos_read(RTC_MINUTES);
 
         real_sec = nowtime % 60;
@@ -95,6 +102,8 @@ int vrtc_set_mmss(unsigned long nowtime)
 
         vrtc_cmos_write(real_sec, RTC_SECONDS);
         vrtc_cmos_write(real_min, RTC_MINUTES);
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
         return 0;
 }
 
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 20a614275064..3dd53f997b11 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1721,10 +1721,8 @@ void __init xen_setup_machphys_mapping(void)
                 machine_to_phys_nr = MACH2PHYS_NR_ENTRIES;
         }
 #ifdef CONFIG_X86_32
-        if ((machine_to_phys_mapping + machine_to_phys_nr)
-            < machine_to_phys_mapping)
-                machine_to_phys_nr = (unsigned long *)NULL
-                                     - machine_to_phys_mapping;
+        WARN_ON((machine_to_phys_mapping + (machine_to_phys_nr - 1))
+                < machine_to_phys_mapping);
 #endif
 }
 
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index c3b8d440873c..46d6d21dbdbe 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -306,10 +306,12 @@ char * __init xen_memory_setup(void)
         sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
 
         extra_limit = xen_get_max_pages();
-        if (extra_limit >= max_pfn)
-                extra_pages = extra_limit - max_pfn;
-        else
-                extra_pages = 0;
+        if (max_pfn + extra_pages > extra_limit) {
+                if (extra_limit > max_pfn)
+                        extra_pages = extra_limit - max_pfn;
+                else
+                        extra_pages = 0;
+        }
 
         extra_pages += xen_return_unused_memory(xen_start_info->nr_pages, &e820);
 
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d4fc6d454f8d..041d4fe9dfe4 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -532,7 +532,6 @@ static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus)
         WARN_ON(xen_smp_intr_init(0));
 
         xen_init_lock_cpu(0);
-        xen_init_spinlocks();
 }
 
 static int __cpuinit xen_hvm_cpu_up(unsigned int cpu)
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 5158c505bef9..163b4679556e 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -168,9 +168,10 @@ cycle_t xen_clocksource_read(void)
         struct pvclock_vcpu_time_info *src;
         cycle_t ret;
 
-        src = &get_cpu_var(xen_vcpu)->time;
+        preempt_disable_notrace();
+        src = &__get_cpu_var(xen_vcpu)->time;
         ret = pvclock_clocksource_read(src);
-        put_cpu_var(xen_vcpu);
+        preempt_enable_notrace();
         return ret;
 }