From 53ebef4961c7d5347b4fa2b878258ccd11fc9663 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Mon, 3 Mar 2008 14:12:31 -0300
Subject: [PATCH] x86: merge extern variables definitions
move extern 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>
---
include/asm-x86/smp.h | 6 ++++++
include/asm-x86/smp_32.h | 4 ----
include/asm-x86/smp_64.h | 4 ----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index ad7b99dda0dc..c130a87c956d 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -1,6 +1,12 @@
#ifndef _ASM_X86_SMP_H_
#define _ASM_X86_SMP_H_
#ifndef __ASSEMBLY__
+#include <linux/cpumask.h>
+
+extern cpumask_t cpu_callout_map;
+
+extern int smp_num_siblings;
+extern unsigned int num_processors;
#ifdef CONFIG_X86_32
# include "smp_32.h"
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 27812258ac6d..9a4057d94367 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -16,12 +16,8 @@
# endif
#endif
-extern cpumask_t cpu_callout_map;
extern cpumask_t cpu_callin_map;
-extern int smp_num_siblings;
-extern unsigned int num_processors;
-
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 2c21df289da4..284f701f2a8b 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -13,12 +13,8 @@
#include <asm/pda.h>
#include <asm/thread_info.h>
-extern cpumask_t cpu_callout_map;
extern cpumask_t cpu_initialized;
-extern int smp_num_siblings;
-extern unsigned int num_processors;
-
extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
void *info, int wait);