diff options
| author | David Rientjes | 2014-02-05 08:55:01 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2014-02-09 15:15:08 +0100 |
| commit | 465822cfc8cb850ba76046965cc7b6fd1f8c3d73 (patch) | |
| tree | 4d652719f6dd8864a85f8455381c23cfe6495305 /arch/x86/include/asm/apic.h | |
| parent | x86/apic: Only use default_wait_for_init_deassert() (diff) | |
| download | kernel-qcow2-linux-465822cfc8cb850ba76046965cc7b6fd1f8c3d73.tar.gz kernel-qcow2-linux-465822cfc8cb850ba76046965cc7b6fd1f8c3d73.tar.xz kernel-qcow2-linux-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/include/asm/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 2ef701381e2a..c1d3074b8514 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -351,7 +351,7 @@ struct apic { int trampoline_phys_low; int trampoline_phys_high; - void (*wait_for_init_deassert)(atomic_t *deassert); + bool wait_for_init_deassert; void (*smp_callin_clear_local_apic)(void); void (*inquire_remote_apic)(int apicid); @@ -517,12 +517,6 @@ extern int default_cpu_present_to_apicid(int mps_cpu); extern int default_check_phys_apicid_present(int phys_apicid); #endif -static inline void default_wait_for_init_deassert(atomic_t *deassert) -{ - while (!atomic_read(deassert)) - cpu_relax(); -} - extern void generic_bigsmp_probe(void); |