Skip to contentSkip to conversation

hrtimer: redundant #ifdef block

PATCH New Pratyush Patel 2 participants 2 messages Mar 1, 2016 – Jun 10, 2016

Subsystems (2)
Kernel janitors High-resolution timers, timer wheel, clockevents
lore
Share & tools
lore

Pratyush Patel

author
#0 lore raw

PATCH 1/1 hrtimer: redundant #ifdef block

Only need CONFIG_NO_HZ_COMMON as this block is already in a CONFIG_SMP block.

Signed-off-by Pratyush Patel <[email protected]>
kernel/time/hrtimer.c +1 -1
diff -urpN a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
@@ -177,7 +177,7 @@ hrtimer_check_target(struct hrtimer *tim
 #endif
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
+#ifdef CONFIG_NO_HZ_COMMON
 static inline
 struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base,
 					 int pinned)
merge bot
#1 lore raw

[tip:timers/core] hrtimer: Remove redundant #ifdef block

hrtimer: Remove redundant #ifdef block
Commit-ID:  86721ab63b61ef1dd7305308e4049f644703decf
Gitweb:     http://git.kernel.org/tip/86721ab63b61ef1dd7305308e4049f644703decf
Author:     Pratyush Patel <[email protected]>
AuthorDate: Tue, 1 Mar 2016 22:58:49 +0530
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Fri, 10 Jun 2016 11:25:35 +0200

hrtimer: Remove redundant #ifdef block

Only need CONFIG_NO_HZ_COMMON as this block is already in a CONFIG_SMP block.

Signed-off-by Pratyush Patel <[email protected]>
Link http://lkml.kernel.org/r/20160301172849.GA18152@cyborg open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 kernel/time/hrtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/hrtimer.c +1 -1
index e99df0f..d13c9ae 100644
@@ -177,7 +177,7 @@ hrtimer_check_target(struct hrtimer *timer, struct hrtimer_clock_base *new_base)
 #endif
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
+#ifdef CONFIG_NO_HZ_COMMON
 static inline
 struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base,
 					 int pinned)