From: Andreas Mohr PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since accessed within __init function only). Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cyrix.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff -puN arch/i386/kernel/cpu/cyrix.c~x86-cyrix-code-config_pci-fix--add-__initdata arch/i386/kernel/cpu/cyrix.c --- 25/arch/i386/kernel/cpu/cyrix.c~x86-cyrix-code-config_pci-fix--add-__initdata Wed May 24 13:38:19 2006 +++ 25-akpm/arch/i386/kernel/cpu/cyrix.c Wed May 24 13:38:19 2006 @@ -184,7 +184,7 @@ static void __init geode_configure(void) #ifdef CONFIG_PCI -static struct pci_device_id cyrix_55x0[] = { +static struct pci_device_id __initdata cyrix_55x0[] = { { PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510) }, { PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520) }, { }, @@ -272,14 +272,15 @@ static void __init init_cyrix(struct cpu printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n"); isa_dma_bridge_buggy = 2; -#endif - c->x86_cache_size=16; /* Yep 16K integrated cache thats it */ - + + /* * The 5510/5520 companion chips have a funky PIT. */ if (pci_dev_present(cyrix_55x0)) pit_latch_buggy = 1; +#endif + c->x86_cache_size=16; /* Yep 16K integrated cache thats it */ /* GXm supports extended cpuid levels 'ala' AMD */ if (c->cpuid_level == 2) { _