[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>
此提交包含在:
@@ -38,7 +38,7 @@
|
||||
|
||||
static void mvme147_get_model(char *model);
|
||||
static int mvme147_get_hardware_list(char *buffer);
|
||||
extern void mvme147_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
|
||||
extern void mvme147_sched_init(irqreturn_t (*handler)(int, void *));
|
||||
extern unsigned long mvme147_gettimeoffset (void);
|
||||
extern int mvme147_hwclk (int, struct rtc_time *);
|
||||
extern int mvme147_set_clock_mmss (unsigned long);
|
||||
@@ -51,7 +51,7 @@ static int bcd2int (unsigned char b);
|
||||
/* Save tick handler routine pointer, will point to do_timer() in
|
||||
* kernel/sched.c, called via mvme147_process_int() */
|
||||
|
||||
irqreturn_t (*tick_handler)(int, void *, struct pt_regs *);
|
||||
irqreturn_t (*tick_handler)(int, void *);
|
||||
|
||||
|
||||
int mvme147_parse_bootinfo(const struct bi_record *bi)
|
||||
@@ -114,15 +114,15 @@ void __init config_mvme147(void)
|
||||
|
||||
/* Using pcc tick timer 1 */
|
||||
|
||||
static irqreturn_t mvme147_timer_int (int irq, void *dev_id, struct pt_regs *fp)
|
||||
static irqreturn_t mvme147_timer_int (int irq, void *dev_id)
|
||||
{
|
||||
m147_pcc->t1_int_cntrl = PCC_TIMER_INT_CLR;
|
||||
m147_pcc->t1_int_cntrl = PCC_INT_ENAB|PCC_LEVEL_TIMER1;
|
||||
return tick_handler(irq, dev_id, fp);
|
||||
return tick_handler(irq, dev_id);
|
||||
}
|
||||
|
||||
|
||||
void mvme147_sched_init (irqreturn_t (*timer_routine)(int, void *, struct pt_regs *))
|
||||
void mvme147_sched_init (irqreturn_t (*timer_routine)(int, void *))
|
||||
{
|
||||
tick_handler = timer_routine;
|
||||
request_irq (PCC_IRQ_TIMER1, mvme147_timer_int,
|
||||
|
新增問題並參考
封鎖使用者