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 41/52] move trampoline arrays extern definition to smp.h
Date: Mon, 3 Mar 2008 14:13:09 -0300 [thread overview]
Message-ID: <1204564400-17636-42-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <1204564400-17636-41-git-send-email-gcosta@redhat.com>
In here, they can serve both architectures
Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
arch/x86/kernel/smpboot_32.c | 6 ------
arch/x86/kernel/smpboot_64.c | 7 -------
include/asm-x86/smp.h | 6 ++++++
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 3236e84..a21f254 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -73,12 +73,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
u8 apicid_2_node[MAX_APICID];
-/*
- * Trampoline 80x86 program as an array.
- */
-
-extern const unsigned char trampoline_data [];
-extern const unsigned char trampoline_end [];
static unsigned char *trampoline_base;
static void map_cpu_to_logical_apicid(void);
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 0c67e5a..2cc1b8b 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -63,13 +63,6 @@
/* Set when the idlers are all forked */
int smp_threads_ready;
-/*
- * Trampoline 80x86 program as an array.
- */
-
-extern const unsigned char trampoline_data[];
-extern const unsigned char trampoline_end[];
-
/* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 };
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 27d9f65..b2a1697 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -9,6 +9,12 @@ extern cpumask_t cpu_callout_map;
extern int smp_num_siblings;
extern unsigned int num_processors;
+/*
+ * Trampoline 80x86 program as an array.
+ */
+extern const unsigned char trampoline_data [];
+extern const unsigned char trampoline_end [];
+
struct smp_ops {
void (*smp_prepare_boot_cpu)(void);
void (*smp_prepare_cpus)(unsigned max_cpus);
--
1.5.0.6
next prev parent reply other threads:[~2008-03-03 17:26 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 ` [PATCH 30/52] move equal types to common file Glauber Costa
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 ` Glauber Costa [this message]
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-42-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 41/52] move trampoline arrays extern definition to smp.h' \
/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).