diff options
Diffstat (limited to 'arch/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/m32r/kernel/time.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 7103d91e1a2f..3e876f0baebc 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
| @@ -225,7 +225,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) | |||
| 225 | return 0; /* Task didn't use the fpu at all. */ | 225 | return 0; /* Task didn't use the fpu at all. */ |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | int copy_thread(int nr, unsigned long clone_flags, unsigned long spu, | 228 | int copy_thread(unsigned long clone_flags, unsigned long spu, |
| 229 | unsigned long unused, struct task_struct *tsk, struct pt_regs *regs) | 229 | unsigned long unused, struct task_struct *tsk, struct pt_regs *regs) |
| 230 | { | 230 | { |
| 231 | struct pt_regs *childregs = task_pt_regs(tsk); | 231 | struct pt_regs *childregs = task_pt_regs(tsk); |
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index 6ea017727cce..cada3ba4b990 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -230,7 +230,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
| 230 | static struct irqaction irq0 = { | 230 | static struct irqaction irq0 = { |
| 231 | .handler = timer_interrupt, | 231 | .handler = timer_interrupt, |
| 232 | .flags = IRQF_DISABLED, | 232 | .flags = IRQF_DISABLED, |
| 233 | .mask = CPU_MASK_NONE, | ||
| 234 | .name = "MFT2", | 233 | .name = "MFT2", |
| 235 | }; | 234 | }; |
| 236 | 235 | ||
