Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f116cbf authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs() 



titan_dispatch_irqs() always gets get_irq_regs() as argument; kill
the argument and collapse set_irq_regs() in body.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4fa1970a

arch/alpha/kernel/err_titan.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ titan_machine_check(u64 vector, u64 la_ptr) 
		 * machine checks to interrupts

		 */

		irqmask = tmchk->c_dirx & TITAN_MCHECK_INTERRUPT_MASK;

		titan_dispatch_irqs(irqmask, get_irq_regs());

		titan_dispatch_irqs(irqmask);

	}
@@ -746,7 +746,7 @@ privateer_machine_check(u64 vector, u64 la_ptr) 
	/*

	 * Dispatch the interrupt(s).

	 */

	titan_dispatch_irqs(irqmask, get_irq_regs());

	titan_dispatch_irqs(irqmask);



	/* 

	 * Release the logout frame.

arch/alpha/kernel/proto.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ extern void dik_show_regs(struct pt_regs *regs, unsigned long *r9_15); 
extern void die_if_kernel(char *, struct pt_regs *, long, unsigned long *);



/* sys_titan.c */

extern void titan_dispatch_irqs(u64, struct pt_regs *);

extern void titan_dispatch_irqs(u64);



/* ../mm/init.c */

extern void switch_to_system_map(void);

arch/alpha/kernel/sys_titan.c

+1 −4
Original line number Diff line number Diff line
@@ -243,9 +243,8 @@ titan_legacy_init_irq(void) 
}



void

titan_dispatch_irqs(u64 mask, struct pt_regs *regs)

titan_dispatch_irqs(u64 mask)

{

	struct pt_regs *old_regs;

	unsigned long vector;



	/*
@@ -253,7 +252,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs) 
	 */

	mask &= titan_cpu_irq_affinity[smp_processor_id()];



	old_regs = set_irq_regs(regs);

	/*

	 * Dispatch all requested interrupts 

	 */
@@ -267,7 +265,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs) 
		/* dispatch it */

		alpha_mv.device_interrupt(vector);

	}

	set_irq_regs(old_regs);

}