diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 11:04:43 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 11:04:43 -0500 |
| commit | 4c6bfa1f9d2a42b5921c54d3376def98a4933c4d (patch) | |
| tree | aff97c9c3ea57e72adf61770849c0a36f4275aa0 | |
| parent | 7d2f649241f7a4af86299ebe710539b085b398e3 (diff) | |
| download | 4.9-rt-patches-4c6bfa1f9d2a42b5921c54d3376def98a4933c4d.tar.gz | |
sched: mutex wakeup - import trivial whitespace refresh
| -rw-r--r-- | patches/sched-rt-mutex-wakeup.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/sched-rt-mutex-wakeup.patch b/patches/sched-rt-mutex-wakeup.patch index 7ac693fb818063..12f200d2297f91 100644 --- a/patches/sched-rt-mutex-wakeup.patch +++ b/patches/sched-rt-mutex-wakeup.patch @@ -17,15 +17,15 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1459,6 +1459,7 @@ struct tlbflush_unmap_batch { - - struct task_struct { +@@ -1481,6 +1481,7 @@ struct task_struct { + struct thread_info thread_info; + #endif volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ -+ volatile long saved_state; /* saved state for "spinlock sleepers" */ ++ volatile long saved_state; /* saved state for "spinlock sleepers" */ void *stack; atomic_t usage; unsigned int flags; /* per process flags, defined below */ -@@ -2649,6 +2650,7 @@ extern void xtime_update(unsigned long t +@@ -2697,6 +2698,7 @@ extern void xtime_update(unsigned long t extern int wake_up_state(struct task_struct *tsk, unsigned int state); extern int wake_up_process(struct task_struct *tsk); @@ -35,7 +35,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> extern void kick_process(struct task_struct *tsk); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2023,8 +2023,25 @@ try_to_wake_up(struct task_struct *p, un +@@ -2033,8 +2033,25 @@ try_to_wake_up(struct task_struct *p, un */ smp_mb__before_spinlock(); raw_spin_lock_irqsave(&p->pi_lock, flags); @@ -62,7 +62,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> trace_sched_waking(p); -@@ -2172,6 +2189,18 @@ int wake_up_process(struct task_struct * +@@ -2181,6 +2198,18 @@ int wake_up_process(struct task_struct * } EXPORT_SYMBOL(wake_up_process); @@ -83,7 +83,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> return try_to_wake_up(p, state, 0); --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h -@@ -1138,6 +1138,7 @@ static inline void finish_lock_switch(st +@@ -1163,6 +1163,7 @@ static inline void finish_lock_switch(st #define WF_SYNC 0x01 /* waker goes to sleep after wakeup */ #define WF_FORK 0x02 /* child wakeup after fork */ #define WF_MIGRATED 0x4 /* internal use, task got migrated */ |