diff options
| author | Ingo Molnar | 2009-01-21 10:14:17 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-01-21 10:14:17 +0100 |
| commit | 3eb3963fd1974c63e9bb3cfe774abc3e1995e479 (patch) | |
| tree | c00d6c2e8484793ab6bd0644db59bbdf5e9429c5 /arch/ia64 | |
| parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/... (diff) | |
| parent | x86, cpumask: fix tlb flush race (diff) | |
| download | kernel-qcow2-linux-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.tar.gz kernel-qcow2-linux-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.tar.xz kernel-qcow2-linux-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.zip | |
Merge branch 'cpus4096' into core/percpu
Conflicts:
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/tlb_32.c
Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 32f3af1641c5..3193f4417e16 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h @@ -84,7 +84,7 @@ void build_cpu_to_node_map(void); .child = NULL, \ .groups = NULL, \ .min_interval = 8, \ - .max_interval = 8*(min(num_online_cpus(), 32)), \ + .max_interval = 8*(min(num_online_cpus(), 32U)), \ .busy_factor = 64, \ .imbalance_pct = 125, \ .cache_nice_tries = 2, \ |