add lz4 support, 3.4.112 patch, HZ changed to 300

Makefile

@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 4
-SUBLEVEL = 111
+SUBLEVEL = 112
 EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 
@@ -243,8 +243,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
 	  else echo sh; fi ; fi)
 
-HOSTCC       = gcc
-HOSTCXX      = g++
+HOSTCC       = ccache gcc
+HOSTCXX      = ccache g++
 HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
 HOSTCXXFLAGS = -O2
 
@@ -330,7 +330,7 @@ include $(srctree)/scripts/Kbuild.include
 
 AS		= $(CROSS_COMPILE)as
 LD		= $(CROSS_COMPILE)ld
-REAL_CC		= $(CROSS_COMPILE)gcc
+REAL_CC		= ccache $(CROSS_COMPILE)gcc
 CPP		= $(CC) -E
 AR		= $(CROSS_COMPILE)ar
 NM		= $(CROSS_COMPILE)nm
@@ -377,6 +377,8 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common \
 		   -Werror-implicit-function-declaration \
 		   -Wno-format-security \
+		   -Wno-discarded-array-qualifiers \
+		   -Wno-switch-bool \
                    -mtune=cortex-a15 \
                    --param l1-cache-size=32 \
                    --param l2-cache-size=2048 \

VERSION

@@ -1 +1 @@
-7.1.0
+7.2.0

arch/arm/Kconfig

@@ -816,9 +816,7 @@ config ARCH_NR_GPIO
 
 source kernel/Kconfig.preempt
 
-config HZ
-	int
-	default 100
+source kernel/Kconfig.hz
 
 config THUMB2_KERNEL
 	bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"

arch/arm/Makefile

@@ -53,6 +53,14 @@ endif
 
 comma = ,
 
+#
+# The Scalar Replacement of Aggregates (SRA) optimization pass in GCC 4.9 and
+# later may result in code being generated that handles signed short and signed
+# char struct members incorrectly. So disable it.
+# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65932)
+#
+KBUILD_CFLAGS	+= $(call cc-option,-fno-ipa-sra)
+
 arch-$(CONFIG_ARCH_MSM_KRAIT) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-mcpu=cortex-a15,-march=armv7-a)
 
 ifeq ($(CONFIG_AEABI),y)

arch/arm/boot/dts/msm8974/msm8974-gpu.dtsi

@@ -24,7 +24,7 @@
 
 		qcom,initial-pwrlevel = <1>;
 
-		qcom,idle-timeout = <8>; //<HZ/12>
+		qcom,idle-timeout = <80>; //msec
 		qcom,strtstp-sleepwake;
 		qcom,clk-map = <0x0000006>; //KGSL_CLK_CORE | KGSL_CLK_IFACE
 

arch/arm/configs/ik_defconfig

@@ -47,6 +47,7 @@ CONFIG_LOCALVERSION="-idleKernel-hlte-"
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
@@ -574,7 +575,11 @@ CONFIG_ARCH_NR_GPIO=0
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
-CONFIG_HZ=100
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -602,13 +607,16 @@ CONFIG_KSM=y
 CONFIG_UKSM=y
 # CONFIG_KSM_LEGACY is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
+CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_ZSMALLOC_NEW=y
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_ZSWAP=y
 # CONFIG_SWAP_ENABLE_READAHEAD is not set
 # CONFIG_ZSWAP_ENABLE_WRITEBACK is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_ZCACHE=y
 CONFIG_DIRECT_RECLAIM_FILE_PAGES_ONLY=y
 CONFIG_INCREASE_MAXIMUM_SWAPPINESS=y
 CONFIG_FIX_INACTIVE_RATIO=y
@@ -1244,6 +1252,8 @@ CONFIG_OF_BATTERYDATA=y
 CONFIG_OF_SUBCMDLINE_PARSE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -1718,6 +1728,7 @@ CONFIG_INPUT_WACOM=y
 # CONFIG_TOUCHSCREEN_FTS is not set
 # CONFIG_TOUCHSCREEN_FTS_S is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_JSGLTE is not set
+CONFIG_STATE_NOTIFIER=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -3677,7 +3688,7 @@ CONFIG_SEC_FPGA=y
 # CONFIG_SENSORS_SSP_STM is not set
 CONFIG_SENSORS_SSP_STM_32F=y
 # CONFIG_SENSORS_SSP_STM_HESTIA is not set
