diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:38:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:38:15 -0700 |
| commit | f70616acacd956aaa819fd2e3a0d0152f1bc812b (patch) | |
| tree | 9e328ac97f87ab0cec1255f1611e1a60af8bcdd8 /arch/sh/include/asm | |
| parent | 9a523d427dc5908a79ce3ff742e9606e852802d6 (diff) | |
| parent | ecd4ca52bfdb4108f47aa480781b97f037051a72 (diff) | |
Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix up unsigned syscall_nr in SH-5 pt_regs.
maple: input: fix up maple mouse driver
sh: sh7785lcr: fix defconfig for 29-bit mode
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index d3f6caa936b..68e20ff9aa9 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h @@ -9,7 +9,7 @@ struct pt_regs { unsigned long long pc; unsigned long long sr; - unsigned long long syscall_nr; + long long syscall_nr; unsigned long long regs[63]; unsigned long long tregs[8]; unsigned long long pad[2]; |