Skip to contentSkip to conversation

rcu: don't include <linux/ktime.h> in rcutiny.h

PATCH In review Christoph Hellwig 2 participants 4 messages Aug 22, 2019 RCU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rcu: don't include <linux/ktime.h> in rcutiny.h

The kbuild reported a built failure due to a header loop when RCUTINY is enabled with my pending riscv-nommu port. Switch rcutiny.h to only include the minimal required header to get HZ instead.

---
 include/linux/rcutiny.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/rcutiny.h +1 -1
index 8e727f57d814..9bf1dfe7781f 100644
@@ -12,7 +12,7 @@
 #ifndef __LINUX_TINY_H
 #define __LINUX_TINY_H
 
-#include <linux/ktime.h>
+#include <asm/param.h> /* for HZ */
 
 /* Never flag non-existent other CPUs! */
 static inline bool rcu_eqs_special_set(int cpu) { return false; }
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Christoph Hellwig

The kbuild reported a built failure due to a header loop when RCUTINY is enabled with my pending riscv-nommu port. Switch rcutiny.h to only include the minimal required header to get HZ instead.

Queued for review and testing, thank you!

Do you need this in v5.4? My normal workflow would put it into v5.5.

Thanx, Paul

Quoted 20 lines
---
 include/linux/rcutiny.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/rcutiny.h +1 -1
index 8e727f57d814..9bf1dfe7781f 100644
@@ -12,7 +12,7 @@
 #ifndef __LINUX_TINY_H
 #define __LINUX_TINY_H
 
-#include <linux/ktime.h>
+#include <asm/param.h> /* for HZ */
 
 /* Never flag non-existent other CPUs! */
 static inline bool rcu_eqs_special_set(int cpu) { return false; }
Signature · 1 line
2.20.1
#2 lore raw
Quoted 10 lines · Paul E. McKenney
Quoted 5 lines · Christoph Hellwig

The kbuild reported a built failure due to a header loop when RCUTINY is enabled with my pending riscv-nommu port. Switch rcutiny.h to only include the minimal required header to get HZ instead.

Queued for review and testing, thank you!

Do you need this in v5.4? My normal workflow would put it into v5.5.

I hope the riscv-nommu coe gets merges for 5.4, so if we could queue it up for that I'd appreciate it.

#3 lore raw
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Paul E. McKenney
Quoted 4 lines · Christoph Hellwig

The kbuild reported a built failure due to a header loop when RCUTINY is enabled with my pending riscv-nommu port. Switch rcutiny.h to only include the minimal required header to get HZ instead.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Queued for review and testing, thank you!

Do you need this in v5.4? My normal workflow would put it into v5.5.

I hope the riscv-nommu coe gets merges for 5.4, so if we could queue it up for that I'd appreciate it.

OK, it did pass rcutorture's various !SMP scenarios, so this seems plausible.

I am sending my main pull request today, but will also put this patch where 0day and -next can see it. If it does OK with that and with additional review/testing for a few days, I will send a second pull request with that patch some time next week.

Thanx, Paul