diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-06-04 22:49:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-06-04 22:49:39 -0700 |
| commit | 195d8228ede448e56dec61fd426db0309745b66f (patch) | |
| tree | ada3e050e5bc4340c7220cd618e0111c05d2b404 | |
| parent | 658c74794e0265b9170e32261a623404a144d7ef (diff) | |
Fix x86 CPU merge dangling ends
| -rw-r--r-- | arch/i386/kernel/cpu/cyrix.c | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/intel.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/proc.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c index 5ff541e09708..d9d3771b428d 100644 --- a/arch/i386/kernel/cpu/cyrix.c +++ b/arch/i386/kernel/cpu/cyrix.c @@ -1,7 +1,9 @@ #include <linux/init.h> #include <linux/bitops.h> #include <linux/delay.h> +#include <linux/pci.h> #include <linux/pci_ids.h> + #include <asm/dma.h> #include <asm/io.h> #include <asm/processor.h> @@ -199,7 +201,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c) * The 5510/5520 companion chips have a funky PIT * that breaks the TSC synchronizing, so turn it off */ - if(pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) || + if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) || pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL)) clear_bit(X86_FEATURE_TSC, c->x86_capability); return; diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c index 5c3d9a775530..2af26956a150 100644 --- a/arch/i386/kernel/cpu/intel.c +++ b/arch/i386/kernel/cpu/intel.c @@ -315,7 +315,7 @@ static void __init init_intel(struct cpuinfo_x86 *c) too_many_siblings: if (disable_P4_HT) - clear_bit(X86_FEATURE_HT, &c->x86_capability); + clear_bit(X86_FEATURE_HT, c->x86_capability); #endif /* Disable the PN if appropriate */ diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index faaf7ee02c07..570affdb1f0c 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c @@ -66,7 +66,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) else seq_printf(m, "stepping\t: unknown\n"); - if ( test_bit(X86_FEATURE_TSC, &c->x86_capability) ) { + if ( test_bit(X86_FEATURE_TSC, c->x86_capability) ) { seq_printf(m, "cpu MHz\t\t: %lu.%03lu\n", cpu_khz / 1000, (cpu_khz % 1000)); } @@ -96,7 +96,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) c->wp_works_ok ? "yes" : "no"); for ( i = 0 ; i < 32*NCAPINTS ; i++ ) - if ( test_bit(i, &c->x86_capability) && + if ( test_bit(i, c->x86_capability) && x86_cap_flags[i] != NULL ) seq_printf(m, " %s", x86_cap_flags[i]); |