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

[sfrench/cifs-2.6.git] / arch / x86 / kernel / apic / x2apic_uv_x.c

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 2f1b5e0df6601ba0a049d2274a5b5fad72be4ee7..8e9dcfd630e4b539e7936050b7bb1673660ae752 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -363,21 +363,16 @@ static struct apic __refdata apic_x2apic_uv_x = {
        .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,
@@ -392,10 +387,7 @@ static struct apic __refdata apic_x2apic_uv_x = {
        .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,