Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / include / asm-ia64 / smp.h

diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index a3914352c995e83222080a9d7151a9567256196c..c60024989ebd59b70bd090d01cc0ada6a95ad9d4 100644 (file)
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -10,7 +10,6 @@
 #ifndef _ASM_IA64_SMP_H
 #define _ASM_IA64_SMP_H
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>
@@ -39,6 +38,8 @@ ia64_get_lid (void)
        return lid.f.id << 8 | lid.f.eid;
 }
 
+#define hard_smp_processor_id()                ia64_get_lid()
+
 #ifdef CONFIG_SMP
 
 #define XTP_OFFSET             0x1e0008
@@ -111,8 +112,6 @@ max_xtp (void)
                writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */
 }
 
-#define hard_smp_processor_id()                ia64_get_lid()
-
 /* Upping and downing of CPUs */
 extern int __cpu_disable (void);
 extern void __cpu_die (unsigned int cpu);
@@ -123,14 +122,13 @@ extern void __init smp_build_cpu_map(void);
 extern void __init init_smp_config (void);
 extern void smp_do_timer (struct pt_regs *regs);
 
-extern int smp_call_function_single (int cpuid, void (*func) (void *info), void *info,
-                                    int retry, int wait);
 extern void smp_send_reschedule (int cpu);
 extern void lock_ipi_calllock(void);
 extern void unlock_ipi_calllock(void);
 extern void identify_siblings (struct cpuinfo_ia64 *);
+extern int is_multithreading_enabled(void);
 
-#else
+#else /* CONFIG_SMP */
 
 #define cpu_logical_id(i)              0
 #define cpu_physical_id(i)             ia64_get_lid()