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
nfsd4: fix null dereference creating nfsv4 callback client
[safe/jmp/linux-2.6]
/
include
/
linux
/
cpu.h
diff --git
a/include/linux/cpu.h
b/include/linux/cpu.h
index
92f2029
..
4d668e0
100644
(file)
--- a/
include/linux/cpu.h
+++ b/
include/linux/cpu.h
@@
-23,8
+23,6
@@
#include <linux/node.h>
#include <linux/compiler.h>
#include <linux/cpumask.h>
#include <linux/node.h>
#include <linux/compiler.h>
#include <linux/cpumask.h>
-#include <asm/semaphore.h>
-#include <linux/mutex.h>
struct cpu {
int node_id; /* The node which contains the CPU */
struct cpu {
int node_id; /* The node which contains the CPU */
@@
-70,37
+68,39
@@
static inline void unregister_cpu_notifier(struct notifier_block *nb)
#endif
int cpu_up(unsigned int cpu);
#endif
int cpu_up(unsigned int cpu);
+void notify_cpu_starting(unsigned int cpu);
+extern void cpu_maps_update_begin(void);
+extern void cpu_maps_update_done(void);
-#else
+#else
/* CONFIG_SMP */
static inline int register_cpu_notifier(struct notifier_block *nb)
{
return 0;
}
static inline int register_cpu_notifier(struct notifier_block *nb)
{
return 0;
}
+
static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}
static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}
-#endif /* CONFIG_SMP */
-extern struct sysdev_class cpu_sysdev_class;
-
-#ifdef CONFIG_HOTPLUG_CPU
-/* Stop CPUs going up and down. */
-
-static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
+static inline void cpu_maps_update_begin(void)
{
{
- mutex_lock(cpu_hp_mutex);
}
}
-static inline void cpu
hotplug_mutex_unlock(struct mutex *cpu_hp_mutex
)
+static inline void cpu
_maps_update_done(void
)
{
{
- mutex_unlock(cpu_hp_mutex);
}
}
-extern void lock_cpu_hotplug(void);
-extern void unlock_cpu_hotplug(void);
+#endif /* CONFIG_SMP */
+extern struct sysdev_class cpu_sysdev_class;
+
+#ifdef CONFIG_HOTPLUG_CPU
+/* Stop CPUs going up and down. */
+
+extern void get_online_cpus(void);
+extern void put_online_cpus(void);
#define hotcpu_notifier(fn, pri) { \
#define hotcpu_notifier(fn, pri) { \
- static struct notifier_block fn##_nb
=
\
+ static struct notifier_block fn##_nb
__cpuinitdata =
\
{ .notifier_call = fn, .priority = pri }; \
register_cpu_notifier(&fn##_nb); \
}
{ .notifier_call = fn, .priority = pri }; \
register_cpu_notifier(&fn##_nb); \
}
@@
-110,13
+110,8
@@
int cpu_down(unsigned int cpu);
#else /* CONFIG_HOTPLUG_CPU */
#else /* CONFIG_HOTPLUG_CPU */
-static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
-{ }
-static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
-{ }
-
-#define lock_cpu_hotplug() do { } while (0)
-#define unlock_cpu_hotplug() do { } while (0)
+#define get_online_cpus() do { } while (0)
+#define put_online_cpus() do { } while (0)
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
/* These aren't inline functions due to a GCC bug. */
#define register_hotcpu_notifier(nb) ({ (void)(nb); 0; })
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
/* These aren't inline functions due to a GCC bug. */
#define register_hotcpu_notifier(nb) ({ (void)(nb); 0; })