Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...

Pull x86 ras, uv and vdso fixlets from Ingo Molnar:
 "ras: tone down a kernel message to only occur during initial bootup,
    not during suspend/resume cycles.

  uv: a cleanup commit

  vdso: a fix to error checking"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Avoid showing repetitive message from intel_init_thermal()

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/uv: Remove unnecessary #ifdef

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix vdso2c's special_pages[] error checking

diff --combined arch/x86/kernel/apic/x2apic_uv_x.c
index 004f017,004f017,2f1b5e0,004f017..8e9dcfd
--- 1/arch/x86/kernel/apic/x2apic_uv_x.c
--- 2/arch/x86/kernel/apic/x2apic_uv_x.c
--- 3/arch/x86/kernel/apic/x2apic_uv_x.c
--- 4/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@@@@ -204,7 -204,7 -204,6 -204,7 +204,6 @@@@@ EXPORT_SYMBOL(sn_rtc_cycles_per_second)
    
    static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
    {
-- -#ifdef CONFIG_SMP
        unsigned long val;
        int pnode;
    
@@@@@ -223,7 -223,7 -222,6 -223,7 +222,6 @@@@@
        uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
    
        atomic_set(&init_deasserted, 1);
-- -#endif
        return 0;
    }
    
@@@@@ -365,16 -365,16 -363,21 -365,16 +363,16 @@@@@ static struct apic __refdata apic_x2api
        .disable_esr                    = 0,
        .dest_logical                   = APIC_DEST_LOGICAL,
        .check_apicid_used              = NULL,
  -     .check_apicid_present           = NULL,
    
        .vector_allocation_domain       = default_vector_allocation_domain,
        .init_apic_ldr                  = uv_init_apic_ldr,
    
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
  -     .multi_timer_check              = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
  -     .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = default_check_phys_apicid_present,
  -     .enable_apic_mode               = NULL,
        .phys_pkg_id                    = uv_phys_pkg_id,
  -     .mps_oem_check                  = NULL,
    
        .get_apic_id                    = x2apic_get_apic_id,
        .set_apic_id                    = set_apic_id,
@@@@@ -389,7 -389,7 -392,10 -389,7 +387,7 @@@@@
        .send_IPI_self                  = uv_send_IPI_self,
    
        .wakeup_secondary_cpu           = uv_wakeup_secondary,
  -     .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
  -     .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
        .wait_for_init_deassert         = false,
  -     .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL,
    
        .read                           = native_apic_msr_read,