[PULL -tip] x86: smp.h move cpumask related things to cpumask.h

[PULL -tip] x86: smp.h move cpumask related things to cpumask.h

[Jaswinder Singh Rajput]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

The following changes since commit 22e34e5f3362464f1095bc028fc5df945663cd0a:
  Ingo Molnar (1):
        manual merge of out-of-tree

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git
master

Jaswinder Singh Rajput (4):
      x86: smp.h move cpu_callin_mask and cpu_callin_map declartion to cpumask.h
      x86: smp.h move cpu_callout_mask and cpu_callout_map declartion
to cpumask.h
      x86: smp.h move cpu_initialized_mask and cpu_initialized
declartion to cpumask.h
      x86: smp.h move cpu_sibling_setup_mask and cpu_sibling_setup_map
declartion to cpumask.h

 arch/x86/include/asm/cpumask.h |   28 ++++++++++++++++++++++++++++
 arch/x86/include/asm/smp.h     |   22 +---------------------
 arch/x86/kernel/cpu/common.c   |    1 +
 arch/x86/kernel/setup_percpu.c |    1 +
 4 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 arch/x86/include/asm/cpumask.h

Thanks
--
JSR

[-- Attachment #2: git-pull-cpumask.diff --]
[-- Type: application/octet-stream, Size: 2743 bytes --]

diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
new file mode 100644
index 0000000..26c6dad
--- /dev/null
+++ b/arch/x86/include/asm/cpumask.h
@@ -0,0 +1,28 @@
+#ifndef _ASM_X86_CPUMASK_H
+#define _ASM_X86_CPUMASK_H
+#ifndef __ASSEMBLY__
+#include <linux/cpumask.h>
+
+#ifdef CONFIG_X86_64
+
+extern cpumask_var_t cpu_callin_mask;
+extern cpumask_var_t cpu_callout_mask;
+extern cpumask_var_t cpu_initialized_mask;
+extern cpumask_var_t cpu_sibling_setup_mask;
+
+#else /* CONFIG_X86_32 */
+
+extern cpumask_t cpu_callin_map;
+extern cpumask_t cpu_callout_map;
+extern cpumask_t cpu_initialized;
+extern cpumask_t cpu_sibling_setup_map;
+
+#define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
+#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
+#define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)
+#define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
+
+#endif /* CONFIG_X86_32 */
+
+#endif /* __ASSEMBLY__ */
+#endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 1963e27..a8cea7b 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -17,27 +17,7 @@
 #endif
 #include <asm/pda.h>
 #include <asm/thread_info.h>
-
-#ifdef CONFIG_X86_64
-
-extern cpumask_var_t cpu_callin_mask;
-extern cpumask_var_t cpu_callout_mask;
-extern cpumask_var_t cpu_initialized_mask;
-extern cpumask_var_t cpu_sibling_setup_mask;
-
-#else /* CONFIG_X86_32 */
-
-extern cpumask_t cpu_callin_map;
-extern cpumask_t cpu_callout_map;
-extern cpumask_t cpu_initialized;
-extern cpumask_t cpu_sibling_setup_map;
-
-#define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
-#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
-#define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)
-#define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
-
-#endif /* CONFIG_X86_32 */
+#include <asm/cpumask.h>
 
 extern int __cpuinit get_local_pda(int cpu);
 
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index fb935af..78f85f7 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -23,6 +23,7 @@
 #include <asm/numa.h>
 #include <asm/smp.h>
 #include <asm/cpu.h>
+#include <asm/cpumask.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 55c4607..bf63de7 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -13,6 +13,7 @@
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
 #include <asm/highmem.h>
+#include <asm/cpumask.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 unsigned int num_processors;

Re: [PULL -tip] x86: smp.h move cpumask related things to cpumask.h

[Ingo Molnar]

* Jaswinder Singh Rajput <jaswinderlinux@gmail.com> wrote:

> The following changes since commit 22e34e5f3362464f1095bc028fc5df945663cd0a:
>   Ingo Molnar (1):
>         manual merge of out-of-tree
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git
> master
> 
> Jaswinder Singh Rajput (4):
>       x86: smp.h move cpu_callin_mask and cpu_callin_map declartion to cpumask.h
>       x86: smp.h move cpu_callout_mask and cpu_callout_map declartion
> to cpumask.h
>       x86: smp.h move cpu_initialized_mask and cpu_initialized
> declartion to cpumask.h
>       x86: smp.h move cpu_sibling_setup_mask and cpu_sibling_setup_map
> declartion to cpumask.h
> 
>  arch/x86/include/asm/cpumask.h |   28 ++++++++++++++++++++++++++++
>  arch/x86/include/asm/smp.h     |   22 +---------------------
>  arch/x86/kernel/cpu/common.c   |    1 +
>  arch/x86/kernel/setup_percpu.c |    1 +
>  4 files changed, 31 insertions(+), 21 deletions(-)
>  create mode 100644 arch/x86/include/asm/cpumask.h

Pulled into tip/x86/cleanups, thanks Jaswinder!

	Ingo