Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cefc0113 authored by Andreas Mohr's avatar Andreas Mohr Committed by Linus Torvalds
Browse files

[PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata 



PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since
accessed within __init function only).

Signed-off-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent acae9d32

arch/i386/kernel/cpu/cyrix.c

+5 −4
Original line number Diff line number Diff line
@@ -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 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) {