Home » Mailing list archives » git-commits-head » 2010 » February » 28

powerpc: Reduce differences between pseries and ppc64 defconfigs

Previous thread: powerpc: Make powerpc_firmware_features __read_mostly by Linux Kernel Mailing List on Saturday, February 27, 2010 - 5:59 pm. (1 message)

Next thread: powerpc: Clear MSR_RI during RTAS calls by Linux Kernel Mailing List on Saturday, February 27, 2010 - 5:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: powerpc: Reduce differences between pseries and ppc64 defconfigs
Date: Saturday, February 27, 2010 - 5:59 pm

Gitweb:     http://git.kernel.org/linus/b926a88a7b77bc27c0e7f67166f34b854fe21ccc
Commit:     b926a88a7b77bc27c0e7f67166f34b854fe21ccc
Parent:     20a8ab97372e453f58a7b49e0d5e0f832406cffe
Author:     Anton Blanchard <anton@samba.org>
AuthorDate: Sun Feb 7 12:26:28 2010 +0000
Committer:  Benjamin Herrenschmidt <benh@kernel.crashing.org>
CommitDate: Tue Feb 9 13:56:06 2010 +1100

    powerpc: Reduce differences between pseries and ppc64 defconfigs
    
    The pseries and ppc64 defconfigs have drifted apart over the years. Reduce
    some of the differences while still keeping the idea that the ppc64 defconfig
    is cross platform but enables fewer features than pseries, eg NR_CPUS is
    lower.
    
    Also enable a number of common adapters as modules.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/configs/ppc64_defconfig   |   75 +++++++++++++++++++-------------
 arch/powerpc/configs/pseries_defconfig |   63 +++++++++++++++------------
 2 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 7b3804a..b5b2599 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -137,8 +137,9 @@ CONFIG_TRACEPOINTS=y
 CONFIG_MARKERS=y
 CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -191,6 +192,7 @@ CONFIG_SCANLOG=m
 CONFIG_LPARCFG=y
 CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
+CONFIG_DTL=y
 CONFIG_PPC_ISERIES=y
 
 #
@@ -328,9 +330,10 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_KEXEC=y
 # CONFIG_PHYP_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=8
+CONFIG_MAX_ACTIVE_REGIONS=256
 ...
[ message continues ]
Previous thread: powerpc: Make powerpc_firmware_features __read_mostly by Linux Kernel Mailing List on Saturday, February 27, 2010 - 5:59 pm. (1 message)

Next thread: powerpc: Clear MSR_RI during RTAS calls by Linux Kernel Mailing List on Saturday, February 27, 2010 - 5:59 pm. (1 message)