Skip to content

Commit

Permalink
[PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata
Browse files Browse the repository at this point in the history
PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since
accessed within __init function only).

Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andreas Mohr authored and Linus Torvalds committed Jun 23, 2006
1 parent acae9d3 commit cefc011
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/i386/kernel/cpu/cyrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
{ },
Expand Down Expand Up @@ -272,14 +272,15 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)

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) {
Expand Down

0 comments on commit cefc011

Please sign in to comment.