diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/sh/kernel/ptrace.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/sh/kernel/ptrace.c')
| -rw-r--r-- | arch/sh/kernel/ptrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index f7eebbde3291..04ca13a041c1 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
| @@ -224,7 +224,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
| 224 | 224 | ||
| 225 | case PTRACE_SETDSPREGS: { | 225 | case PTRACE_SETDSPREGS: { |
| 226 | unsigned long dp; | 226 | unsigned long dp; |
| 227 | int i; | ||
| 228 | 227 | ||
| 229 | ret = -EIO; | 228 | ret = -EIO; |
| 230 | dp = ((unsigned long) child) + THREAD_SIZE - | 229 | dp = ((unsigned long) child) + THREAD_SIZE - |