Skip to contentSkip to conversation

CONFIG_MULTIQUAD arch/i386/pci cleanup

PATCH New Matthew Dobson 1 participant 1 message Oct 15, 2002

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 CONFIG_MULTIQUAD arch/i386/pci cleanup

Linus,
Here is a part of the removal of CONFIG_MULTIQUAD that didn't get in yet.
There are still occurences of CONFIG_MULTIQUAD in arch/i386/pci/Makefile, and since this config option no longer exists, the pci code for NUMA-Q is exceedingly unlikely to get compiled in correctly. Please apply.

Changelog:

1. Remove the 2 remaining occurences of CONFIG_MULTIQUAD in the kernel source (arch/i386/pci/Makefile)
2. Rename arch/i386/pci/numa.c to arch/i386/pci/numaq.c to accurately reflect that this file contains code specific to NUMA-Q, not generic i386 NUMA.

Cheers!

-Matt

arch/i386/pci/Makefile +3 -3
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.39-multiquad/arch/i386/pci/Makefile linux-2.5.39-multiquad+numa_rename/arch/i386/pci/Makefile
@@ -3,8 +3,8 @@
 obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
 obj-$(CONFIG_PCI_DIRECT)	+= direct.o
 
-ifdef	CONFIG_MULTIQUAD
-obj-y		+= numa.o
+ifdef	CONFIG_X86_NUMAQ
+obj-y		+= numaq.o
 else
 obj-y		+= fixup.o
 
@@ -14,7 +14,7 @@
 obj-y		+= legacy.o
 
 
-endif		# CONFIG_MULTIQUAD
+endif		# CONFIG_X86_NUMAQ
 obj-y		+= irq.o common.o
 
 include $(TOPDIR)/Rules.make
arch/i386/pci/numa.c +0 -141

141 lines not on this page · raw message

arch/i386/pci/numaq.c +141 -0

141 lines not on this page · raw message