[tip:x86/apic] x86, apic: Replace noop_check_apicid_used

tip-bot for David Rientjes
2014-07-31T17:07:57Z

Commit-ID: 4c59f3e63d5a0673af8abbce64467a6b497c94d2
Gitweb: http://git.kernel.org/tip/4c59f3e63d5a0673af8abbce64467a6b497c94d2
Author: David Rientjes <rientjes@google.com>
AuthorDate: Wed, 30 Jul 2014 23:53:40 -0700
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Thu, 31 Jul 2014 08:05:43 -0700

x86, apic: Replace noop_check_apicid_used

noop_check_apicid_used() has the same implementation as
default_check_apicid_used() in the standard header file, so replace the
former with the latter.

Signed-off-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302350450.17503@chino.kir.corp.google.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/apic/apic_noop.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 8c165d9..c480dac 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -89,11 +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 void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
const struct cpumask *mask)
{
@@ -128,7 +123,7 @@ 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_used = default_check_apicid_used,

.vector_allocation_domain = noop_vector_allocation_domain,
.init_apic_ldr = noop_init_apic_ldr,