[LV-kern-commit] kernel-2.4/arch/vax/kernel interrupt.c,1.27,1.28 regdump.c,1.7,1.8

[<ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv12885/arch/vax/kernel

Modified Files:
	interrupt.c regdump.c 
Log Message:
merge 2.4.20


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- interrupt.c	18 Sep 2003 13:16:01 -0000	1.27
+++ interrupt.c	27 Sep 2003 07:43:26 -0000	1.28
@@ -419,7 +419,7 @@
 			vec_num, vec_num*4);
 
 	printk("\nStack dump:\n");
-	dump_stack(DUMP_STACK_CALLER);
+	vax_dump_stack(DUMP_STACK_CALLER);
 
 	dump_cur_regs(DUMP_REGS_CALLER);
 	show_cpu_regs();

Index: regdump.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/regdump.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- regdump.c	12 Feb 2003 02:37:33 -0000	1.7
+++ regdump.c	27 Sep 2003 07:43:26 -0000	1.8
@@ -137,7 +137,7 @@
         return;
 }
 
-void dump_stack(unsigned int frames)
+void vax_dump_stack(unsigned int frames)
 {
 	unsigned int reg_count;
 	unsigned int save_mask;