diff --git a/[refs] b/[refs] index ca7713a8e0e6..7c26443f4d50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72ec61a9e8347375e37c05e23511173d8451c3d4 +refs/heads/master: 8feb8e896d77439146d2e2ab3d0ab55bb5baf5fc diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h index 717fb746c9a8..a34d4f15430d 100644 --- a/trunk/include/linux/smp.h +++ b/trunk/include/linux/smp.h @@ -90,10 +90,6 @@ void kick_all_cpus_sync(void); void __init call_function_init(void); void generic_smp_call_function_single_interrupt(void); void generic_smp_call_function_interrupt(void); -void ipi_call_lock(void); -void ipi_call_unlock(void); -void ipi_call_lock_irq(void); -void ipi_call_unlock_irq(void); #else static inline void call_function_init(void) { } #endif diff --git a/trunk/kernel/smp.c b/trunk/kernel/smp.c index d0ae5b24875e..29dd40a9f2f4 100644 --- a/trunk/kernel/smp.c +++ b/trunk/kernel/smp.c @@ -581,26 +581,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait) return 0; } EXPORT_SYMBOL(smp_call_function); - -void ipi_call_lock(void) -{ - raw_spin_lock(&call_function.lock); -} - -void ipi_call_unlock(void) -{ - raw_spin_unlock(&call_function.lock); -} - -void ipi_call_lock_irq(void) -{ - raw_spin_lock_irq(&call_function.lock); -} - -void ipi_call_unlock_irq(void) -{ - raw_spin_unlock_irq(&call_function.lock); -} #endif /* USE_GENERIC_SMP_HELPERS */ /* Setup configured maximum number of CPUs to activate */