1 files changed, 1 insertions, 22 deletions

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 8c7c98249c20..b205cdbdbe6a 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -89,16 +89,6 @@ static const struct cpumask *noop_target_cpus(void)
         return cpumask_of(0);
 }
 
-static unsigned long noop_check_apicid_used(physid_mask_t *map, int apicid)
-{
-        return physid_isset(apicid, *map);
-}
-
-static unsigned long noop_check_apicid_present(int bit)
-{
-        return physid_isset(bit, phys_cpu_present_map);
-}
-
 static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
                                           const struct cpumask *mask)
 {
@@ -133,27 +123,21 @@ struct apic apic_noop = {
         .target_cpus                    = noop_target_cpus,
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
-        .check_apicid_used              = noop_check_apicid_used,
-        .check_apicid_present           = noop_check_apicid_present,
+        .check_apicid_used              = default_check_apicid_used,
 
         .vector_allocation_domain       = noop_vector_allocation_domain,
         .init_apic_ldr                  = noop_init_apic_ldr,
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
 
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = physid_set_mask_of_physid,
 
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
 
         .phys_pkg_id                    = noop_phys_pkg_id,
 
-        .mps_oem_check                  = NULL,
-
         .get_apic_id                    = noop_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = 0x0F << 24,
@@ -168,12 +152,7 @@ struct apic apic_noop = {
 
         .wakeup_secondary_cpu           = noop_wakeup_secondary_cpu,
 
-        /* should be safe */
-        .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                           = noop_apic_read,