brothaedhung · justin0406 · Aug 23, 2014 · Dec 23, 2013 · Sep 18, 2014 · Jun 19, 2014
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
@@ -29,6 +29,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the
 
 Procedure for submitting patches to the -stable tree:
 
+ - If the patch covers files in net/ or drivers/net please follow netdev stable
+   submission guidelines as described in
+   Documentation/networking/netdev-FAQ.txt
  - Send the patch, after verifying that it follows the above rules, to
    stable@vger.kernel.org.  You must note the upstream commit ID in the
    changelog of your submission, as well as the kernel version you wish

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 4
-SUBLEVEL = 103
+SUBLEVEL = 104
 EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 
@@ -591,6 +591,10 @@ ifdef CONFIG_CC_GRAPHITE_OPTIMIZATION
 KBUILD_CFLAGS += -fgraphite-identity -floop-parallelize-all -ftree-loop-linear -floop-interchange -floop-strip-mine -floop-block
 endif
 
+# conserve stack if available
+# do this early so that an architecture can override it.
+KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
+
 include $(srctree)/arch/$(SRCARCH)/Makefile
 
 #ifneq ($(CONFIG_FRAME_WARN),0)
@@ -658,9 +662,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
 # disable invalid "can't wrap" optimizations for signed / pointers
 KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
 
-# conserve stack if available
-KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
-
 # use the deterministic mode of AR if available
 KBUILD_ARFLAGS := $(call ar-option,D)
 

diff --git a/ak-mako-build.sh → ak-gee-build.sh b/ak-mako-build.sh → ak-gee-build.sh
@@ -10,15 +10,15 @@ clear
 
 # AK Kernel Version
 BASE_AK_VER="AK"
-VER=".350.gee-aosp"
+VER=".360.gee.aosp"
 AK_VER=$BASE_AK_VER$VER
 
 # AK Variables
 export LOCALVERSION="~"`echo $AK_VER`
-export CROSS_COMPILE=${HOME}/kernel/AK-linaro/4.9.1-2014.07.20140718.CR83/bin/arm-cortex_a15-linux-gnueabihf-
+export CROSS_COMPILE=${HOME}/kernel/linaro/arm-cortex_a15-linux-gnueabihf-linaro_4.9.2-2014.10/bin/arm-cortex_a15-linux-gnueabihf-
 export ARCH=arm
 export SUBARCH=arm
-export KBUILD_BUILD_USER=Edgar
+export KBUILD_BUILD_USER=Justin
 export KBUILD_BUILD_HOST="BuildBox"
 
 DATE_START=$(date +"%s")
@@ -41,14 +41,14 @@ echo "Show: AK gee Settings"
 echo "------------------------"
 echo -e "${restore}"
 
-MODULES_DIR=${HOME}/kernel/AK-anykernel/cwm/system/lib/modules
+MODULES_DIR=${HOME}/kernel/AK-Mako-AnyKernel/cwm/system/lib/modules
 KERNEL_DIR=`pwd`
-OUTPUT_DIR=${HOME}/kernel/AK-anykernel/zip
-CWM_DIR=${HOME}/kernel/AK-anykernel/cwm
-ZIMAGE_DIR=${HOME}/kernel/AK-xGenesis/arch/arm/boot
+OUTPUT_DIR=${HOME}/kernel/AK-Mako-AnyKernel
+CWM_DIR=${HOME}/kernel/AK-Mako-AnyKernel/cwm
+ZIMAGE_DIR=${HOME}/kernel/AK-GEE/arch/arm/boot
 CWM_MOVE=${HOME}/kernel/AK-releases
-ZIMAGE_ANYKERNEL=${HOME}/kernel/AK-anykernel/cwm/kernel
-ANYKERNEL_DIR=${HOME}/kernel/AK-anykernel
+ZIMAGE_ANYKERNEL=${HOME}/kernel/AK-Mako-AnyKernel/cwm/kernel
+ANYKERNEL_DIR=${HOME}/kernel/AK-Mako-AnyKernel
 
 echo -e "${red}"; echo "COMPILING VERSION:"; echo -e "${blink_red}"; echo "$LOCALVERSION"; echo -e "${restore}"
 echo "CROSS_COMPILE="$CROSS_COMPILE

diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
@@ -489,6 +489,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
 }
 #endif
 
+#define ioread16be(p) be16_to_cpu(ioread16(p))
+#define ioread32be(p) be32_to_cpu(ioread32(p))
+#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p))
+#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p))
+
 #define inb_p		inb
 #define inw_p		inw
 #define inl_p		inl

diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
@@ -12,6 +12,7 @@
 #include <linux/smp.h>
 #include <linux/errno.h>
 #include <asm/ptrace.h>
