LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Glauber Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu,
	tglx@linutronix.de, Glauber Costa <gcosta@redhat.com>
Subject: [PATCH 30/52] move equal types to common file
Date: Mon,  3 Mar 2008 14:12:58 -0300	[thread overview]
Message-ID: <1204564400-17636-31-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <1204564400-17636-30-git-send-email-gcosta@redhat.com>

move definitions that are now equal in type from
smpboot_{32,64}.c to smpboot.c

cpu_callin_map is put temporarily in smp_64.h (already
exists in smp_32.h), and will soon be merged.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
 arch/x86/kernel/smpboot.c    |   28 ++++++++++++++++++++++++++++
 arch/x86/kernel/smpboot_32.c |   27 ---------------------------
 arch/x86/kernel/smpboot_64.c |   33 ---------------------------------
 include/asm-x86/smp_64.h     |    1 +
 4 files changed, 29 insertions(+), 60 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index bffe108..40a3b56 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1,6 +1,34 @@
 #include <linux/init.h>
 #include <linux/smp.h>
+#include <linux/module.h>
 
+/* Number of siblings per CPU package */
+int smp_num_siblings = 1;
+EXPORT_SYMBOL(smp_num_siblings);
+
+/* Last level cache ID of each logical CPU */
+DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
+
+/* bitmap of online cpus */
+cpumask_t cpu_online_map __read_mostly;
+EXPORT_SYMBOL(cpu_online_map);
+
+cpumask_t cpu_callin_map;
+cpumask_t cpu_callout_map;
+cpumask_t cpu_possible_map;
+EXPORT_SYMBOL(cpu_possible_map);
+
+/* representing HT siblings of each logical CPU */
+DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
+EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
+
+/* representing HT and core siblings of each logical CPU */
+DEFINE_PER_CPU(cpumask_t, cpu_core_map);
+EXPORT_PER_CPU_SYMBOL(cpu_core_map);
+
+/* Per CPU bogomips and other parameters */
+DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
+EXPORT_PER_CPU_SYMBOL(cpu_info);
 #ifdef CONFIG_HOTPLUG_CPU
 
 int additional_cpus __initdata = -1;
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 5a446f0..0fbc981 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -62,35 +62,8 @@
 /* Set if we find a B stepping CPU */
 static int __cpuinitdata smp_b_stepping;
 
-/* Number of siblings per CPU package */
-int smp_num_siblings = 1;
-EXPORT_SYMBOL(smp_num_siblings);
-
-/* Last level cache ID of each logical CPU */
-DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
-
-/* representing HT siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
-EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
-
-/* representing HT and core siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_core_map);
-EXPORT_PER_CPU_SYMBOL(cpu_core_map);
-
-/* bitmap of online cpus */
-cpumask_t cpu_online_map __read_mostly;
-EXPORT_SYMBOL(cpu_online_map);
-
-cpumask_t cpu_callin_map;
-cpumask_t cpu_callout_map;
-cpumask_t cpu_possible_map;
-EXPORT_SYMBOL(cpu_possible_map);
 static cpumask_t smp_commenced_mask;
 
-/* Per CPU bogomips and other parameters */
-DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
-EXPORT_PER_CPU_SYMBOL(cpu_info);
-
 /* which logical CPU number maps to which CPU (physical APIC ID) */
 u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
 			{ [0 ... NR_CPUS-1] = BAD_APICID };
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 953b0ff..c51279f 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -60,42 +60,9 @@
 #include <asm/hw_irq.h>
 #include <asm/numa.h>
 
-/* Number of siblings per CPU package */
-int smp_num_siblings = 1;
-EXPORT_SYMBOL(smp_num_siblings);
-
-/* Last level cache ID of each logical CPU */
-DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
-
-/* Bitmask of currently online CPUs */
-cpumask_t cpu_online_map __read_mostly;
-
-EXPORT_SYMBOL(cpu_online_map);
-
-/*
- * Private maps to synchronize booting between AP and BP.
- * Probably not needed anymore, but it makes for easier debugging. -AK
- */
-cpumask_t cpu_callin_map;
-cpumask_t cpu_callout_map;
-cpumask_t cpu_possible_map;
-EXPORT_SYMBOL(cpu_possible_map);
-
-/* Per CPU bogomips and other parameters */
-DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
-EXPORT_PER_CPU_SYMBOL(cpu_info);
-
 /* Set when the idlers are all forked */
 int smp_threads_ready;
 
-/* representing HT siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
-EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
-
-/* representing HT and core siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_core_map);
-EXPORT_PER_CPU_SYMBOL(cpu_core_map);
-
 /*
  * Trampoline 80x86 program as an array.
  */
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index e5bc1be..1ecf813 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -14,6 +14,7 @@
 #include <asm/thread_info.h>
 
 extern cpumask_t cpu_initialized;
+extern cpumask_t cpu_callin_map;
 
 extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
 				  void *info, int wait);
