From: Kenn H. <ke...@us...> - 2003-01-24 00:28:36
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv8873/include/asm-vax Modified Files: dz11.h processor.h Log Message: Fix multiple definitions of symbols that were covered up by us not using GCC's -fno-common option Index: dz11.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/dz11.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dz11.h 20 May 2002 00:33:39 -0000 1.4 +++ dz11.h 24 Jan 2003 00:28:32 -0000 1.5 @@ -37,6 +37,9 @@ u_short padding4; }; +/* This gets set to non-NULL once the I/O page has been mapped */ +extern volatile struct dz11_regs *dz11_addr; + /* Definitions of bits in CSR */ #define DZ11_CSR_MAINT 0x0008 /* read/write */ #define DZ11_CSR_CLR 0x0010 /* read/write */ Index: processor.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/processor.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- processor.h 29 Oct 2002 00:52:51 -0000 1.5 +++ processor.h 24 Jan 2003 00:28:32 -0000 1.6 @@ -31,9 +31,9 @@ unsigned int n_pfn; unsigned int *scb; /* address of the scb */ unsigned int *rpb; /* address of the rpb */ -} vax_cpu; - +}; +extern struct vaxcpu vax_cpu; /* from alpha port */ |