[1/3] powerpc: sync ppc64, ppc64e and pseries configs

Run savedefconfig over the ppc64, ppc64e and pseries config

Signed-off-by: Anton Blanchard <anton@samba.org>
---

On 10/21/2013 07:44 PM, Anton Blanchard wrote:
> 
> Run savedefconfig over the ppc64, ppc64e and pseries config
> 
> Signed-off-by: Anton Blanchard <anton@samba.org>
> ---
> 
> Index: b/arch/powerpc/configs/ppc64_defconfig
> ===================================================================
> --- a/arch/powerpc/configs/ppc64_defconfig
> +++ b/arch/powerpc/configs/ppc64_defconfig
> @@ -2,7 +2,6 @@ CONFIG_PPC64=y
>  CONFIG_ALTIVEC=y
>  CONFIG_VSX=y
>  CONFIG_SMP=y
> -CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
>  CONFIG_POSIX_MQUEUE=y
>  CONFIG_IRQ_DOMAIN_DEBUG=y
> @@ -25,7 +24,6 @@ CONFIG_MODULE_UNLOAD=y
>  CONFIG_MODVERSIONS=y
>  CONFIG_MODULE_SRCVERSION_ALL=y
>  CONFIG_PARTITION_ADVANCED=y
> -CONFIG_EFI_PARTITION=y
>  CONFIG_PPC_SPLPAR=y
>  CONFIG_SCANLOG=m
>  CONFIG_PPC_SMLPAR=y
> @@ -50,12 +48,10 @@ CONFIG_CPU_FREQ_PMAC64=y
>  CONFIG_HZ_100=y
>  CONFIG_BINFMT_MISC=m
>  CONFIG_PPC_TRANSACTIONAL_MEM=y
> -CONFIG_HOTPLUG_CPU=y

It looks like your disabling hotplug cpu, is that correct?

You did this for all three config files.

-Nathan

