Commit 542f238e authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] Move cpu notifiers et al to cpu.h

Trivial patch: when these were introduced cpu.h didn't exist.
parent 51726557
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/cpu.h>
#include <asm/bitops.h> #include <asm/bitops.h>
static void invalidate_bh_lrus(void); static void invalidate_bh_lrus(void);
......
...@@ -31,6 +31,24 @@ struct cpu { ...@@ -31,6 +31,24 @@ struct cpu {
extern int register_cpu(struct cpu *, int, struct node *); extern int register_cpu(struct cpu *, int, struct node *);
extern struct class cpu_class; extern struct class cpu_class;
struct notifier_block;
#ifdef CONFIG_SMP
/* Need to know about CPUs going up/down? */
extern int register_cpu_notifier(struct notifier_block *nb);
extern void unregister_cpu_notifier(struct notifier_block *nb);
int cpu_up(unsigned int cpu);
#else
static inline int register_cpu_notifier(struct notifier_block *nb)
{
return 0;
}
static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}
#endif /* CONFIG_SMP */
/* Stop CPUs going up and down. */ /* Stop CPUs going up and down. */
extern struct semaphore cpucontrol; extern struct semaphore cpucontrol;
#endif /* _LINUX_CPU_H_ */ #endif /* _LINUX_CPU_H_ */
...@@ -84,14 +84,6 @@ extern int smp_threads_ready; ...@@ -84,14 +84,6 @@ extern int smp_threads_ready;
#define MSG_RESCHEDULE 0x0003 /* Reschedule request from master CPU*/ #define MSG_RESCHEDULE 0x0003 /* Reschedule request from master CPU*/
#define MSG_CALL_FUNCTION 0x0004 /* Call function on all other CPUs */ #define MSG_CALL_FUNCTION 0x0004 /* Call function on all other CPUs */
struct notifier_block;
/* Need to know about CPUs going up/down? */
extern int register_cpu_notifier(struct notifier_block *nb);
extern void unregister_cpu_notifier(struct notifier_block *nb);
int cpu_up(unsigned int cpu);
/* /*
* Mark the boot cpu "online" so that it can call console drivers in * Mark the boot cpu "online" so that it can call console drivers in
* printk() and can access its per-cpu storage. * printk() and can access its per-cpu storage.
...@@ -117,16 +109,6 @@ static inline void smp_send_reschedule(int cpu) { } ...@@ -117,16 +109,6 @@ static inline void smp_send_reschedule(int cpu) { }
#define cpu_possible(cpu) ({ BUG_ON((cpu) != 0); 1; }) #define cpu_possible(cpu) ({ BUG_ON((cpu) != 0); 1; })
#define smp_prepare_boot_cpu() do {} while (0) #define smp_prepare_boot_cpu() do {} while (0)
struct notifier_block;
/* Need to know about CPUs going up/down? */
static inline int register_cpu_notifier(struct notifier_block *nb)
{
return 0;
}
static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}
#endif /* !SMP */ #endif /* !SMP */
#define get_cpu() ({ preempt_disable(); smp_processor_id(); }) #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/cpu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/bugs.h> #include <asm/bugs.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/cpu.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
/* This protects CPUs going up and down... */ /* This protects CPUs going up and down... */
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/cpu.h>
/* Definition for rcupdate control block. */ /* Definition for rcupdate control block. */
struct rcu_ctrlblk rcu_ctrlblk = struct rcu_ctrlblk rcu_ctrlblk =
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/cpu.h>
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
#define cpu_to_node_mask(cpu) node_to_cpumask(cpu_to_node(cpu)) #define cpu_to_node_mask(cpu) node_to_cpumask(cpu_to_node(cpu))
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/cpu.h>
/* /*
- No shared variables, all the data are CPU local. - No shared variables, all the data are CPU local.
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/thread_info.h> #include <linux/thread_info.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/cpu.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/div64.h> #include <asm/div64.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/cpu.h>
/* /*
* The maximum number of pages to writeout in a single bdflush/kupdate * The maximum number of pages to writeout in a single bdflush/kupdate
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/topology.h> #include <linux/topology.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/cpu.h>
DECLARE_BITMAP(node_online_map, MAX_NUMNODES); DECLARE_BITMAP(node_online_map, MAX_NUMNODES);
DECLARE_BITMAP(memblk_online_map, MAX_NR_MEMBLKS); DECLARE_BITMAP(memblk_online_map, MAX_NR_MEMBLKS);
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/cpu.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment