Merge 5a3a39e72a5c9044aae3a63cb8065b825e7b4e5e on remote branch

Change-Id: Ib2db4b13c026ae4e7998fb742680ce473f77e87e

3 files changed, 45 insertions, 5 deletions

diff --git a/buildkernel.sh b/buildkernel.sh
index 3e2dc59..26a6a42 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -32,7 +32,7 @@ export MODULES_STAGING_DIR=$(readlink -m ${COMMON_OUT_DIR}/staging)
 export KERNEL_PREBUILT_DIR=$(readlink -m ${KERNEL_DIR}/../ship_prebuilt)
 export MODULES_PRIVATE_DIR=$(readlink -m ${COMMON_OUT_DIR}/private)
 export DIST_DIR=$(readlink -m ${DIST_DIR:-${COMMON_OUT_DIR}/dist})
-export UNSTRIPPED_DIR=${DIST_DIR}/unstripped
+export UNSTRIPPED_DIR=${ROOT_DIR}/${KERNEL_MODULES_OUT}/unstripped
 export CLANG_TRIPLE CROSS_COMPILE CROSS_COMPILE_ARM32 ARCH SUBARCH
 
 #Setting up for build
@@ -330,6 +330,39 @@ copy_from_prebuilt()
 
 }
 
+save_unstripped_modules()
+{
+	echo "======================"
+	echo "Creating a copy of unstripped modules"
+	rm -rf ${UNSTRIPPED_DIR}
+	mkdir -p ${UNSTRIPPED_DIR}
+
+	set -x
+
+	(cd ${OUT_DIR} && \
+	${MAKE_PATH}make O=${OUT_DIR} ${CC_ARG} INSTALL_MOD_PATH=${UNSTRIPPED_DIR} ${MAKE_ARGS} modules_install)
+
+	MODULES=$(find ${UNSTRIPPED_DIR} -type f -name "*.ko")
+	for MODULE in ${MODULES}; do
+		# Replace all hyphens in module name with underscores
+		MODULE_NAME=$(basename ${MODULE})
+		CORRECTED_NAME=$(echo "${MODULE_NAME//-/$'_'}")
+		cp -p ${MODULE} ${UNSTRIPPED_DIR}
+		# Rename all modules with hyphens to names wth underscores
+		# As t32 expects module names with underscores to match
+		# symbols of the modules actually loaded, rename and save
+		# modules in unstripped folder for debugging
+		if [ ${MODULE_NAME} != ${CORRECTED_NAME} ]; then
+			mv ${UNSTRIPPED_DIR}/${MODULE_NAME} ${UNSTRIPPED_DIR}/${CORRECTED_NAME}
+		fi
+	done
+
+	# Remove the /lib/modules/$(uname -r) hierarchy
+	rm -rf ${UNSTRIPPED_DIR}/lib
+
+	set +x
+}
+
 #script starts executing here
 if [ -n "${CC}" ]; then
   CC_ARG="CC=${CC}"
@@ -360,6 +393,7 @@ else
 	modules_install
 	copy_all_to_prebuilt ${KERNEL_BINS}
 	archive_kernel_modules
+	save_unstripped_modules
 fi
 
 exit 0
diff --git a/kernel_definitions.mk b/kernel_definitions.mk
index 666a4f0..cdbbddc 100644
--- a/kernel_definitions.mk
+++ b/kernel_definitions.mk
@@ -1,7 +1,7 @@
 # Android Kernel compilation/common definitions
 
 ifeq ($(KERNEL_DEFCONFIG),)
-     KERNEL_DEFCONFIG := vendor/$(TARGET_PRODUCT)-qgki-debug_defconfig
+     KERNEL_DEFCONFIG := vendor/$(TARGET_BOARD_PLATFORM)-qgki-debug_defconfig
 endif
 
 TARGET_KERNEL := msm-$(TARGET_KERNEL_VERSION)
@@ -87,7 +87,7 @@ ifeq ($(KERNEL_LLVM_SUPPORT),true)
        KERNEL_AOSP_LLVM_BIN := $(shell pwd)/$(shell (dirname $(CLANG)))
        $(warning "Not using latest aosp-llvm" $(KERNEL_LLVM_BIN))
     endif
-  real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu- AR=$(KERNEL_AOSP_LLVM_BIN)/llvm-ar LLVM_NM=$(KERNEL_AOSP_LLVM_BIN)/llvm-nm LD=$(KERNEL_AOSP_LLVM_BIN)/ld.lld
+  real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu- AR=$(KERNEL_AOSP_LLVM_BIN)/llvm-ar LLVM_NM=$(KERNEL_AOSP_LLVM_BIN)/llvm-nm LD=$(KERNEL_AOSP_LLVM_BIN)/ld.lld NM=$(KERNEL_AOSP_LLVM_BIN)/llvm-nm
   endif
 else
 ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)
@@ -192,7 +192,7 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_GENERATE_DEFCONFIG) $(DTC) $(U
 	VENDOR_KERNEL_MODULES_ARCHIVE=$(VENDOR_KERNEL_MODULES_ARCHIVE) \
 	VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE=$(VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE) \
 	VENDOR_RAMDISK_KERNEL_MODULES="$(VENDOR_RAMDISK_KERNEL_MODULES)" \
-	TARGET_PRODUCT=$(TARGET_PRODUCT) \
+	TARGET_PRODUCT=$(TARGET_BOARD_PLATFORM) \
 	device/qcom/kernelscripts/buildkernel.sh \
 	$(real_cc) \
 	$(TARGET_KERNEL_MAKE_ENV)
@@ -219,7 +219,7 @@ $(TARGET_PREBUILT_KERNEL): $(KERNEL_OUT) $(KERNEL_GENERATE_DEFCONFIG) $(DTC) $(K
 	VENDOR_KERNEL_MODULES_ARCHIVE=$(VENDOR_KERNEL_MODULES_ARCHIVE) \
 	VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE=$(VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE) \
 	VENDOR_RAMDISK_KERNEL_MODULES="$(VENDOR_RAMDISK_KERNEL_MODULES)" \
-	TARGET_PRODUCT=$(TARGET_PRODUCT) \
+	TARGET_PRODUCT=$(TARGET_BOARD_PLATFORM) \
 	device/qcom/kernelscripts/buildkernel.sh \
 	$(real_cc) \
 	$(TARGET_KERNEL_MAKE_ENV)
diff --git a/modules_blacklist/modules.blacklist.lahaina b/modules_blacklist/modules.blacklist.lahaina
index 88471c6..bac378e 100644
--- a/modules_blacklist/modules.blacklist.lahaina
+++ b/modules_blacklist/modules.blacklist.lahaina
@@ -70,6 +70,9 @@ blacklist radio-i2c-rtc6226-qca
 blacklist dummy-cpufreq
 blacklist dummy_hcd
 blacklist kheaders
+blacklist atomic64_test
+blacklist test_user_copy
+blacklist lkdtm
 blacklist net_failover
 blacklist adc-tm
 blacklist rtc-test
@@ -82,3 +85,6 @@ blacklist vmw_vsock_virtio_transport_common
 blacklist vsock_diag
 blacklist vsock
 blacklist qca_cld3_wlan
+blacklist torture
+blacklist locktorture
+blacklist rcutorture