aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic_flat_64.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2014-02-04 23:55:01 -0800
committerIngo Molnar <mingo@kernel.org>2014-02-09 15:15:08 +0100
commit465822cfc8cb850ba76046965cc7b6fd1f8c3d73 (patch)
tree4d652719f6dd8864a85f8455381c23cfe6495305 /arch/x86/kernel/apic/apic_flat_64.c
parentx86/apic: Only use default_wait_for_init_deassert() (diff)
downloadlinux-dev-465822cfc8cb850ba76046965cc7b6fd1f8c3d73.tar.xz
linux-dev-465822cfc8cb850ba76046965cc7b6fd1f8c3d73.zip
x86/apic: Switch wait_for_init_deassert() to a bool flag
Now that there is only a single wait_for_init_deassert() function, just convert the member of struct apic to a bool to determine whether we need to wait for init_deassert to become non-zero. There are no more callers of default_wait_for_init_deassert(), so fold it into the caller. Signed-off-by: David Rientjes <rientjes@google.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1402042354010.7839@chino.kir.corp.google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/apic_flat_64.c')
-rw-r--r--arch/x86/kernel/apic/apic_flat_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 2c621a6b901a..7c1b29479513 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -198,7 +198,7 @@ static struct apic apic_flat = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
- .wait_for_init_deassert = NULL,
+ .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,
@@ -314,7 +314,7 @@ static struct apic apic_physflat = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
- .wait_for_init_deassert = NULL,
+ .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,