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

Commit 4fa1970a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] alpha pt_regs cleanups: machine_check() 



do set_irq_regs() in caller, kill pt_regs argument.

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

arch/alpha/kernel/core_apecs.c

+2 −3
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ apecs_pci_clr_err(void) 
}



void

apecs_machine_check(unsigned long vector, unsigned long la_ptr,

		    struct pt_regs * regs)

apecs_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_common *mchk_header;

	struct el_apecs_procdata *mchk_procdata;
@@ -412,7 +411,7 @@ apecs_machine_check(unsigned long vector, unsigned long la_ptr, 
	wrmces(0x7);		/* reset machine check pending flag */

	mb();



	process_mcheck_info(vector, la_ptr, regs, "APECS",

	process_mcheck_info(vector, la_ptr, "APECS",

			    (mcheck_expected(0)

			     && (mchk_sysdata->epic_dcsr & 0x0c00UL)));

}

arch/alpha/kernel/core_cia.c

+2 −3
Original line number Diff line number Diff line
@@ -1192,8 +1192,7 @@ cia_decode_mchk(unsigned long la_ptr) 
}



void

cia_machine_check(unsigned long vector, unsigned long la_ptr,

		  struct pt_regs * regs)

cia_machine_check(unsigned long vector, unsigned long la_ptr)

{

	int expected;
@@ -1208,5 +1207,5 @@ cia_machine_check(unsigned long vector, unsigned long la_ptr, 
	expected = mcheck_expected(0);

	if (!expected && vector == 0x660)

		expected = cia_decode_mchk(la_ptr);

	process_mcheck_info(vector, la_ptr, regs, "CIA", expected);

	process_mcheck_info(vector, la_ptr, "CIA", expected);

}

arch/alpha/kernel/core_lca.c

+3 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/tty.h>



#include <asm/ptrace.h>

#include <asm/irq_regs.h>

#include <asm/smp.h>



#include "proto.h"
@@ -386,8 +387,7 @@ ioc_error(__u32 stat0, __u32 stat1) 
}



void

lca_machine_check(unsigned long vector, unsigned long la_ptr,

		  struct pt_regs *regs)

lca_machine_check(unsigned long vector, unsigned long la_ptr)

{

	const char * reason;

	union el_lca el;
@@ -397,7 +397,7 @@ lca_machine_check(unsigned long vector, unsigned long la_ptr, 
	wrmces(rdmces());	/* reset machine check pending flag */



	printk(KERN_CRIT "LCA machine check: vector=%#lx pc=%#lx code=%#x\n",

	       vector, regs->pc, (unsigned int) el.c->code);

	       vector, get_irq_regs()->pc, (unsigned int) el.c->code);



	/*

	 * The first quadword after the common header always seems to

arch/alpha/kernel/core_mcpcia.c

+2 −3
Original line number Diff line number Diff line
@@ -572,8 +572,7 @@ mcpcia_print_system_area(unsigned long la_ptr) 
}



void

mcpcia_machine_check(unsigned long vector, unsigned long la_ptr,

		     struct pt_regs * regs)

mcpcia_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_common *mchk_header;

	struct el_MCPCIA_uncorrected_frame_mcheck *mchk_logout;
@@ -610,7 +609,7 @@ mcpcia_machine_check(unsigned long vector, unsigned long la_ptr, 
	wrmces(0x7);

	mb();



	process_mcheck_info(vector, la_ptr, regs, "MCPCIA", expected != 0);

	process_mcheck_info(vector, la_ptr, "MCPCIA", expected != 0);

	if (!expected && vector != 0x620 && vector != 0x630) {

		mcpcia_print_uncorrectable(mchk_logout);

		mcpcia_print_system_area(la_ptr);

arch/alpha/kernel/core_polaris.c

+2 −3
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ polaris_pci_clr_err(void) 
}



void

polaris_machine_check(unsigned long vector, unsigned long la_ptr,

		      struct pt_regs * regs)

polaris_machine_check(unsigned long vector, unsigned long la_ptr)

{

	/* Clear the error before any reporting.  */

	mb();
@@ -198,6 +197,6 @@ polaris_machine_check(unsigned long vector, unsigned long la_ptr, 
	wrmces(0x7);

	mb();



	process_mcheck_info(vector, la_ptr, regs, "POLARIS",

	process_mcheck_info(vector, la_ptr, "POLARIS",

			    mcheck_expected(0));

}