From: john stultz <johnstul@us.ibm.com>
To: "J.E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: "Martin J. Bligh" <mbligh@aracnet.com>,
Russell King <rmk@arm.linux.org.uk>,
Sam Ravnborg <sam@ravnborg.org>,
lkml <linux-kernel@vger.kernel.org>
Subject: [RFC] [PATCH] subarch-cleanup_A1
Date: 21 Nov 2002 17:46:36 -0800 [thread overview]
Message-ID: <1037929596.7576.78.camel@w-jstultz2.beaverton.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]
Ok, next pass. How about this: (complete patch bz'ed and attached)
diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile Thu Nov 21 17:37:35 2002
+++ b/arch/i386/Makefile Thu Nov 21 17:37:35 2002
@@ -46,10 +46,13 @@
CFLAGS += $(cflags-y)
-ifdef CONFIG_VISWS
-MACHINE := mach-visws
-else
-MACHINE := mach-generic
+#VISWS subarch support
+mflags-$(CONFIG_VISWS) := -Iinclude/asm-i386/mach-visws
+mcore-$(CONFIG_VISWS) := mach-visws
+#generic subarch support
+mflags-y += -Iinclude/asm-i386/mach-generic
+ifndef mcore-y
+ mcore-y := mach-generic
endif
HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
@@ -57,14 +60,14 @@
libs-y += arch/i386/lib/
core-y += arch/i386/kernel/ \
arch/i386/mm/ \
- arch/i386/$(MACHINE)/
+ arch/i386/$(mcore-y)/
drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/
drivers-$(CONFIG_PCI) += arch/i386/pci/
# FIXME: is drivers- right ?
drivers-$(CONFIG_OPROFILE) += arch/i386/oprofile/
-CFLAGS += -Iarch/i386/$(MACHINE)
-AFLAGS += -Iarch/i386/$(MACHINE)
+CFLAGS += $(mflags-y)
+AFLAGS += $(mflags-y)
makeboot = $(call descend,arch/i386/boot,$(1))
diff -Nru a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/apic.c Thu Nov 21 17:37:35 2002
+++ b/arch/i386/kernel/apic.c Thu Nov 21 17:37:35 2002
@@ -31,7 +31,8 @@
#include <asm/pgalloc.h>
#include <asm/desc.h>
#include <asm/arch_hooks.h>
-#include "mach_apic.h"
+
+#include <mach_apic.h>
void __init apic_intr_init(void)
{
yada yada...
-john
[-- Attachment #2: linux-2.5.48_subarch-cleanup_A1.patch.bz2 --]
[-- Type: application/x-bzip, Size: 8988 bytes --]
next reply other threads:[~2002-11-22 1:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-11-22 1:46 john stultz [this message]
2002-11-22 1:48 ` William Lee Irwin III
2002-11-22 2:00 ` john stultz
2002-11-22 13:37 ` Alan Cox
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=1037929596.7576.78.camel@w-jstultz2.beaverton.ibm.com \
--to=johnstul@us.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbligh@aracnet.com \
--cc=rmk@arm.linux.org.uk \
--cc=sam@ravnborg.org \
/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
all inboxes | Powered by JetHome®