summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa2008-03-03 18:12:30 +0100
committerIngo Molnar2008-04-17 17:40:52 +0200
commit639acb16e6b93342a786c01425cf8eb8ebbb1351 (patch)
tree809cc51e57d40b245a7aab1e221a11052a86eb99
parentx86: commonize smp.h (diff)
downloadkernel-qcow2-linux-639acb16e6b93342a786c01425cf8eb8ebbb1351.tar.gz
kernel-qcow2-linux-639acb16e6b93342a786c01425cf8eb8ebbb1351.tar.xz
kernel-qcow2-linux-639acb16e6b93342a786c01425cf8eb8ebbb1351.zip
x86: merge extern function definitions
move extern function definitions that are the same between smp_{32,64}.h to smp.h Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/smp.h3
-rw-r--r--include/asm-x86/smp_32.h4
-rw-r--r--include/asm-x86/smp_64.h4
3 files changed, 3 insertions, 8 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index f250d1c3f8a0..ad7b99dda0dc 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -8,5 +8,8 @@
# include "smp_64.h"
#endif
+extern void smp_alloc_memory(void);
+extern void lock_ipi_call_lock(void);
+extern void unlock_ipi_call_lock(void);
#endif /* __ASSEMBLY__ */
#endif
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 56152e312287..27812258ac6d 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -22,10 +22,6 @@ extern cpumask_t cpu_callin_map;
extern int smp_num_siblings;
extern unsigned int num_processors;
-extern void smp_alloc_memory(void);
-extern void lock_ipi_call_lock(void);
-extern void unlock_ipi_call_lock(void);
-
extern void (*mtrr_hook) (void);
extern void zap_low_mappings (void);
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index e0a75519ad21..2c21df289da4 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -19,10 +19,6 @@ extern cpumask_t cpu_initialized;
extern int smp_num_siblings;
extern unsigned int num_processors;
-extern void smp_alloc_memory(void);
-extern void lock_ipi_call_lock(void);
-extern void unlock_ipi_call_lock(void);
-
extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
void *info, int wait);