+#include <asm/special_insns.h>
 
 #include "op_impl.h"
 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -158,10 +158,8 @@ config ARM_TICKET_LOCKS
 	default y if ARCH_MSM_SCORPIONMP || ARCH_MSM_KRAITMP
 	depends on SMP
 
-config RWSEM_GENERIC_SPINLOCK
-	bool
-
 config RWSEM_XCHGADD_ALGORITHM
+	bool
 	def_bool y
 
 config ARCH_HAS_ILOG2_U32

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -41,6 +41,10 @@ ifeq ($(CONFIG_CC_STACKPROTECTOR),y)
 KBUILD_CFLAGS	+=-fstack-protector
 endif
 
+# ARM gcc developers unfortunately broke -fconserve-stack. It misaligns
+# variables on the stack
+KBUILD_CFLAGS += $(call cc-option,-fno-conserve-stack)
+
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
 KBUILD_CPPFLAGS	+= -mbig-endian
 AS		+= -EB

diff --git a/arch/arm/configs/gee_defconfig b/arch/arm/configs/gee_defconfig
@@ -717,6 +717,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_SMARTMAX=y
 CONFIG_CPU_FREQ_GOV_WHEATLEY=y
 CONFIG_CPU_FREQ_GOV_LAZY=y
+CONFIG_CPU_FREQ_GOV_INTELLIACTIVE=y
+CONFIG_CPU_FREQ_GOV_INTELLIDEMAND=y
 
 #
 # ARM CPU frequency scaling drivers
@@ -1294,8 +1296,10 @@ CONFIG_QSEECOM=y
 CONFIG_USB_HSIC_SMSC_HUB=y
 # CONFIG_BU52031NVX is not set
 # CONFIG_C2PORT is not set
-# CONFIG_DOUBLETAP_WAKE is not set
+CONFIG_TOUCHSCREEN_DOUBLETAP2WAKE=y
 # CONFIG_TOUCH_WAKE is not set
+CONFIG_TOUCHSCREEN_SWEEP2WAKE=y
+CONFIG_TOUCHSCREEN_PREVENT_SLEEP=y
 
 #
 # EEPROM support

diff --git a/arch/arm/configs/geeb_defconfig b/arch/arm/configs/geeb_defconfig
@@ -1294,8 +1294,11 @@ CONFIG_QSEECOM=y
 CONFIG_USB_HSIC_SMSC_HUB=y
 # CONFIG_BU52031NVX is not set
 # CONFIG_C2PORT is not set
-# CONFIG_DOUBLETAP_WAKE is not set
+CONFIG_TOUCHSCREEN_DOUBLETAP2WAKE=y
 # CONFIG_TOUCH_WAKE is not set
+CONFIG_TOUCHSCREEN_SWEEP2WAKE=y
+CONFIG_TOUCHSCREEN_PREVENT_SLEEP=y
+
 
 #
 # EEPROM support

diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
@@ -15,7 +15,10 @@ generic-y += local64.h
 generic-y += percpu.h
 generic-y += poll.h
 generic-y += resource.h
+generic-y += rwsem.h
 generic-y += sections.h
 generic-y += siginfo.h
 generic-y += sizes.h
+generic-y += termios.h
 generic-y += unaligned.h
+
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
@@ -3,6 +3,8 @@
  *
  *  Copyright (C) 1995-1999 Russell King
  *
+ *  Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -126,4 +128,6 @@ static inline void prefetch(const void *ptr)
 
 #endif
 
+#include <asm-generic/processor.h>
+
 #endif /* __ASM_ARM_PROCESSOR_H */
diff --git a/arch/arm/include/asm/relaxed.h b/arch/arm/include/asm/relaxed.h
@@ -0,0 +1,20 @@
+/*
+ * arm/include/asm/relaxed.h
+ *
+ * Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _ASM_RELAXED_H_
+#define _ASM_RELAXED_H_
+
+#include <asm-generic/relaxed.h>
+
+#endif /*_ASM_RELAXED_H_*/
diff --git a/arch/arm/include/asm/termios.h b/arch/arm/include/asm/termios.h
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
@@ -76,26 +76,21 @@
 #ifndef CONFIG_THUMB2_KERNEL
 	.macro	svc_exit, rpsr
 	msr	spsr_cxsf, \rpsr
-#if defined(CONFIG_CPU_V6)
-	ldr	r0, [sp]
-	strex	r1, r2, [sp]			@ clear the exclusive monitor
-	ldmib	sp, {r1 - pc}^			@ load r1 - pc, cpsr
-#elif defined(CONFIG_CPU_32v6K)
-	clrex					@ clear the exclusive monitor
-	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr
-#else
-	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
+	@ We must avoid clrex due to Cortex-A15 erratum #830321
+	sub	r0, sp, #4			@ uninhabited address
+	strex	r1, r2, [r0]			@ clear the exclusive monitor
 #endif
