lkml.org 
[lkml]   [2014]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 9/9] x86, apic: Remove enable_apic_mode callback
    The enable_apic_mode() apic callback is never called, so remove it.

    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    arch/x86/include/asm/apic.h | 1 -
    arch/x86/kernel/apic/apic.c | 2 --
    arch/x86/kernel/apic/apic_flat_64.c | 2 --
    arch/x86/kernel/apic/apic_noop.c | 1 -
    arch/x86/kernel/apic/apic_numachip.c | 1 -
    arch/x86/kernel/apic/bigsmp_32.c | 1 -
    arch/x86/kernel/apic/probe_32.c | 1 -
    arch/x86/kernel/apic/x2apic_cluster.c | 1 -
    arch/x86/kernel/apic/x2apic_phys.c | 1 -
    arch/x86/kernel/apic/x2apic_uv_x.c | 1 -
    10 files changed, 12 deletions(-)

    diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
    --- a/arch/x86/include/asm/apic.h
    +++ b/arch/x86/include/asm/apic.h
    @@ -303,7 +303,6 @@ struct apic {
    int (*cpu_present_to_apicid)(int mps_cpu);
    void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);
    int (*check_phys_apicid_present)(int phys_apicid);
    - void (*enable_apic_mode)(void);
    int (*phys_pkg_id)(int cpuid_apic, int index_msb);

    unsigned int (*get_apic_id)(unsigned long x);
    diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -2042,8 +2042,6 @@ void __init connect_bsp_APIC(void)
    imcr_pic_to_apic();
    }
    #endif
    - if (apic->enable_apic_mode)
    - apic->enable_apic_mode();
    }

    /**
    diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
    --- a/arch/x86/kernel/apic/apic_flat_64.c
    +++ b/arch/x86/kernel/apic/apic_flat_64.c
    @@ -177,7 +177,6 @@ static struct apic apic_flat = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = flat_phys_pkg_id,

    .get_apic_id = flat_get_apic_id,
    @@ -286,7 +285,6 @@ static struct apic apic_physflat = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = flat_phys_pkg_id,

    .get_apic_id = flat_get_apic_id,
    diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
    --- a/arch/x86/kernel/apic/apic_noop.c
    +++ b/arch/x86/kernel/apic/apic_noop.c
    @@ -135,7 +135,6 @@ struct apic apic_noop = {
    .apicid_to_cpu_present = physid_set_mask_of_physid,

    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,

    .phys_pkg_id = noop_phys_pkg_id,

    diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
    --- a/arch/x86/kernel/apic/apic_numachip.c
    +++ b/arch/x86/kernel/apic/apic_numachip.c
    @@ -226,7 +226,6 @@ static const struct apic apic_numachip __refconst = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = numachip_phys_pkg_id,

    .get_apic_id = get_apic_id,
    diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
    --- a/arch/x86/kernel/apic/bigsmp_32.c
    +++ b/arch/x86/kernel/apic/bigsmp_32.c
    @@ -172,7 +172,6 @@ static struct apic apic_bigsmp = {
    .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid,
    .apicid_to_cpu_present = physid_set_mask_of_physid,
    .check_phys_apicid_present = bigsmp_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = bigsmp_phys_pkg_id,

    .get_apic_id = bigsmp_get_apic_id,
    diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
    --- a/arch/x86/kernel/apic/probe_32.c
    +++ b/arch/x86/kernel/apic/probe_32.c
    @@ -97,7 +97,6 @@ static struct apic apic_default = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = physid_set_mask_of_physid,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = default_phys_pkg_id,

    .get_apic_id = default_get_apic_id,
    diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
    --- a/arch/x86/kernel/apic/x2apic_cluster.c
    +++ b/arch/x86/kernel/apic/x2apic_cluster.c
    @@ -258,7 +258,6 @@ static struct apic apic_x2apic_cluster = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = x2apic_phys_pkg_id,

    .get_apic_id = x2apic_get_apic_id,
    diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
    --- a/arch/x86/kernel/apic/x2apic_phys.c
    +++ b/arch/x86/kernel/apic/x2apic_phys.c
    @@ -112,7 +112,6 @@ static struct apic apic_x2apic_phys = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = x2apic_phys_pkg_id,

    .get_apic_id = x2apic_get_apic_id,
    diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
    --- a/arch/x86/kernel/apic/x2apic_uv_x.c
    +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
    @@ -374,7 +374,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
    .cpu_present_to_apicid = default_cpu_present_to_apicid,
    .apicid_to_cpu_present = NULL,
    .check_phys_apicid_present = default_check_phys_apicid_present,
    - .enable_apic_mode = NULL,
    .phys_pkg_id = uv_phys_pkg_id,

    .get_apic_id = x2apic_get_apic_id,

    \
     
     \ /
      Last update: 2014-07-31 10:21    [W:5.571 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site