From 02b0cf7f207a841c0672bfe13f93325f63b42a29 Mon Sep 17 00:00:00 2001 From: Ziyan Date: Wed, 27 Jan 2016 13:49:23 +0100 Subject: defconfigs: disable zcache Change-Id: I0b793c06bb6a68ed3045d76cfc5239d0eaa71d60 --- arch/arm/configs/cyanogenmod_tuna_defconfig | 5 ++--- arch/arm/configs/tuna_defconfig | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/configs/cyanogenmod_tuna_defconfig b/arch/arm/configs/cyanogenmod_tuna_defconfig index d2be7eada93..26294e187b8 100644 --- a/arch/arm/configs/cyanogenmod_tuna_defconfig +++ b/arch/arm/configs/cyanogenmod_tuna_defconfig @@ -461,7 +461,7 @@ CONFIG_VIRT_TO_BUS=y CONFIG_KSM=y CONFIG_KSM_CHECK_PAGE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_CLEANCACHE=y +# CONFIG_CLEANCACHE is not set CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -479,7 +479,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y # CONFIG_USE_OF is not set CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 zcache=lz4 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend" +CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set CONFIG_CMDLINE_EXTEND=y # CONFIG_CMDLINE_FORCE is not set @@ -2350,7 +2350,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y # CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6656 is not set # CONFIG_IIO is not set -CONFIG_ZCACHE=y # CONFIG_FB_SM7XX is not set CONFIG_MACH_NO_WESTBRIDGE=y # CONFIG_ATH6K_LEGACY is not set diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig index a722bc6b62c..3e59cd179c3 100644 --- a/arch/arm/configs/tuna_defconfig +++ b/arch/arm/configs/tuna_defconfig @@ -461,7 +461,7 @@ CONFIG_VIRT_TO_BUS=y CONFIG_KSM=y CONFIG_KSM_CHECK_PAGE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_CLEANCACHE=y +# CONFIG_CLEANCACHE is not set CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -479,7 +479,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y # CONFIG_USE_OF is not set CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 zcache=lz4 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend" +CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set CONFIG_CMDLINE_EXTEND=y # CONFIG_CMDLINE_FORCE is not set @@ -2350,7 +2350,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y # CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6656 is not set # CONFIG_IIO is not set -CONFIG_ZCACHE=y # CONFIG_FB_SM7XX is not set CONFIG_MACH_NO_WESTBRIDGE=y # CONFIG_ATH6K_LEGACY is not set -- cgit v1.2.3