Merge 996abee2bd98482aff0e6e268c6a74092e5e7006 on remote branch

Change-Id: I9f5871377adac8845192b46a76e3799b852e1c5e

Android.mk

@@ -7,6 +7,12 @@ else
 TARGET_SYNX_ENABLE := true
 endif
 
+ifneq (,$(call is-board-platform-in-list2,volcano))
+TARGET_SYNX_ENABLE := false
+endif
+ifneq (,$(call is-board-platform-in-list2,pitti))
+TARGET_SYNX_ENABLE := false
+endif
 ifeq ($(TARGET_SYNX_ENABLE),true)
 SYNX_BLD_DIR := $(TOP)/vendor/qcom/opensource/synx-kernel
 

msm/synx/synx.c

@@ -605,9 +605,9 @@ u32 synx_custom_get_status(struct synx_coredata *synx_obj, u32 status)
 			synx_obj->status = synx_get_child_status(synx_obj);
 		else
 			synx_obj->status = parent_global_status;
+		custom_status = synx_obj->status;
 	}
 
-	custom_status = synx_obj->status;
 	mutex_unlock(&synx_obj->obj_lock);
 
 bail:

synx_kernel_board.mk

@@ -8,9 +8,15 @@ ifeq ($(TARGET_KERNEL_DLKM_DISABLE),true)
 else
 TARGET_SYNX_ENABLE := true
 endif
-#
+
+ifneq (,$(call is-board-platform-in-list2,volcano))
+TARGET_SYNX_ENABLE := false
+endif
+ifneq (,$(call is-board-platform-in-list2,pitti))
+TARGET_SYNX_ENABLE := false
+endif
 ifeq ($(TARGET_SYNX_ENABLE), true)
-ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
+ifneq (,$(call is-board-platform-in-list2,$(TARGET_BOARD_PLATFORM)))
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/synx-driver.ko
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ipclite.ko
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ipclite_test.ko

synx_kernel_product.mk

@@ -7,6 +7,12 @@ else
 TARGET_SYNX_ENABLE := true
 endif
 
+ifneq (,$(call is-board-platform-in-list2,volcano))
+TARGET_SYNX_ENABLE := false
+endif
+ifneq (,$(call is-board-platform-in-list2,pitti))
+TARGET_SYNX_ENABLE := false
+endif
 ifeq ($(TARGET_SYNX_ENABLE), true)
 PRODUCT_PACKAGES += synx-driver.ko
 endif