Messages in this thread Patch in this message | | | Date | Mon, 30 Sep 2002 16:34:56 -0700 | From | Matthew Dobson <> | Subject | [patch][rfc] xquad_portio cleanup |
| |
Alan, Martin, Linus, and anyone else who cares, ;)
Here's a patch Martin and I put together a while ago to clean up the xquad_portio kludgery that's been floating around for too long. I think this pretty much goes along with what you have in your tree, Alan. It's a small patch, so if no one complains, please apply Linus.
Cheers!
-Matt diff -Nur linux-2.5.31-vanilla/arch/i386/boot/compressed/misc.c linux-2.5.31-xquad/arch/i386/boot/compressed/misc.c --- linux-2.5.31-vanilla/arch/i386/boot/compressed/misc.c Sat Aug 10 18:41:40 2002 +++ linux-2.5.31-xquad/arch/i386/boot/compressed/misc.c Thu Aug 15 14:28:33 2002 @@ -9,6 +9,8 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +#define STANDALONE + #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/tty.h> @@ -120,10 +122,6 @@ static int vidport; static int lines, cols; -#ifdef CONFIG_MULTIQUAD -static void * xquad_portio = NULL; -#endif - #include "../../../../lib/inflate.c" static void *malloc(int size) diff -Nur linux-2.5.31-vanilla/include/asm-i386/io.h linux-2.5.31-xquad/include/asm-i386/io.h --- linux-2.5.31-vanilla/include/asm-i386/io.h Sat Aug 10 18:41:28 2002 +++ linux-2.5.31-xquad/include/asm-i386/io.h Thu Aug 15 15:17:31 2002 @@ -298,7 +298,11 @@ #endif #ifdef CONFIG_MULTIQUAD -extern void *xquad_portio; /* Where the IO area was mapped */ + #ifdef STANDALONE + #define xquad_portio 0 + #else /* !STANDALONE */ + extern void *xquad_portio; /* Where the IO area was mapped */ + #endif /* STANDALONE */ #endif /* CONFIG_MULTIQUAD */ /* | |