diff options
| author | Andy Grover <agrover@groveronline.com> | 2003-01-16 00:31:40 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@groveronline.com> | 2003-01-16 00:31:40 -0800 |
| commit | 0e4bddb41a7d50b55de0aac0a2ae8d0978fadc30 (patch) | |
| tree | d1088e8261463812fb018eb0c3b8d74bf43a8596 /include/linux | |
| parent | 6a22c4e0103072e25fa27afa2d70031e443fa609 (diff) | |
| parent | 63ffe4d6a6977a0b94ae065447c372623bfa5800 (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/module.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index eb5540bd3119..6dad1479105f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -437,7 +437,6 @@ static inline void __deprecated _MOD_INC_USE_COUNT(struct module *module) #endif } #define EXPORT_NO_SYMBOLS -#define MOD_IN_USE 0 #define __MODULE_STRING(x) __stringify(x) /* diff --git a/include/linux/sched.h b/include/linux/sched.h index 931cdf559eb2..15a951d2d27e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -447,6 +447,14 @@ extern void set_cpus_allowed(task_t *p, unsigned long new_mask); # define set_cpus_allowed(p, new_mask) do { } while (0) #endif +#ifdef CONFIG_NUMA +extern void sched_balance_exec(void); +extern void node_nr_running_init(void); +#else +#define sched_balance_exec() {} +#define node_nr_running_init() {} +#endif + extern void set_user_nice(task_t *p, long nice); extern int task_prio(task_t *p); extern int task_nice(task_t *p); |