git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
smp.c
diff --git
a/arch/arm/kernel/smp.c
b/arch/arm/kernel/smp.c
index 02aa300c46337fede228bf70d302433f4a12c548..421329f5e18e6ea0a8e336b4a32543622f1c0895 100644
(file)
--- a/
arch/arm/kernel/smp.c
+++ b/
arch/arm/kernel/smp.c
@@
-7,7
+7,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/spinlock.h>
@@
-37,7
+36,9
@@
* The online bitmask indicates that the CPU is up and running.
*/
cpumask_t cpu_possible_map;
* The online bitmask indicates that the CPU is up and running.
*/
cpumask_t cpu_possible_map;
+EXPORT_SYMBOL(cpu_possible_map);
cpumask_t cpu_online_map;
cpumask_t cpu_online_map;
+EXPORT_SYMBOL(cpu_online_map);
/*
* as from 2.5, kernels no longer have an init_tasks structure
/*
* as from 2.5, kernels no longer have an init_tasks structure
@@
-337,9
+338,6
@@
void __init smp_prepare_boot_cpu(void)
unsigned int cpu = smp_processor_id();
per_cpu(cpu_data, cpu).idle = current;
unsigned int cpu = smp_processor_id();
per_cpu(cpu_data, cpu).idle = current;
-
- cpu_set(cpu, cpu_present_map);
- cpu_set(cpu, cpu_online_map);
}
static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)
}
static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)