diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-23 11:53:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-23 11:53:26 -0400 |
| commit | 737e5b275f492c484408485dcf7f031af5aa50a6 (patch) | |
| tree | f58c1ce1737a9aed2661572c09c1b1e663db5660 | |
| parent | b4404de35f6430a3aa2ce5ff3ce7e9927da3ce16 (diff) | |
| download | 4.12-rt-patches-737e5b275f492c484408485dcf7f031af5aa50a6.tar.gz | |
cpuchill: ad missing timespec --> timespec64 promotions
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch index 6b83dfac16e82..adbd016045788 100644 --- a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch +++ b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch @@ -1,4 +1,4 @@ -From e9ee3de94d483f0282db40464fe7d85ea9656307 Mon Sep 17 00:00:00 2001 +From 39a6655cbc80276b6167563f3f8f10ceb4cf65fc Mon Sep 17 00:00:00 2001 From: Steven Rostedt <rostedt@goodmis.org> Date: Tue, 4 Mar 2014 12:28:32 -0500 Subject: [PATCH] cpu_chill: Add a UNINTERRUPTIBLE hrtimer_nanosleep @@ -27,9 +27,11 @@ about the state of the restart schedule (in hrtimer_nanosleep_restart). Reported-by: Ulrich Obergfell <uobergfe@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +[PG: promote timespec to timespec64 to match mainline and fix 32 bit builds] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c -index 2e6cadc9ec75..5b4c250993db 100644 +index 2a7f1ab0b21c..fd26eade86a3 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1664,10 +1664,11 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper_on_stack); @@ -82,7 +84,7 @@ index 2e6cadc9ec75..5b4c250993db 100644 return ret; } -+long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp, ++long hrtimer_nanosleep(struct timespec64 *rqtp, struct timespec __user *rmtp, + const enum hrtimer_mode mode, const clockid_t clockid) +{ + return __hrtimer_nanosleep(rqtp, rmtp, mode, clockid, TASK_INTERRUPTIBLE); @@ -91,7 +93,14 @@ index 2e6cadc9ec75..5b4c250993db 100644 SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, struct timespec __user *, rmtp) { -@@ -1796,7 +1806,8 @@ void cpu_chill(void) +@@ -1790,13 +1800,14 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, + */ + void cpu_chill(void) + { +- struct timespec tu = { ++ struct timespec64 tu = { + .tv_nsec = NSEC_PER_MSEC, + }; unsigned int freeze_flag = current->flags & PF_NOFREEZE; current->flags |= PF_NOFREEZE; |