Skip to contentSkip to conversation

time: posix-stubs: provide compat itimer supoprt for alpha

PATCH Applied Arnd Bergmann 3 participants 3 messages Dec 7, 2019 – Jan 9, 2020

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

PATCH 1/1 time: posix-stubs: provide compat itimer supoprt for alpha

Using compat_sys_getitimer and compat_sys_setitimer on alpha causes a link failure in the Alpha tinyconfig and other configurations that turn off CONFIG_POSIX_TIMERS.

Use the same #ifdef check for the stub version as well.

Fixes 4c22ea2b9120 ("y2038: use compat_{get,set}_itimer on alpha")
---
 kernel/time/posix-stubs.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/time/posix-stubs.c +3 -0
index 67df65f887ac..20c65a7d4e3a 100644
@@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 
 #ifdef CONFIG_COMPAT
 COMPAT_SYS_NI(timer_create);
+#endif
+
+#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
 #endif
Signature · 1 line
2.20.0
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Arnd Bergmann

Using compat_sys_getitimer and compat_sys_setitimer on alpha causes a link failure in the Alpha tinyconfig and other configurations that turn off CONFIG_POSIX_TIMERS.

Use the same #ifdef check for the stub version as well.

Fixes 4c22ea2b9120 ("y2038: use compat_{get,set}_itimer on alpha")
Quoted 21 lines
---
 kernel/time/posix-stubs.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/time/posix-stubs.c +3 -0
index 67df65f887ac..20c65a7d4e3a 100644
@@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 
 #ifdef CONFIG_COMPAT
 COMPAT_SYS_NI(timer_create);
+#endif
+
+#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
 #endif
Signature · 1 line
2.20.0
merge bot Applied
#2 lore raw

[tip: timers/urgent] time/posix-stubs: Provide compat itimer supoprt for alpha

In reply to Arnd Bergmann
The following commit has been merged into the timers/urgent branch of tip:

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

Commit-ID:     f35deaff1b8eadb9897e4fb8b3edc7717f4ec6fa
Gitweb:        https://git.kernel.org/tip/f35deaff1b8eadb9897e4fb8b3edc7717f4ec6fa
Author:        Arnd Bergmann <[email protected]>
AuthorDate:    Sat, 07 Dec 2019 20:10:26 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Thu, 09 Jan 2020 18:20:23 +01:00

time/posix-stubs: Provide compat itimer supoprt for alpha

Using compat_sys_getitimer and compat_sys_setitimer on alpha causes a link failure in the Alpha tinyconfig and other configurations that turn off CONFIG_POSIX_TIMERS.

Use the same #ifdef check for the stub version as well.

---
 kernel/time/posix-stubs.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/time/posix-stubs.c +3 -0
index 67df65f..20c65a7 100644
@@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 
 #ifdef CONFIG_COMPAT
 COMPAT_SYS_NI(timer_create);
+#endif
+
+#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
 #endif