Skip to contentSkip to conversation

posix-timers: refer properly to CONFIG_HIGH_RES_TIMERS

PATCH Applied Lukas Bulwahn 2 participants 3 messages Jun 9, 2023 – Jun 18, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 posix-timers: refer properly to CONFIG_HIGH_RES_TIMERS

Commit c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments") turns an ifdef CONFIG_HIGH_RES_TIMERS into an conditional on "IS_ENABLED(CONFIG_HIGHRES_TIMERS)"; note that the new conditional refers to "HIGHRES_TIMERS" not "HIGH_RES_TIMERS" as before.

Fix this typo introduced in that refactoring.

Fixes c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments")
---
 kernel/time/posix-timers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/posix-timers.c +1 -1
index 8bb0dcf2e3d9..17fff6826a15 100644
@@ -356,7 +356,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
 			 * enabled as the periodic tick based timers are
 			 * automatically aligned to the next tick.
 			 */
-			if (IS_ENABLED(CONFIG_HIGHRES_TIMERS)) {
+			if (IS_ENABLED(CONFIG_HIGH_RES_TIMERS)) {
 				ktime_t kj = TICK_NSEC;
 
 				if (timr->it_interval < kj)
Signature · 1 line
2.17.1
merge bot Applied
#1 lore raw

[tip: timers/core] posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS

The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     0babddc4977904509287719c1314b9e04bec2307
Gitweb:        https://git.kernel.org/tip/0babddc4977904509287719c1314b9e04bec2307
Author:        Lukas Bulwahn <[email protected]>
AuthorDate:    Fri, 09 Jun 2023 11:46:43 +02:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Sat, 10 Jun 2023 13:58:35 +02:00

posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS

Commit c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments") turns an ifdef CONFIG_HIGH_RES_TIMERS into an conditional on "IS_ENABLED(CONFIG_HIGHRES_TIMERS)"; note that the new conditional refers to "HIGHRES_TIMERS" not "HIGH_RES_TIMERS" as before.

Fix this typo introduced in that refactoring.

Fixes c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments")
---
 kernel/time/posix-timers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/posix-timers.c +1 -1
index 8bb0dcf..17fff68 100644
@@ -356,7 +356,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
 			 * enabled as the periodic tick based timers are
 			 * automatically aligned to the next tick.
 			 */
-			if (IS_ENABLED(CONFIG_HIGHRES_TIMERS)) {
+			if (IS_ENABLED(CONFIG_HIGH_RES_TIMERS)) {
 				ktime_t kj = TICK_NSEC;
 
 				if (timr->it_interval < kj)
merge bot Applied
#2 lore raw

[tip: timers/core] posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS

In reply to Lukas Bulwahn
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     b9a40f24d8ea86f89f1299a3f2dccd601febe3e5
Gitweb:        https://git.kernel.org/tip/b9a40f24d8ea86f89f1299a3f2dccd601febe3e5
Author:        Lukas Bulwahn <[email protected]>
AuthorDate:    Fri, 09 Jun 2023 11:46:43 +02:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Sun, 18 Jun 2023 22:41:53 +02:00

posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS

Commit c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments") turns an ifdef CONFIG_HIGH_RES_TIMERS into an conditional on "IS_ENABLED(CONFIG_HIGHRES_TIMERS)"; note that the new conditional refers to "HIGHRES_TIMERS" not "HIGH_RES_TIMERS" as before.

Fix this typo introduced in that refactoring.

Fixes c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments")
---
 kernel/time/posix-timers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/posix-timers.c +1 -1
index e3cddd5..b924f0f 100644
@@ -356,7 +356,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
 			 * enabled as the periodic tick based timers are
 			 * automatically aligned to the next tick.
 			 */
-			if (IS_ENABLED(CONFIG_HIGHRES_TIMERS)) {
+			if (IS_ENABLED(CONFIG_HIGH_RES_TIMERS)) {
 				ktime_t kj = TICK_NSEC;
 
 				if (timr->it_interval < kj)