-- 
1.5.0.6


  reply	other threads:[~2008-03-03 17:21 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-03 17:12 [PATCH 0/52] First attempt at smp integration Glauber Costa
2008-03-03 17:12 ` [PATCH 01/52] commonize smp.h Glauber Costa
2008-03-03 17:12   ` [PATCH 02/52] merge extern function definitions Glauber Costa
2008-03-03 17:12     ` [PATCH 03/52] merge extern variables definitions Glauber Costa
2008-03-03 17:12       ` [PATCH 04/52] define smp_ops in common header Glauber Costa
2008-03-03 17:12         ` [PATCH 05/52] move smp_ops extern declaration to " Glauber Costa
2008-03-03 17:12           ` [PATCH 06/52] merge smp_send_reschedule Glauber Costa
2008-03-03 17:12             ` [PATCH 07/52] unify smp_call_function_mask Glauber Costa
2008-03-03 17:12               ` [PATCH 08/52] unify __cpu_up Glauber Costa
2008-03-03 17:12                 ` [PATCH 09/52] unify prepare_boot_cpu Glauber Costa
2008-03-03 17:12                   ` [PATCH 10/52] unify smp_prepare_cpus Glauber Costa
2008-03-03 17:12                     ` [PATCH 11/52] unify smp_cpus_done Glauber Costa
2008-03-03 17:12                       ` [PATCH 12/52] move disabled_cpus to common header Glauber Costa
2008-03-03 17:12                         ` [PATCH 13/52] use disabled_cpus in i386 Glauber Costa
2008-03-03 17:12                           ` [PATCH 14/52] move prefill_possible_map to common file Glauber Costa
2008-03-03 17:12                             ` [PATCH 15/52] remove export for smp_call_function_mask Glauber Costa
2008-03-03 17:12                               ` [PATCH 16/52] remove irqs disabled warning Glauber Costa
2008-03-03 17:12                                 ` [PATCH 17/52] create smpcommon.c Glauber Costa
2008-03-03 17:12                                   ` [PATCH 18/52] provide __smp_call_function Glauber Costa
2008-03-03 17:12                                     ` [PATCH 19/52] change x86_64 smp_call_function_mask to look alike i386 Glauber Costa
2008-03-03 17:12                                       ` [PATCH 20/52] provide hlt_works function Glauber Costa
2008-03-03 17:12                                         ` [PATCH 21/52] make stop_this_cpu looks exactly equal in both arches Glauber Costa
2008-03-03 17:12                                           ` [PATCH 22/52] add reboot_force test to native_smp_send_stop Glauber Costa
2008-03-03 17:12                                             ` [PATCH 23/52] unify smp_send_stop Glauber Costa
2008-03-03 17:12                                               ` [PATCH 24/52] create smp.c Glauber Costa
2008-03-03 17:12                                                 ` [PATCH 25/52] create ipi.c Glauber Costa
2008-03-03 17:12                                                   ` [PATCH 26/52] create tlb files Glauber Costa
2008-03-03 17:12                                                     ` [PATCH 27/52] get rid of smp_32.c and smp_64.c Glauber Costa
2008-03-03 17:12                                                       ` [PATCH 28/52] remove cpu_llc_id from processor.h Glauber Costa
2008-03-03 17:12                                                         ` [PATCH 29/52] adjust types in smpcommon_32.c Glauber Costa
2008-03-03 17:12                                                           ` Glauber Costa [this message]
2008-03-03 17:12                                                             ` [PATCH 31/52] make set_cpu_sibling_map nonstatic Glauber Costa
2008-03-03 17:13                                                               ` [PATCH 32/52] make remove_siblinginfo non-static Glauber Costa
2008-03-03 17:13                                                                 ` [PATCH 33/52] move hotplug related extern definitions to smp.h Glauber Costa
2008-03-03 17:13                                                                   ` [PATCH 34/52] move sibling functions to common file Glauber Costa
2008-03-03 17:13                                                                     ` [PATCH 35/52] move cpu_coregroup_map " Glauber Costa
2008-03-03 17:13                                                                       ` [PATCH 36/52] remove vector_lock around cpu_online_map Glauber Costa
2008-03-03 17:13                                                                         ` [PATCH 37/52] use remove_from_maps in cpu_disable Glauber Costa
2008-03-03 17:13                                                                           ` [PATCH 38/52] do not clear cpu_online_map Glauber Costa
2008-03-03 17:13                                                                             ` [PATCH 39/52] merge __cpu_disable and cpu_die Glauber Costa
2008-03-03 17:13                                                                               ` [PATCH 40/52] make x86_64 accept the max_cpus parameter Glauber Costa
2008-03-03 17:13                                                                                 ` [PATCH 41/52] move trampoline arrays extern definition to smp.h Glauber Costa
2008-03-03 17:13                                                                                   ` [PATCH 42/52] adapt voyager's trampoline_base Glauber Costa
2008-03-03 17:13                                                                                     ` [PATCH 43/52] adapt voyager's setup_trampoline Glauber Costa
2008-03-03 17:13                                                                                       ` [PATCH 44/52] unify setup_trampoline Glauber Costa
2008-03-03 17:13                                                                                         ` [PATCH 45/52] use wait_for_init_deassert in x86_64 Glauber Costa
2008-03-03 17:13                                                                                           ` [PATCH 46/52] use cpu_relax instead of rep_nop Glauber Costa
2008-03-03 17:13                                                                                             ` [PATCH 47/52] leave irqs enabled while calibrating delay Glauber Costa
2008-03-03 17:13                                                                                               ` [PATCH 48/52] modify x86_64 smp_callin so it looks like i386 Glauber Costa
2008-03-03 17:13                                                                                                 ` [PATCH 49/52] wrap esr setting up in i386 in lapic_setup_esr Glauber Costa
2008-03-03 17:13                                                                                                   ` [PATCH 50/52] provide an end_local_APIC_setup function Glauber Costa
2008-03-03 17:13                                                                                                     ` [PATCH 51/52] make map_cpu_to_logical_apicid nonstatic Glauber Costa
2008-03-03 17:13                                                                                                       ` [PATCH 52/52] merge smp_callin Glauber Costa
2008-03-03 17:22 ` [PATCH 0/52] First attempt at smp integration Ingo Molnar
2008-03-03 17:35   ` Glauber Costa
2008-03-03 17:23 ` Andi Kleen
2008-03-03 17:38   ` Glauber Costa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1204564400-17636-31-git-send-email-gcosta@redhat.com \
    --to=gcosta@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=glommer@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 30/52] move equal types to common file' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).