* [PATCH] timekeeping: remove unused get_seconds()
@ 2020-12-01 9:52 Chunguang Xu
2021-01-12 20:18 ` [tip: timers/urgent] timekeeping: Remove " tip-bot2 for Chunguang Xu
0 siblings, 1 reply; 2+ messages in thread
From: Chunguang Xu @ 2020-12-01 9:52 UTC (permalink / raw)
To: sboyd; +Cc: tglx, john.stultz, linux-kernel
From: Chunguang Xu <brookxu@tencent.com>
The get_seconds() cleanup seems to have been completed, now it is
time to delete the legacy interface to avoid misuse later.
Signed-off-by: Chunguang Xu <brookxu@tencent.com>
---
include/linux/ktime.h | 1 -
include/linux/timekeeping32.h | 14 --------------
kernel/time/timekeeping.c | 3 +--
3 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100644 include/linux/timekeeping32.h
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index a12b552..73f20de 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -230,6 +230,5 @@ static inline ktime_t ms_to_ktime(u64 ms)
}
# include <linux/timekeeping.h>
-# include <linux/timekeeping32.h>
#endif
diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h
deleted file mode 100644
index 266017f..0000000
--- a/include/linux/timekeeping32.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _LINUX_TIMEKEEPING32_H
-#define _LINUX_TIMEKEEPING32_H
-/*
- * These interfaces are all based on the old timespec type
- * and should get replaced with the timespec64 based versions
- * over time so we can remove the file here.
- */
-
-static inline unsigned long get_seconds(void)
-{
- return ktime_get_real_seconds();
-}
-
-#endif
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6858a31..0a95bb2 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -995,8 +995,7 @@ time64_t ktime_get_seconds(void)
/**
* ktime_get_real_seconds - Get the seconds portion of CLOCK_REALTIME
*
- * Returns the wall clock seconds since 1970. This replaces the
- * get_seconds() interface which is not y2038 safe on 32bit systems.
+ * Returns the wall clock seconds since 1970.
*
* For 64bit systems the fast access to tk->xtime_sec is preserved. On
* 32bit systems the access must be protected with the sequence
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: timers/urgent] timekeeping: Remove unused get_seconds()
2020-12-01 9:52 [PATCH] timekeeping: remove unused get_seconds() Chunguang Xu
@ 2021-01-12 20:18 ` tip-bot2 for Chunguang Xu
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Chunguang Xu @ 2021-01-12 20:18 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Chunguang Xu, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: aba428a0c612bb259891307da12e22efd0fab14c
Gitweb: https://git.kernel.org/tip/aba428a0c612bb259891307da12e22efd0fab14c
Author: Chunguang Xu <brookxu@tencent.com>
AuthorDate: Tue, 01 Dec 2020 17:52:31 +08:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 12 Jan 2021 21:13:01 +01:00
timekeeping: Remove unused get_seconds()
The get_seconds() cleanup seems to have been completed, now it is
time to delete the legacy interface to avoid misuse later.
Signed-off-by: Chunguang Xu <brookxu@tencent.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/1606816351-26900-1-git-send-email-brookxu@tencent.com
---
include/linux/ktime.h | 1 -
include/linux/timekeeping32.h | 14 --------------
kernel/time/timekeeping.c | 3 +--
3 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100644 include/linux/timekeeping32.h
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index a12b552..73f20de 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -230,6 +230,5 @@ static inline ktime_t ms_to_ktime(u64 ms)
}
# include <linux/timekeeping.h>
-# include <linux/timekeeping32.h>
#endif
diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h
deleted file mode 100644
index 266017f..0000000
--- a/include/linux/timekeeping32.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _LINUX_TIMEKEEPING32_H
-#define _LINUX_TIMEKEEPING32_H
-/*
- * These interfaces are all based on the old timespec type
- * and should get replaced with the timespec64 based versions
- * over time so we can remove the file here.
- */
-
-static inline unsigned long get_seconds(void)
-{
- return ktime_get_real_seconds();
-}
-
-#endif
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index a45cedd..6aee576 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -991,8 +991,7 @@ EXPORT_SYMBOL_GPL(ktime_get_seconds);
/**
* ktime_get_real_seconds - Get the seconds portion of CLOCK_REALTIME
*
- * Returns the wall clock seconds since 1970. This replaces the
- * get_seconds() interface which is not y2038 safe on 32bit systems.
+ * Returns the wall clock seconds since 1970.
*
* For 64bit systems the fast access to tk->xtime_sec is preserved. On
* 32bit systems the access must be protected with the sequence
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-12 21:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-01 9:52 [PATCH] timekeeping: remove unused get_seconds() Chunguang Xu
2021-01-12 20:18 ` [tip: timers/urgent] timekeeping: Remove " tip-bot2 for Chunguang Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).