diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 12:25:51 +0100 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 12:25:51 +0100 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /arch/mips | |
| parent | cpumask: Use all NR_CPUS bits unless CONFIG_CPUMASK_OFFSTACK (diff) | |
| parent | Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096 (diff) | |
| download | linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.xz linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.zip | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/topology.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f4af967a6b30..a5255e7c79e0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -653,7 +653,7 @@ config GENERIC_CMOS_UPDATE bool default y -config SCHED_NO_NO_OMIT_FRAME_POINTER +config SCHED_OMIT_FRAME_POINTER bool default y diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h index 7785bec732f2..1fb959f98982 100644 --- a/arch/mips/include/asm/mach-ip27/topology.h +++ b/arch/mips/include/asm/mach-ip27/topology.h @@ -37,7 +37,6 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; /* sched_domains SD_NODE_INIT for SGI IP27 machines */ #define SD_NODE_INIT (struct sched_domain) { \ - .span = CPU_MASK_NONE, \ .parent = NULL, \ .child = NULL, \ .groups = NULL, \ |