Commit cb45d949 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

[PATCH] fix UP_APIC linkage problem in 2.5.3[78]

The problem is that the local APIC code references stuff in
mpparse, but 2.5.37 changed arch/i386/kernel/Makefile to only
compile mpparse for SMP.

This patch works around this by enforcing CONFIG_X86_MPPARSE
for all LOCAL_APIC-enabled configs.
parent 63b9d36d
...@@ -260,7 +260,6 @@ else ...@@ -260,7 +260,6 @@ else
if [ "$CONFIG_SMP" = "y" ]; then if [ "$CONFIG_SMP" = "y" ]; then
define_bool CONFIG_X86_IO_APIC y define_bool CONFIG_X86_IO_APIC y
define_bool CONFIG_X86_LOCAL_APIC y define_bool CONFIG_X86_LOCAL_APIC y
define_bool CONFIG_X86_MPPARSE y
fi fi
bool 'PCI support' CONFIG_PCI bool 'PCI support' CONFIG_PCI
if [ "$CONFIG_PCI" = "y" ]; then if [ "$CONFIG_PCI" = "y" ]; then
...@@ -441,6 +440,7 @@ fi ...@@ -441,6 +440,7 @@ fi
if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then
define_bool CONFIG_X86_EXTRA_IRQS y define_bool CONFIG_X86_EXTRA_IRQS y
define_bool CONFIG_X86_FIND_SMP_CONFIG y define_bool CONFIG_X86_FIND_SMP_CONFIG y
define_bool CONFIG_X86_MPPARSE y
fi fi
endmenu endmenu
......
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