From: Matthew Dobson <colpatch@us.ibm.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Martin Bligh <mjbligh@us.ibm.com>,
Linus Torvalds <torvalds@transmeta.com>
Subject: [patch][rfc] xquad_portio cleanup
Date: Mon, 30 Sep 2002 16:34:56 -0700 [thread overview]
Message-ID: <3D98DFA0.6020908@us.ibm.com> (raw)
[-- 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 */
/*
next reply other threads:[~2002-09-30 23:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-09-30 23:34 Matthew Dobson [this message]
2002-10-01 15:21 ` [patch][rfc] xquad_portio cleanup 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
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=3D98DFA0.6020908@us.ibm.com \
--to=colpatch@us.ibm.com \
--cc=alan@lxorguk.ukuu.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).