-CONFIG_SENSORS_SSP_STM_LEGACY=y
+# CONFIG_SENSORS_SSP_STM_LEGACY is not set
 CONFIG_SENSORS_SYSFS=y
 CONFIG_SENSORS_SSP=y
 # CONFIG_SENSORS_SSP_AK8963C is not set
@@ -4189,6 +4200,9 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4HC=y
 
 #
 # Random Number Generation
@@ -4228,6 +4242,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -4239,6 +4256,7 @@ CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y

arch/arm/kernel/signal.c

@@ -440,12 +440,17 @@ setup_return(struct pt_regs *regs, struct k_sigaction *ka,
 		 */
 		thumb = handler & 1;
 
-#if __LINUX_ARM_ARCH__ >= 7
+#if __LINUX_ARM_ARCH__ >= 6
 		/*
-		 * Clear the If-Then Thumb-2 execution state
-		 * ARM spec requires this to be all 000s in ARM mode
-		 * Snapdragon S4/Krait misbehaves on a Thumb=>ARM
-		 * signal transition without this.
+		 * Clear the If-Then Thumb-2 execution state.  ARM spec
+		 * requires this to be all 000s in ARM mode.  Snapdragon
+		 * S4/Krait misbehaves on a Thumb=>ARM signal transition
+		 * without this.
+		 *
+		 * We must do this whenever we are running on a Thumb-2
+		 * capable CPU, which includes ARMv6T2.  However, we elect
+		 * to do this whenever we're on an ARMv6 or later CPU for
+		 * simplicity.
 		 */
 		cpsr &= ~PSR_IT_MASK;
 #endif

arch/arm/mach-msm/bam_dmux.c

@@ -1716,7 +1716,7 @@ static void ul_wakeup(void)
 		}
 		if (wait_for_dfab) {
 			ret = wait_for_completion_timeout(
-					&dfab_unvote_completion, HZ);
+					&dfab_unvote_completion, msecs_to_jiffies(1000));
 			BUG_ON(ret == 0);
 		}
 		if (likely(do_vote_dfab))

arch/arm/mach-msm/clock-debug.c

@@ -33,7 +33,7 @@ static LIST_HEAD(clk_list);
 static DEFINE_SPINLOCK(clk_list_lock);
 
 static struct dentry *debugfs_base;
-static u32 debug_suspend = 1;
+static u32 debug_suspend = 0;
 
 struct clk_table {
 	struct list_head node;

arch/arm/mach-msm/dma.c

@@ -356,7 +356,7 @@ static void msm_dmov_enqueue_cmd_ext_work(struct work_struct *work)
 	}
 	if (!dmov_conf[adm].channel_active) {
 		dmov_conf[adm].clk_ctl = CLK_TO_BE_DIS;
-		schedule_delayed_work(&dmov_conf[adm].work, (HZ/10));
+		schedule_delayed_work(&dmov_conf[adm].work, msecs_to_jiffies(100));
 	}
 	spin_unlock_irqrestore(&dmov_conf[adm].list_lock, flags);
 error:

arch/arm/mach-msm/ipc_router.c

@@ -189,7 +189,7 @@ static LIST_HEAD(xprt_info_list);
 static DECLARE_RWSEM(xprt_info_list_lock_lha5);
 
 static DECLARE_COMPLETION(msm_ipc_local_router_up);
-#define IPC_ROUTER_INIT_TIMEOUT (10 * HZ)
+#define IPC_ROUTER_INIT_TIMEOUT 10000
 
 static uint32_t next_port_id;
 static DEFINE_MUTEX(next_port_id_lock_lha1);
