diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 17:05:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 17:05:19 (GMT) |
| commit | 028011e1391eab27e7bc113c2ac08d4f55584a75 (patch) | |
| tree | 679c03b4cd668f07901b2ebafcaf5de7ab7cbe14 /include | |
| parent | 37bff62e98f675777e1e76173fe320f04062841d (diff) | |
| parent | 22e52b072dd87faa9b2559fe89d4e8f2370f81ca (diff) | |
| download | linux-028011e1391eab27e7bc113c2ac08d4f55584a75.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:
sched: add arch_update_cpu_topology hook.
sched: add exported arch_reinit_sched_domains() to header file.
sched: remove double unlikely from schedule()
sched: cleanup old and rarely used 'debug' features.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | include/linux/topology.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3625fca..fed07d0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -790,6 +790,7 @@ struct sched_domain { }; extern void partition_sched_domains(int ndoms_new, cpumask_t *doms_new); +extern int arch_reinit_sched_domains(void); #endif /* CONFIG_SMP */ diff --git a/include/linux/topology.h b/include/linux/topology.h index 2d8dac8..bd14f8b 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -50,6 +50,8 @@ for_each_online_node(node) \ if (nr_cpus_node(node)) +void arch_update_cpu_topology(void); + /* Conform to ACPI 2.0 SLIT distance definitions */ #define LOCAL_DISTANCE 10 #define REMOTE_DISTANCE 20 |