[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel cpu_generic.c,1.3,1.4 setup.c,1.6,1.7

[Kenn H. <ke...@us...>]

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

Modified Files:
	cpu_generic.c setup.c 
Log Message:
Fix multiple definitions of symbols that were covered up by us not 
using GCC's -fno-common option


Index: cpu_generic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_generic.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpu_generic.c	20 May 2002 00:33:33 -0000	1.3
+++ cpu_generic.c	24 Jan 2003 00:28:31 -0000	1.4
@@ -117,9 +117,6 @@
    mapped by map_dz11_regs().  */
 
 	 
-/* This gets set to non-NULL once the I/O page has been mapped */
-volatile struct dz11_regs *dz11_addr = NULL;
-
 /* This is the serial line on the DZ11 that we should use as the
    console.  Normally it is line 3 */
 static unsigned int dz11_line;

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup.c	12 Dec 2002 01:19:20 -0000	1.6
+++ setup.c	24 Jan 2003 00:28:31 -0000	1.7
@@ -30,10 +30,11 @@
 
 /* Defined in arch/vax/mm/init.c */
 extern void paging_init(void);
-unsigned long max_pfn;		/* number of 4k pfns */
 
 /* Linker will put this at the end of the kernel image */
 extern char _end;
+
+struct vaxcpu vax_cpu;
 
 /*
  *	Get CPU information for use by the procfs.