* [patch][rfc] xquad_portio cleanup
@ 2002-09-30 23:34 Matthew Dobson
2002-10-01 15:21 ` Dave Jones
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Dobson @ 2002-09-30 23:34 UTC (permalink / raw)
To: Alan Cox, linux-kernel; +Cc: Martin Bligh, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
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
[-- Attachment #2: xquad_fixup-2539.patch --]
[-- Type: text/plain, Size: 1246 bytes --]
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 */
/*
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch][rfc] xquad_portio cleanup
2002-09-30 23:34 [patch][rfc] xquad_portio cleanup Matthew Dobson
@ 2002-10-01 15:21 ` Dave Jones
2002-10-01 21:44 ` Matthew Dobson
0 siblings, 1 reply; 5+ messages in thread
From: Dave Jones @ 2002-10-01 15:21 UTC (permalink / raw)
To: Matthew Dobson; +Cc: Alan Cox, linux-kernel, Martin Bligh, Linus Torvalds
On Mon, Sep 30, 2002 at 04:34:56PM -0700, Matthew Dobson wrote:
> 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
...
> 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 */
STANDALONE seems to be a very namespace-polluting choice of define.
MULTIQUAD_STANDALONE, MQ_STANDALONE... anything would be better imo.
Dave
--
| Dave Jones. http://www.codemonkey.org.uk
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch][rfc] xquad_portio cleanup
2002-10-01 15:21 ` Dave Jones
@ 2002-10-01 21:44 ` Matthew Dobson
2002-10-02 0:43 ` Alan Cox
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Dobson @ 2002-10-01 21:44 UTC (permalink / raw)
To: Dave Jones; +Cc: Alan Cox, linux-kernel, Martin Bligh, Linus Torvalds
Dave Jones wrote:
> On Mon, Sep 30, 2002 at 04:34:56PM -0700, Matthew Dobson wrote:
>
> > 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
> ...
> > 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 */
>
> 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.
Cheers!
-Matt
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch][rfc] xquad_portio cleanup
2002-10-01 21:44 ` Matthew Dobson
@ 2002-10-02 0:43 ` Alan Cox
2002-10-02 18:16 ` [patch][rfc] xquad_portio cleanup 2.5.40 Matthew Dobson
0 siblings, 1 reply; 5+ messages in thread
From: Alan Cox @ 2002-10-02 0:43 UTC (permalink / raw)
To: colpatch; +Cc: Dave Jones, linux-kernel, Martin Bligh, Linus Torvalds
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch][rfc] xquad_portio cleanup 2.5.40
2002-10-02 0:43 ` Alan Cox
@ 2002-10-02 18:16 ` Matthew Dobson
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Dobson @ 2002-10-02 18:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Alan Cox, Dave Jones, linux-kernel, Martin Bligh
[-- Attachment #1: Type: text/plain, Size: 985 bytes --]
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
[-- Attachment #2: xquad_fixup-2540.patch --]
[-- Type: text/plain, Size: 1246 bytes --]
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 */
/*
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2002-10-02 18:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-09-30 23:34 [patch][rfc] xquad_portio cleanup Matthew Dobson
2002-10-01 15:21 ` Dave Jones
2002-10-01 21:44 ` Matthew Dobson
2002-10-02 0:43 ` Alan Cox
2002-10-02 18:16 ` [patch][rfc] xquad_portio cleanup 2.5.40 Matthew Dobson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).