Commit 8aabc781 authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[PATCH] fix non-PC subarchs which were broken by i386 probe_roms change

The author apparently didn't understand that only the mach-default
include directory is included by fallback for header files only.  You
can't stick a .c file in mach-default and expect all subarchs to be able
to use it.

The correct fix is to put std_resources.c in the kernel directory and
give it its own Kconfig symbol for conditional compile so that subarchs
may choose to include it or not.
parent fbd532e3
...@@ -1341,6 +1341,12 @@ config X86_TRAMPOLINE ...@@ -1341,6 +1341,12 @@ config X86_TRAMPOLINE
depends on X86_SMP || (X86_VOYAGER && SMP) depends on X86_SMP || (X86_VOYAGER && SMP)
default y default y
# std_resources is overridden for pc9800, but that's not
# a currently selectable arch choice
config X86_STD_RESOURCES
bool
default y
config PC config PC
bool bool
depends on X86 && !EMBEDDED depends on X86 && !EMBEDDED
......
...@@ -31,6 +31,7 @@ obj-$(CONFIG_ACPI_SRAT) += srat.o ...@@ -31,6 +31,7 @@ obj-$(CONFIG_ACPI_SRAT) += srat.o
obj-$(CONFIG_HPET_TIMER) += time_hpet.o obj-$(CONFIG_HPET_TIMER) += time_hpet.o
obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_X86_STD_RESOURCES) += std_resources.o
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
obj-y := setup.o topology.o std_resources.o obj-y := setup.o topology.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment