Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a850cef77f148c2e305022a1ed86ca6cff5ee300
Commit:     a850cef77f148c2e305022a1ed86ca6cff5ee300
Parent:     fb7ae26df0b1218b39049b659064d57b58616c94
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 18:04:38 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:16:16 2007 +0200

    i386: no need to make enable_cpu_hotplug a variable
    
    As long as there's no write access to this variable there's no reason to
    let gcc check it at runtime.
    
    [ tglx: arch/x86 adaptation ]
    
    Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/kernel/topology.c |    6 +++---
 include/asm-x86/cpu.h      |    3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index c25f23e..8caa0b7 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -44,15 +44,15 @@ int arch_register_cpu(int num)
         * Also certain PCI quirks require not to enable hotplug control
         * for all CPU's.
         */
-       if (num && enable_cpu_hotplug)
+#ifdef CONFIG_HOTPLUG_CPU
+       if (num)
                cpu_devices[num].cpu.hotpluggable = 1;
+#endif
 
        return register_cpu(&cpu_devices[num].cpu, num);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-int enable_cpu_hotplug = 1;
-
 void arch_unregister_cpu(int num) {
        return unregister_cpu(&cpu_devices[num].cpu);
 }
diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h
index 9d914e1..b1bc7b1 100644
--- a/include/asm-x86/cpu.h
+++ b/include/asm-x86/cpu.h
@@ -13,9 +13,6 @@ struct i386_cpu {
 extern int arch_register_cpu(int num);
 #ifdef CONFIG_HOTPLUG_CPU
 extern void arch_unregister_cpu(int);
-extern int enable_cpu_hotplug;
-#else
-#define enable_cpu_hotplug     0
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to