@@ -3267,7 +3267,7 @@ void msm_ipc_router_xprt_notify(struct msm_ipc_router_xprt *xprt,
 
 	if (!msm_ipc_router_workqueue) {
 		ret = wait_for_completion_timeout(&msm_ipc_local_router_up,
-						  IPC_ROUTER_INIT_TIMEOUT);
+						  msecs_to_jiffies(IPC_ROUTER_INIT_TIMEOUT));
 		if (!ret || !msm_ipc_router_workqueue) {
 			pr_err("%s: IPC Router not initialized\n", __func__);
 			return;

arch/arm/mach-msm/platsmp.c

@@ -235,7 +235,7 @@ static int __cpuinit release_from_pen(unsigned int cpu)
 	 */
 	gic_raise_softirq(cpumask_of(cpu), 1);
 
-	timeout = jiffies + (1 * HZ);
+	timeout = jiffies + msecs_to_jiffies(1000);
 	while (time_before(jiffies, timeout)) {
 		smp_rmb();
 		if (pen_release == -1)

arch/arm/mach-msm/qdsp6v2/apr.c

@@ -220,11 +220,11 @@ int apr_wait_for_device_up(int dest_id)
 	if (dest_id == APR_DEST_MODEM)
 		rc = wait_event_interruptible_timeout(modem_wait,
 				    (apr_get_modem_state() == APR_SUBSYS_UP),
-				    (1 * HZ));
+				    msecs_to_jiffies(1000));
 	else if (dest_id == APR_DEST_QDSP6)
 		rc = wait_event_interruptible_timeout(dsp_wait,
 				    (apr_get_q6_state() == APR_SUBSYS_UP),
-				    (1 * HZ));
+				    msecs_to_jiffies(1000));
 	else
 		pr_err("%s: unknown dest_id %d\n", __func__, dest_id);
 	/* returns left time */

arch/arm/mach-msm/qdsp6v2/apr_tal.c

@@ -183,7 +183,7 @@ struct apr_svc_ch_dev *apr_tal_open(uint32_t svc, uint32_t dest,
 		return NULL;
 	}
 	rc = wait_event_timeout(apr_svc_ch[dl][dest][svc].wait,
-		(apr_svc_ch[dl][dest][svc].smd_state == 1), 5 * HZ);
+		(apr_svc_ch[dl][dest][svc].smd_state == 1), msecs_to_jiffies(5000));
 	if (rc == 0) {
 		pr_err("apr_tal:TIMEOUT for OPEN event\n");
 		mutex_unlock(&apr_svc_ch[dl][dest][svc].m_lock);

arch/arm/mach-msm/qdsp6v2/ultrasound/usf.c

@@ -31,7 +31,7 @@
 #define USF_VERSION_ID 0x0171
 
 /* Standard timeout in the asynchronous ops */
-#define USF_TIMEOUT_JIFFIES (1*HZ) /* 1 sec */
+#define USF_TIMEOUT_JIFFIES 1000  /* 1 sec */
 
 /* Undefined USF device */
 #define USF_UNDEF_DEV_ID 0xffff
@@ -886,9 +886,9 @@ static int usf_set_us_detection(struct usf_type *usf, unsigned long arg)
 						USF_ADSP_RESTART_STATE));
 	} else {
 		if (detect_info.detect_timeout == USF_DEFAULT_TIMEOUT)
-			timeout = USF_TIMEOUT_JIFFIES;
+			timeout = msecs_to_jiffies(USF_TIMEOUT_JIFFIES);
 		else
-			timeout = detect_info.detect_timeout * HZ;
+			timeout = detect_info.detect_timeout * msecs_to_jiffies(1000);
 	}
 	rc = wait_event_interruptible_timeout(usf_xx->wait,
 					(usf_xx->us_detect_type !=
@@ -1098,7 +1098,7 @@ static int usf_get_tx_update(struct usf_type *usf, unsigned long arg)
 		else {
 			prev_jiffies = jiffies;
 			if (upd_tx_info.timeout == USF_DEFAULT_TIMEOUT) {
-				timeout = USF_TIMEOUT_JIFFIES;
+				timeout = msecs_to_jiffies(USF_TIMEOUT_JIFFIES);
 				rc = wait_event_timeout(
 						usf_xx->wait,
 						(usf_xx->prev_region !=
@@ -1107,7 +1107,7 @@ static int usf_get_tx_update(struct usf_type *usf, unsigned long arg)
 						 USF_WORK_STATE),
 						timeout);
 			} else {
-				timeout = upd_tx_info.timeout * HZ;
+				timeout = upd_tx_info.timeout * msecs_to_jiffies(1000);
 				rc = wait_event_interruptible_timeout(
 						usf_xx->wait,
 						(usf_xx->prev_region !=
@@ -1190,7 +1190,7 @@ static int usf_set_rx_update(struct usf_xx_type *usf_xx, unsigned long arg)
 			usf_xx->usc,
 			&upd_rx_info.free_region) ||
 		(usf_xx->usf_state == USF_IDLE_STATE),
-		USF_TIMEOUT_JIFFIES);
+		msecs_to_jiffies(USF_TIMEOUT_JIFFIES));
 
 	if (!rc) {
 		rc = -ETIME;