* [PATCH] -mm: cyrix code CONFIG_PCI fix / add __initdata
@ 2006-05-23 17:59 Andreas Mohr
0 siblings, 0 replies; only message in thread
From: Andreas Mohr @ 2006-05-23 17:59 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Hello all,
PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0
(since accessed within __init function only).
i386 run-tested on 2.6.17-rc4-mm3. However since this is no Cyrix here,
not ultimately sure whether it really works.
Signed-off-by: Andreas Mohr <andi@lisas.de>
diff -urN linux-2.6.17-rc4-mm3.orig/arch/i386/kernel/cpu/cyrix.c linux-2.6.17-rc4-mm3.my/arch/i386/kernel/cpu/cyrix.c
--- linux-2.6.17-rc4-mm3.orig/arch/i386/kernel/cpu/cyrix.c 2006-05-23 17:50:00.000000000 +0200
+++ linux-2.6.17-rc4-mm3.my/arch/i386/kernel/cpu/cyrix.c 2006-05-23 17:26:25.000000000 +0200
@@ -184,7 +184,7 @@
#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,15 +272,16 @@
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) {
/* Enable cxMMX extensions (GX1 Datasheet 54) */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-05-23 17:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-05-23 17:59 [PATCH] -mm: cyrix code CONFIG_PCI fix / add __initdata Andreas Mohr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).