+	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr
 	.endm
 
 	.macro	restore_user_regs, fast = 0, offset = 0
 	ldr	r1, [sp, #\offset + S_PSR]	@ get calling cpsr
 	ldr	lr, [sp, #\offset + S_PC]!	@ get pc
 	msr	spsr_cxsf, r1			@ save in spsr_svc
-#if defined(CONFIG_CPU_V6)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
+	@ We must avoid clrex due to Cortex-A15 erratum #830321
 	strex	r1, r2, [sp]			@ clear the exclusive monitor
-#elif defined(CONFIG_CPU_32v6K)
-	clrex					@ clear the exclusive monitor
 #endif
 	.if	\fast
 	ldmdb	sp, {r1 - lr}^			@ get calling r1 - lr
@@ -123,7 +118,10 @@
 	.macro	svc_exit, rpsr
 	ldr	lr, [sp, #S_SP]			@ top of the stack
 	ldrd	r0, r1, [sp, #S_LR]		@ calling lr and pc
-	clrex					@ clear the exclusive monitor
+
+	@ We must avoid clrex due to Cortex-A15 erratum #830321
+	strex	r2, r1, [sp, #S_LR]		@ clear the exclusive monitor
+
 	stmdb	lr!, {r0, r1, \rpsr}		@ calling lr and rfe context
 	ldmia	sp, {r0 - r12}
 	mov	sp, lr
@@ -132,13 +130,16 @@
 	.endm
 
 	.macro	restore_user_regs, fast = 0, offset = 0
-	clrex					@ clear the exclusive monitor
 	mov	r2, sp
 	load_user_sp_lr r2, r3, \offset + S_SP	@ calling sp, lr
 	ldr	r1, [sp, #\offset + S_PSR]	@ get calling cpsr
 	ldr	lr, [sp, #\offset + S_PC]	@ get pc
 	add	sp, sp, #\offset + S_SP
 	msr	spsr_cxsf, r1			@ save in spsr_svc
+
+	@ We must avoid clrex due to Cortex-A15 erratum #830321
+	strex	r1, r2, [sp]			@ clear the exclusive monitor
+
 	.if	\fast
 	ldmdb	sp, {r1 - r12}			@ get calling r1 - r12
 	.else

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
@@ -365,12 +365,10 @@ static void show_data(unsigned long addr, int nbytes, const char *name)
 	u32	*p;
 
 	/*
-	 * don't attempt to dump non-kernel addresses, values that are probably
-	 * just small negative numbers, or vmalloc addresses that may point to
-	 * memory-mapped peripherals
+	 * don't attempt to dump non-kernel addresses or
+	 * values that are probably just small negative numbers
 	 */
-	if (addr < PAGE_OFFSET || addr > -256UL ||
-	    is_vmalloc_addr((void *)addr))
+	if (addr < PAGE_OFFSET || addr > -256UL)
 		return;
 
 	printk("\n%s: %#lx:\n", name, addr);

diff --git a/arch/arm/mach-msm/lge/mako/board-mako-display.c b/arch/arm/mach-msm/lge/mako/board-mako-display.c
@@ -251,7 +251,7 @@ static struct msm_bus_scale_pdata mdp_bus_scale_pdata = {
 static struct msm_panel_common_pdata mdp_pdata = {
 	.gpio = MDP_VSYNC_GPIO,
 	.mdp_max_clk = 266667000,
-	.mdp_max_bw = 3000000000u,
+	.mdp_max_bw = 2000000000UL,
 	.mdp_bw_ab_factor = 115,
 	.mdp_bw_ib_factor = 125,
 	.mdp_bus_scale_table = &mdp_bus_scale_pdata,
@@ -815,7 +815,7 @@ static char ief_setC[9] = {0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
 
 static char osc_setting[4] =     {0xC0, 0x00, 0x0A, 0x10};
 static char power_setting3[13] = {0xC3, 0x00, 0x88, 0x03, 0x20, 0x01, 0x57, 0x4F, 0x33,0x02,0x38,0x38,0x00};
-static char power_setting4[6] =  {0xC4, 0x31, 0x24, 0x11, 0x11, 0x3D};
+static char power_setting4[6] =  {0xC4, 0x22, 0x24, 0x11, 0x11, 0x3D};
 static char power_setting5[4] =  {0xC5, 0x3B, 0x3B, 0x03};
 
 #ifdef CONFIG_LGIT_VIDEO_WXGA_CABC