[tip:,timers/core] tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard
diff mbox series

Message ID 162247362024.29796.4665276490727895520.tip-bot2@tip-bot2
State Accepted
Commit c2d4fee3f6d170dee5ee7c337a0ba5e92fad7a64
Headers show
Series
  • [tip:,timers/core] tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard
Related show

Commit Message

tip-bot2 for Balbir Singh May 31, 2021, 3:07 p.m. UTC
The following commit has been merged into the timers/core branch of tip:

Commit-ID:     c2d4fee3f6d170dee5ee7c337a0ba5e92fad7a64
Gitweb:        https://git.kernel.org/tip/c2d4fee3f6d170dee5ee7c337a0ba5e92fad7a64
Author:        Will Deacon <will@kernel.org>
AuthorDate:    Mon, 24 May 2021 23:18:14 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 31 May 2021 17:04:44 +02:00

tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard

tick-broadcast.o is only built if CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
so remove the redundant #ifdef guards around the definition of
tick_receive_broadcast().

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210524221818.15850-2-will@kernel.org

---
 kernel/time/tick-broadcast.c | 2 --
 1 file changed, 2 deletions(-)

Patch
diff mbox series

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index a440552..fb794ff 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -253,7 +253,6 @@  int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
 	return ret;
 }
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 int tick_receive_broadcast(void)
 {
 	struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
@@ -268,7 +267,6 @@  int tick_receive_broadcast(void)
 	evt->event_handler(evt);
 	return 0;
 }
-#endif
 
 /*
  * Broadcast the event to the cpus, which are set in the mask (mangled).