From b157ddfd3a28f6e6b2dca4acfc8fcbd0ad684489 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Wed, 3 Jun 2015 06:28:50 +0200 Subject: [PATCH] Update defconfigs --- arch/arm/configs/ancora_defconfig | 21 ++++++++------------- arch/arm/configs/ancora_tmo_defconfig | 21 ++++++++------------- arch/arm/configs/apache_defconfig | 21 ++++++++------------- arch/arm/configs/ariesve_defconfig | 18 ++++++++---------- 4 files changed, 32 insertions(+), 49 deletions(-) diff --git a/arch/arm/configs/ancora_defconfig b/arch/arm/configs/ancora_defconfig index 38d82530b2f..8596b32e6ab 100644 --- a/arch/arm/configs/ancora_defconfig +++ b/arch/arm/configs/ancora_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.105 Kernel Configuration +# Linux/arm 3.4.107 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -591,19 +591,18 @@ CONFIG_SCHED_HRTICK=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_HW_PERF_EVENTS=y CONFIG_VMALLOC_RESERVE=0x08000000 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -620,8 +619,6 @@ CONFIG_ZSMALLOC=y # CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_ARCH_MEMORY_REMOVE is not set # CONFIG_ENABLE_DMM is not set -# CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0 is not set -CONFIG_HOLES_IN_ZONE=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -1233,13 +1230,11 @@ CONFIG_PMIC8XXX_UPL=y # CONFIG_QFP_FUSE is not set # CONFIG_BU52031NVX is not set CONFIG_SAMSUNG_JACK=y +CONFIG_SAMSUNG_VIBRATOR=y CONFIG_SAMSUNG_FM_SI4709=y # CONFIG_GENERIC_BLN is not set # CONFIG_C2PORT is not set -# Samsung Vibrator -CONFIG_SAMSUNG_VIBRATOR=y - # # EEPROM support # diff --git a/arch/arm/configs/ancora_tmo_defconfig b/arch/arm/configs/ancora_tmo_defconfig index 625b32f1ccb..915f9fe43ce 100644 --- a/arch/arm/configs/ancora_tmo_defconfig +++ b/arch/arm/configs/ancora_tmo_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.105 Kernel Configuration +# Linux/arm 3.4.107 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -591,19 +591,18 @@ CONFIG_SCHED_HRTICK=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_HW_PERF_EVENTS=y CONFIG_VMALLOC_RESERVE=0x08000000 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -620,8 +619,6 @@ CONFIG_ZSMALLOC=y # CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_ARCH_MEMORY_REMOVE is not set # CONFIG_ENABLE_DMM is not set -# CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0 is not set -CONFIG_HOLES_IN_ZONE=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -1233,13 +1230,11 @@ CONFIG_PMIC8XXX_UPL=y # CONFIG_QFP_FUSE is not set # CONFIG_BU52031NVX is not set CONFIG_SAMSUNG_JACK=y +CONFIG_SAMSUNG_VIBRATOR=y CONFIG_SAMSUNG_FM_SI4709=y # CONFIG_GENERIC_BLN is not set # CONFIG_C2PORT is not set -# Samsung Vibrator -CONFIG_SAMSUNG_VIBRATOR=y - # # EEPROM support # diff --git a/arch/arm/configs/apache_defconfig b/arch/arm/configs/apache_defconfig index 5856a9eb596..676eee84e75 100644 --- a/arch/arm/configs/apache_defconfig +++ b/arch/arm/configs/apache_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.105 Kernel Configuration +# Linux/arm 3.4.107 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -591,19 +591,18 @@ CONFIG_SCHED_HRTICK=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_HW_PERF_EVENTS=y CONFIG_VMALLOC_RESERVE=0x08000000 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -620,8 +619,6 @@ CONFIG_ZSMALLOC=y # CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_ARCH_MEMORY_REMOVE is not set # CONFIG_ENABLE_DMM is not set -# CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0 is not set -CONFIG_HOLES_IN_ZONE=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -1233,13 +1230,11 @@ CONFIG_PMIC8XXX_UPL=y # CONFIG_QFP_FUSE is not set # CONFIG_BU52031NVX is not set CONFIG_SAMSUNG_JACK=y +CONFIG_SAMSUNG_VIBRATOR=y # CONFIG_SAMSUNG_FM_SI4709 is not set # CONFIG_GENERIC_BLN is not set # CONFIG_C2PORT is not set -# Samsung Vibrator -CONFIG_SAMSUNG_VIBRATOR=y - # # EEPROM support # diff --git a/arch/arm/configs/ariesve_defconfig b/arch/arm/configs/ariesve_defconfig index df83cf20142..3bd828b243b 100644 --- a/arch/arm/configs/ariesve_defconfig +++ b/arch/arm/configs/ariesve_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.105 Kernel Configuration +# Linux/arm 3.4.107 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -590,19 +590,18 @@ CONFIG_SCHED_HRTICK=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_HW_PERF_EVENTS=y CONFIG_VMALLOC_RESERVE=0x08000000 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -619,8 +618,6 @@ CONFIG_ZSMALLOC=y # CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_ARCH_MEMORY_REMOVE is not set # CONFIG_ENABLE_DMM is not set -# CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0 is not set -CONFIG_HOLES_IN_ZONE=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -1232,6 +1229,7 @@ CONFIG_PMIC8XXX_UPL=y # CONFIG_QFP_FUSE is not set # CONFIG_BU52031NVX is not set CONFIG_SAMSUNG_JACK=y +# CONFIG_SAMSUNG_VIBRATOR is not set CONFIG_SAMSUNG_FM_SI4709=y CONFIG_GENERIC_BLN=y CONFIG_PHANTOM_KP_FILTER=y