Fix x86 CPU merge dangling ends

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index 5ff541e09708c6ecc11a280b830d1fab84692d61..d9d3771b428dbd005d6062100b8570358dc7f1f5 100644 (file)
--- 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 5c3d9a775530cd795c7278226a245b2fbc1c445b..2af26956a150397d0b5a69b2863a55d1b06e6587 100644 (file)
--- 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 faaf7ee02c07fb4c426be7cd9e4340f8bf0da68a..570affdb1f0c810a789a11d5b5b107e92ed1d9cd 100644 (file)
--- 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]);