diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 14:11:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 14:11:43 -0700 |
| commit | e105eabb5b843c6c59f921f54122221f82ca09e6 (patch) | |
| tree | b020c0e348cf858466a57bb21dd343b40bd405d4 /arch/mips/kernel/ptrace.c | |
| parent | 1db9b8373821f200dd71f4896ca7323c371620fe (diff) | |
| parent | 8531a35e5e275b17c57c39b7911bc2b37025f28c (diff) | |
| download | kernel-crypto-e105eabb5b843c6c59f921f54122221f82ca09e6.tar.gz kernel-crypto-e105eabb5b843c6c59f921f54122221f82ca09e6.tar.xz kernel-crypto-e105eabb5b843c6c59f921f54122221f82ca09e6.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] SMTC: Fix SMTC dyntick support.
[MIPS] SMTC: Close tiny holes in the SMTC IPI replay system.
[MIPS] SMTC: Fix holes in SMTC and FPU affinity support.
[MIPS] SMTC: Build fix: Fix filename in Makefile
[MIPS] Build fix: Fix irq flags type
Diffstat (limited to 'arch/mips/kernel/ptrace.c')
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 35234b92b9a..96ffc9c6d19 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -238,7 +238,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) case FPC_EIR: { /* implementation / version register */ unsigned int flags; #ifdef CONFIG_MIPS_MT_SMTC - unsigned int irqflags; + unsigned long irqflags; unsigned int mtflags; #endif /* CONFIG_MIPS_MT_SMTC */ |