Re: [patch][rfc] xquad_portio cleanup 2.5.40

From: Matthew Dobson (colpatch@us.ibm.com)
Date: Wed Oct 02 2002 - 13:16:03 EST


Linus,
        I believe Alan cleared up the only objection to this small patch. Please
apply.

Changelog:
        Cleans up a bit of a hack to get compressed (gziped) kernels booting on
NUMA-Q. Resulting code is more readable and understandable.

Cheers!

-Matt

Alan Cox wrote:
> On Tue, 2002-10-01 at 22:44, Matthew Dobson wrote:
>
>>>STANDALONE seems to be a very namespace-polluting choice of define.
>>>MULTIQUAD_STANDALONE, MQ_STANDALONE... anything would be better imo.
>>
>>The #define is most definitely *not* NUMA/Multiquad specific. In this
>>particular instance, it is guarding Multiquad specific code... The
>>STANDALONE option (please clarify if I'm wrong, Alan) is for code that
>>is compiled along with the kernel, with the kernel headers, etc, but is
>>not acually part of the kernel proper.
>
>
> Indeed
>
> Its set by the boot loader code that wants to also use inb/outb etc but
> not get the kernel magic wonders of numa-q and other evil abuses of PC
> iomapping

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 */
 
 /*

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:00:35 EST