leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: undo visws/numaq build changes

Browse Source 
arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo

commit 895d30935e
    x86: numaq fix
    do not override the existing pci-y rule when adding visws or
    numaq rules.

There is also a stupid init function ordering problem vs. acpi.o

Add comments to the Makefile to avoid tripping over this again.

Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2008-05-02 21:24:30 +02:00 committed by Ingo Molnar
parent afa26be86b
commit 48b83d2425
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/x86/mm/discontig_32.c
View File

@ -476,29 +476,3 @@ int memory_add_physaddr_to_nid(u64 addr)
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
#endif #endif
#ifndef CONFIG_HAVE_ARCH_PARSE_SRAT
/*
* XXX FIXME: Make SLIT table parsing available to 32-bit NUMA
*
* These stub functions are needed to compile 32-bit NUMA when SRAT is
* not set. There are functions in srat_64.c for parsing this table
* and it may be possible to make them common functions.
*/
void acpi_numa_slit_init (struct acpi_table_slit *slit)
{
printk(KERN_INFO "ACPI: No support for parsing SLIT table\n");
}
void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa)
{
}
void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma)
{
}
void acpi_numa_arch_fixup(void)
{
}
#endif /* CONFIG_HAVE_ARCH_PARSE_SRAT */

12
arch/x86/pci/Makefile_32
View File

@ -6,11 +6,19 @@ obj-$(CONFIG_PCI_DIRECT) += direct.o
obj-$(CONFIG_PCI_OLPC) += olpc.o obj-$(CONFIG_PCI_OLPC) += olpc.o
pci-y := fixup.o pci-y := fixup.o
# Do not change the ordering here. There is a nasty init function
# ordering dependency which breaks when you move acpi.o below
# legacy/irq.o
pci-$(CONFIG_ACPI) += acpi.o pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o pci-y += legacy.o irq.o
pci-$(CONFIG_X86_VISWS) += visws.o fixup.o # Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
pci-$(CONFIG_X86_NUMAQ) += numa.o irq.o # therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o pci-$(CONFIG_NUMA) += mp_bus_to_node.o
obj-y += $(pci-y) common.o early.o obj-y += $(pci-y) common.o early.o