diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-07 15:16:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 19:51:14 +0200 |
| commit | 2850bc273776cbb1b510c5828e9e456dffb50a32 (patch) | |
| tree | 340bd599b6efde40618ef89de59cbe957269eac2 /arch/m68k/kernel/setup.c | |
| parent | [PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block (diff) | |
| download | linux-2850bc273776cbb1b510c5828e9e456dffb50a32.tar.xz linux-2850bc273776cbb1b510c5828e9e456dffb50a32.zip | |
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes
pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
*.
Places where we used to call m68k_handle_int() recursively with the same
pt_regs have simply lost the second argument, the rest is switched to
__m68k_handle_int().
The rest of patch is just dropping pt_regs * where needed.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel/setup.c')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index f2d7ee0ee18c..869c4861346e 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -64,7 +64,7 @@ static char m68k_command_line[CL_SIZE]; char m68k_debug_device[6] = ""; -void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)) __initdata = NULL; +void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)) __initdata = NULL; /* machine dependent irq functions */ void (*mach_init_IRQ) (void) __initdata = NULL; void (*mach_get_model) (char *model); |