From: Matthew Dobson <colpatch@us.ibm.com>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
Dave Jones <davej@codemonkey.org.uk>,
linux-kernel <linux-kernel@vger.kernel.org>,
Martin Bligh <mjbligh@us.ibm.com>
Subject: Re: [patch][rfc] xquad_portio cleanup 2.5.40
Date: Wed, 02 Oct 2002 11:16:03 -0700 [thread overview]
Message-ID: <3D9B37E3.4090903@us.ibm.com> (raw)
In-Reply-To: 1033519383.20103.36.camel@irongate.swansea.linux.org.uk
[-- 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 */
/*
prev parent reply other threads:[~2002-10-02 18:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Matthew Dobson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3D9B37E3.4090903@us.ibm.com \
--to=colpatch@us.ibm.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=davej@codemonkey.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mjbligh@us.ibm.com \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).