git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[safe/jmp/linux-2.6]
/
kernel
/
smp.c
diff --git
a/kernel/smp.c
b/kernel/smp.c
index
f104084
..
3fc6973
100644
(file)
--- a/
kernel/smp.c
+++ b/
kernel/smp.c
@@
-9,11
+9,10
@@
#include <linux/module.h>
#include <linux/percpu.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/percpu.h>
#include <linux/init.h>
+#include <linux/gfp.h>
#include <linux/smp.h>
#include <linux/cpu.h>
#include <linux/smp.h>
#include <linux/cpu.h>
-static DEFINE_PER_CPU(struct call_single_queue, call_single_queue);
-
static struct {
struct list_head queue;
raw_spinlock_t lock;
static struct {
struct list_head queue;
raw_spinlock_t lock;
@@
-33,12
+32,14
@@
struct call_function_data {
cpumask_var_t cpumask;
};
cpumask_var_t cpumask;
};
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data);
+
struct call_single_queue {
struct list_head list;
raw_spinlock_t lock;
};
struct call_single_queue {
struct list_head list;
raw_spinlock_t lock;
};
-static DEFINE_PER_CPU
(struct call_function_data, cfd_data
);
+static DEFINE_PER_CPU
_SHARED_ALIGNED(struct call_single_queue, call_single_queue
);
static int
hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
static int
hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
@@
-256,7
+257,7
@@
void generic_smp_call_function_single_interrupt(void)
}
}
}
}
-static DEFINE_PER_CPU(struct call_single_data, csd_data);
+static DEFINE_PER_CPU
_SHARED_ALIGNED
(struct call_single_data, csd_data);
/*
* smp_call_function_single - Run a function on a specific CPU
/*
* smp_call_function_single - Run a function on a specific CPU