[opensuse-kernel] Re: [PATCH] config: armv7hl: sync vanilla with default

Am 04.10.2015 um 18:34 schrieb Matwey V. Kornilov:

Let vanilla follow changes made in default

Signed-off-by: Matwey V. Kornilov --- config/armv7hl/vanilla | 69 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla index 9e159b1..51e1933 100644 --- a/config/armv7hl/vanilla +++ b/config/armv7hl/vanilla @@ -28,6 +28,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_GENERIC_BUG=y CONFIG_PGTABLE_LEVELS=2 CONFIG_SUSE_KERNEL=y +# CONFIG_SUSE_KERNEL_SUPPORTED is not set

As a reminder, for vanilla configs you need to use --vanilla. That should obsolete this hunk.

CONFIG_SPLIT_PACKAGE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y @@ -108,7 +109,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # -CONFIG_TREE_RCU=y +CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y # CONFIG_TASKS_RCU is not set @@ -212,7 +213,6 @@ CONFIG_HAVE_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y @@ -314,11 +314,7 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -771,9 +767,10 @@ CONFIG_NR_CPUS=16 CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y CONFIG_ARCH_NR_GPIO=1024 -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y CONFIG_HZ_FIXED=200 CONFIG_HZ=200 CONFIG_SCHED_HRTICK=y @@ -1111,6 +1108,7 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CONNTRACK_SLP=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m @@ -2755,6 +2753,8 @@ CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPSW_ALE=m CONFIG_TI_CPSW=m # CONFIG_TI_CPTS is not set +CONFIG_TI_KEYSTONE_NETCP=m +CONFIG_TI_KEYSTONE_NETCP_ETHSS=m # CONFIG_TLAN is not set CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m @@ -3522,6 +3522,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=2 CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_SH_SCI_DMA=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_CONSOLE_POLL=y @@ -3597,6 +3598,7 @@ CONFIG_TCG_TIS_ST33ZP24=m CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m CONFIG_DEVPORT=y +CONFIG_CRASHER=m CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_PCIE is not set CONFIG_XILLYBUS_OF=m @@ -3744,6 +3746,7 @@ CONFIG_SPI_S3C64XX=m # CONFIG_SPI_SC18IS602 is not set CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=m +CONFIG_SPI_SIRF=m CONFIG_SPI_ST_SSC4=m CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m @@ -3864,7 +3867,7 @@ CONFIG_PINCTRL_IPQ8064=m CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MSM8X74=m -# CONFIG_PINCTRL_MSM8916 is not set +CONFIG_PINCTRL_MSM8916=m

This one is wrong (arm64), seems I didn't fix it consistently.

CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m CONFIG_PINCTRL_SAMSUNG=y [snip]

Otherwise some nice catches, in particular the DMA stuff. I'll squash the preempt change into the other patch. Regards, Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org