diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-09-27 21:13:20 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-09-27 21:13:20 -0400 |
| commit | c39b72eeb3e88d1d4dcc1a4188932568f07b3593 (patch) | |
| tree | a19c4945adc9461e8a2b0adfe90274b8f12ae353 /utrace.patch | |
| parent | 3c2fcd2b1914b94ede8dfc654ea834c9e735fa5f (diff) | |
| download | kernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.tar.gz kernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.tar.xz kernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.zip | |
Linux 3.1-rc8
New option: CONFIG_ARM_ERRATA_764369 is not set
Fix up utrace.patch to apply after commit f9d81f61c
Diffstat (limited to 'utrace.patch')
| -rw-r--r-- | utrace.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/utrace.patch b/utrace.patch index fbf28ff62..576c737f3 100644 --- a/utrace.patch +++ b/utrace.patch @@ -5168,14 +5168,14 @@ index 4194664..1a50090 100644 unlock_task_sighand(child, &flags); ret = 0; @@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request, - * of this trap and now. Trigger re-trap immediately. - */ - if (child->jobctl & JOBCTL_TRAP_NOTIFY) -- signal_wake_up(child, true); -+ ptrace_signal_wake_up(child, true); - + * start of this trap and now. Trigger re-trap. + */ + if (child->jobctl & JOBCTL_TRAP_NOTIFY) +- signal_wake_up(child, true); ++ ptrace_signal_wake_up(child, true); + ret = 0; + } unlock_task_sighand(child, &flags); - ret = 0; diff --git a/kernel/signal.c b/kernel/signal.c index 3e8e0b1..0dc6abb 100644 --- a/kernel/signal.c |