>  CONFIG_KEXEC=y
>  CONFIG_IRQ_ALL_CPUS=y
>  CONFIG_MEMORY_HOTREMOVE=y
>  CONFIG_SCHED_SMT=y
> -CONFIG_PPC_DENORMALISATION=y
>  CONFIG_PCCARD=y
>  CONFIG_ELECTRA_CF=y
>  CONFIG_HOTPLUG_PCI=y
> @@ -89,7 +85,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
>  CONFIG_NF_CONNTRACK_SIP=m
>  CONFIG_NF_CONNTRACK_TFTP=m
>  CONFIG_NF_CT_NETLINK=m
> -CONFIG_NETFILTER_TPROXY=m
>  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
>  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
>  CONFIG_NETFILTER_XT_TARGET_DSCP=m
> @@ -131,7 +126,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
>  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
>  CONFIG_NETFILTER_XT_MATCH_U32=m
>  CONFIG_NF_CONNTRACK_IPV4=m
> -CONFIG_IP_NF_QUEUE=m
>  CONFIG_IP_NF_IPTABLES=m
>  CONFIG_IP_NF_MATCH_AH=m
>  CONFIG_IP_NF_MATCH_ECN=m
> @@ -216,6 +210,7 @@ CONFIG_DUMMY=m
>  CONFIG_NETCONSOLE=y
>  CONFIG_NETPOLL_TRAP=y
>  CONFIG_TUN=m
> +CONFIG_VHOST_NET=m
>  CONFIG_VORTEX=y
>  CONFIG_ACENIC=m
>  CONFIG_ACENIC_OMIT_TIGON_I=y
> @@ -301,7 +296,6 @@ CONFIG_HID_GYRATION=y
>  CONFIG_HID_PANTHERLORD=y
>  CONFIG_HID_PETALYNX=y
>  CONFIG_HID_SAMSUNG=y
> -CONFIG_HID_SONY=y
>  CONFIG_HID_SUNPLUS=y
>  CONFIG_USB_HIDDEV=y
>  CONFIG_USB=y
> @@ -386,21 +380,19 @@ CONFIG_NLS_UTF8=y
>  CONFIG_CRC_T10DIF=y
>  CONFIG_MAGIC_SYSRQ=y
>  CONFIG_DEBUG_KERNEL=y
> +CONFIG_DEBUG_STACK_USAGE=y
> +CONFIG_DEBUG_STACKOVERFLOW=y
>  CONFIG_LOCKUP_DETECTOR=y
>  CONFIG_DEBUG_MUTEXES=y
> -CONFIG_DEBUG_STACK_USAGE=y
>  CONFIG_LATENCYTOP=y
>  CONFIG_SCHED_TRACER=y
>  CONFIG_BLK_DEV_IO_TRACE=y
> -CONFIG_DEBUG_STACKOVERFLOW=y
>  CONFIG_CODE_PATCHING_SELFTEST=y
>  CONFIG_FTR_FIXUP_SELFTEST=y
>  CONFIG_MSI_BITMAP_SELFTEST=y
>  CONFIG_XMON=y
>  CONFIG_BOOTX_TEXT=y
>  CONFIG_PPC_EARLY_DEBUG=y
> -CONFIG_PPC_EARLY_DEBUG_BOOTX=y
> -CONFIG_CRYPTO_NULL=m
>  CONFIG_CRYPTO_TEST=m
>  CONFIG_CRYPTO_PCBC=m
>  CONFIG_CRYPTO_HMAC=y
> @@ -422,4 +414,3 @@ CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
>  CONFIG_VIRTUALIZATION=y
>  CONFIG_KVM_BOOK3S_64=m
>  CONFIG_KVM_BOOK3S_64_HV=y
> -CONFIG_VHOST_NET=m
> Index: b/arch/powerpc/configs/ppc64e_defconfig
> ===================================================================
> --- a/arch/powerpc/configs/ppc64e_defconfig
> +++ b/arch/powerpc/configs/ppc64e_defconfig
> @@ -1,7 +1,6 @@
>  CONFIG_PPC64=y
>  CONFIG_PPC_BOOK3E_64=y
>  CONFIG_SMP=y
> -CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
>  CONFIG_POSIX_MQUEUE=y
>  CONFIG_NO_HZ=y
> @@ -22,7 +21,6 @@ CONFIG_MODVERSIONS=y
>  CONFIG_MODULE_SRCVERSION_ALL=y
>  CONFIG_PARTITION_ADVANCED=y
>  CONFIG_MAC_PARTITION=y
> -CONFIG_EFI_PARTITION=y
>  CONFIG_P5020_DS=y
>  CONFIG_CPU_FREQ=y
>  CONFIG_CPU_FREQ_GOV_POWERSAVE=y
> @@ -61,7 +59,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
>  CONFIG_NF_CONNTRACK_SIP=m
>  CONFIG_NF_CONNTRACK_TFTP=m
>  CONFIG_NF_CT_NETLINK=m
> -CONFIG_NETFILTER_TPROXY=m
>  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
>  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
>  CONFIG_NETFILTER_XT_TARGET_DSCP=m
> @@ -103,7 +100,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
>  CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
>  CONFIG_NETFILTER_XT_MATCH_U32=m
>  CONFIG_NF_CONNTRACK_IPV4=m
> -CONFIG_IP_NF_QUEUE=m
>  CONFIG_IP_NF_IPTABLES=m
>  CONFIG_IP_NF_MATCH_AH=m
>  CONFIG_IP_NF_MATCH_ECN=m
> @@ -193,7 +189,6 @@ CONFIG_PPP_SYNC_TTY=m
>  CONFIG_INPUT_EVDEV=m
>  CONFIG_INPUT_MISC=y
>  # CONFIG_SERIO_SERPORT is not set
> -CONFIG_VT_HW_CONSOLE_BINDING=y
>  CONFIG_SERIAL_8250=y
>  CONFIG_SERIAL_8250_CONSOLE=y
>  # CONFIG_HW_RANDOM is not set
> @@ -230,7 +225,6 @@ CONFIG_HID_NTRIG=y
>  CONFIG_HID_PANTHERLORD=y
>  CONFIG_HID_PETALYNX=y
>  CONFIG_HID_SAMSUNG=y
> -CONFIG_HID_SONY=y
>  CONFIG_HID_SUNPLUS=y
>  CONFIG_HID_GREENASIA=y
>  CONFIG_HID_SMARTJOYPLUS=y
> @@ -302,19 +296,18 @@ CONFIG_NLS_UTF8=y
>  CONFIG_CRC_T10DIF=y
>  CONFIG_MAGIC_SYSRQ=y
>  CONFIG_DEBUG_KERNEL=y
> +CONFIG_DEBUG_STACK_USAGE=y
> +CONFIG_DEBUG_STACKOVERFLOW=y
>  CONFIG_DETECT_HUNG_TASK=y
>  CONFIG_DEBUG_MUTEXES=y
> -CONFIG_DEBUG_STACK_USAGE=y
>  CONFIG_LATENCYTOP=y
>  CONFIG_IRQSOFF_TRACER=y
>  CONFIG_SCHED_TRACER=y
>  CONFIG_BLK_DEV_IO_TRACE=y
> -CONFIG_DEBUG_STACKOVERFLOW=y
>  CONFIG_CODE_PATCHING_SELFTEST=y
>  CONFIG_FTR_FIXUP_SELFTEST=y
>  CONFIG_MSI_BITMAP_SELFTEST=y
>  CONFIG_XMON=y
> -CONFIG_CRYPTO_NULL=m
>  CONFIG_CRYPTO_TEST=m
>  CONFIG_CRYPTO_CCM=m
>  CONFIG_CRYPTO_GCM=m
> Index: b/arch/powerpc/configs/pseries_defconfig
> ===================================================================
> --- a/arch/powerpc/configs/pseries_defconfig
> +++ b/arch/powerpc/configs/pseries_defconfig
> @@ -3,7 +3,6 @@ CONFIG_ALTIVEC=y
>  CONFIG_VSX=y
>  CONFIG_SMP=y
>  CONFIG_NR_CPUS=2048
> -CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
>  CONFIG_POSIX_MQUEUE=y
>  CONFIG_AUDIT=y
> @@ -33,7 +32,6 @@ CONFIG_MODULE_UNLOAD=y
>  CONFIG_MODVERSIONS=y
>  CONFIG_MODULE_SRCVERSION_ALL=y
>  CONFIG_PARTITION_ADVANCED=y
> -CONFIG_EFI_PARTITION=y
>  CONFIG_PPC_SPLPAR=y
>  CONFIG_SCANLOG=m
>  CONFIG_PPC_SMLPAR=y
> @@ -44,7 +42,6 @@ CONFIG_IBMEBUS=y
>  CONFIG_HZ_100=y
>  CONFIG_BINFMT_MISC=m
>  CONFIG_PPC_TRANSACTIONAL_MEM=y
> -CONFIG_HOTPLUG_CPU=y
>  CONFIG_KEXEC=y
>  CONFIG_IRQ_ALL_CPUS=y
>  CONFIG_MEMORY_HOTPLUG=y
> @@ -52,7 +49,6 @@ CONFIG_MEMORY_HOTREMOVE=y
>  CONFIG_PPC_64K_PAGES=y
>  CONFIG_PPC_SUBPAGE_PROT=y
>  CONFIG_SCHED_SMT=y
> -CONFIG_PPC_DENORMALISATION=y
>  CONFIG_HOTPLUG_PCI=y
>  CONFIG_HOTPLUG_PCI_RPA=m
>  CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
> @@ -113,7 +109,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
>  CONFIG_NETFILTER_XT_MATCH_TIME=m
>  CONFIG_NETFILTER_XT_MATCH_U32=m
>  CONFIG_NF_CONNTRACK_IPV4=m
> -CONFIG_IP_NF_QUEUE=m
>  CONFIG_IP_NF_IPTABLES=m
>  CONFIG_IP_NF_MATCH_AH=m
>  CONFIG_IP_NF_MATCH_ECN=m
> @@ -179,6 +174,7 @@ CONFIG_DUMMY=m
>  CONFIG_NETCONSOLE=y
>  CONFIG_NETPOLL_TRAP=y
>  CONFIG_TUN=m
> +CONFIG_VHOST_NET=m
>  CONFIG_VORTEX=y
>  CONFIG_ACENIC=m
>  CONFIG_ACENIC_OMIT_TIGON_I=y
> @@ -237,7 +233,6 @@ CONFIG_HID_GYRATION=y
>  CONFIG_HID_PANTHERLORD=y
>  CONFIG_HID_PETALYNX=y
>  CONFIG_HID_SAMSUNG=y
> -CONFIG_HID_SONY=y
>  CONFIG_HID_SUNPLUS=y
>  CONFIG_USB_HIDDEV=y
>  CONFIG_USB=y
> @@ -314,18 +309,17 @@ CONFIG_NLS_UTF8=y
>  CONFIG_CRC_T10DIF=y
>  CONFIG_MAGIC_SYSRQ=y
>  CONFIG_DEBUG_KERNEL=y
> -CONFIG_LOCKUP_DETECTOR=y
>  CONFIG_DEBUG_STACK_USAGE=y
> +CONFIG_DEBUG_STACKOVERFLOW=y
> +CONFIG_LOCKUP_DETECTOR=y
>  CONFIG_LATENCYTOP=y
>  CONFIG_SCHED_TRACER=y
>  CONFIG_BLK_DEV_IO_TRACE=y
> -CONFIG_DEBUG_STACKOVERFLOW=y
>  CONFIG_CODE_PATCHING_SELFTEST=y
>  CONFIG_FTR_FIXUP_SELFTEST=y
>  CONFIG_MSI_BITMAP_SELFTEST=y
>  CONFIG_XMON=y
>  CONFIG_XMON_DEFAULT=y
> -CONFIG_CRYPTO_NULL=m
>  CONFIG_CRYPTO_TEST=m
>  CONFIG_CRYPTO_PCBC=m
>  CONFIG_CRYPTO_HMAC=y
> @@ -347,4 +341,3 @@ CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
>  CONFIG_VIRTUALIZATION=y
>  CONFIG_KVM_BOOK3S_64=m
>  CONFIG_KVM_BOOK3S_64_HV=y
> -CONFIG_VHOST_NET=m
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>

On Tue, Oct 22, 2013 at 11:44:50AM +1100, Anton Blanchard wrote:
> 
> Run savedefconfig over the ppc64, ppc64e and pseries config

> -CONFIG_EXPERIMENTAL=y

This went way.

> -CONFIG_EFI_PARTITION=y

This became default y.

> -CONFIG_HOTPLUG_CPU=y

This isn't going away, it's selected by pseries, so doesn't need to be
in the defconfig.

> -CONFIG_PPC_DENORMALISATION=y

This is default y if POWERNV, so I guess that's why it isn't needed.

cheers