From 5c9eb2fe39323ead910286bd7ad8ef87189c192f Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 12 Jan 2011 02:14:32 +0000 Subject: [PATCH] --- yaml --- r: 232068 b: refs/heads/master c: ef4f7c2d075d09ed833dc086e07a0d1eee488168 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/configs/pseries_defconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d553f1690193..a691083d63e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d2dcd046d259d309b4e0da387a53660a8f146ad +refs/heads/master: ef4f7c2d075d09ed833dc086e07a0d1eee488168 diff --git a/trunk/arch/powerpc/configs/pseries_defconfig b/trunk/arch/powerpc/configs/pseries_defconfig index e30286c266fa..0a4e13d090d7 100644 --- a/trunk/arch/powerpc/configs/pseries_defconfig +++ b/trunk/arch/powerpc/configs/pseries_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC64=y CONFIG_ALTIVEC=y CONFIG_VSX=y CONFIG_SMP=y -CONFIG_NR_CPUS=128 +CONFIG_NR_CPUS=1024 CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -45,6 +45,8 @@ CONFIG_KEXEC=y CONFIG_IRQ_ALL_CPUS=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PPC_64K_PAGES=y +CONFIG_PPC_SUBPAGE_PROT=y CONFIG_SCHED_SMT=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_RPA=m