From ac31279ac7f49df11176c88cdffaea933dabc614 Mon Sep 17 00:00:00 2001 From: Jichao Zou Date: Fri, 27 Aug 2021 17:42:01 +0800 Subject: [PATCH] mmi_sys_temp:fix compilation error. motorola/kernel/modules/drivers/misc/mmi_sys_temp/mmi_sys_temp.c:118:23: error: implicit declaration of function 'compat_ptr' [-Werror,-Wimplicit-function-declaration] arg = (unsigned long)compat_ptr(arg); Change-Id: Ifba590fd36a743e7d62df81c82fcc4839b7c816a Signed-off-by: Jichao Zou Reviewed-on: https://gerrit.mot.com/2053149 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- drivers/misc/mmi_sys_temp/Android.mk | 6 +----- drivers/misc/mmi_sys_temp/Makefile | 15 +++++++++------ drivers/misc/mmi_sys_temp/mmi_sys_temp.c | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/misc/mmi_sys_temp/Android.mk b/drivers/misc/mmi_sys_temp/Android.mk index 850a5f658a9a..20db57e05efb 100644 --- a/drivers/misc/mmi_sys_temp/Android.mk +++ b/drivers/misc/mmi_sys_temp/Android.mk @@ -4,10 +4,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := mmi_sys_temp.ko LOCAL_MODULE_TAGS := optional -ifeq ($(DLKM_INSTALL_TO_VENDOR_OUT),true) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/modules/ -else LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) -endif - +KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/misc/mmi_sys_temp/Makefile b/drivers/misc/mmi_sys_temp/Makefile index 62a13fd28500..bfbdc14740ef 100644 --- a/drivers/misc/mmi_sys_temp/Makefile +++ b/drivers/misc/mmi_sys_temp/Makefile @@ -1,11 +1,14 @@ -KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build +all: modules -all: - $(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS) +modules: + $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) modules_install: - $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install + $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install + +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) clean: - $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean - + rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers + rm -rf .tmp_versions diff --git a/drivers/misc/mmi_sys_temp/mmi_sys_temp.c b/drivers/misc/mmi_sys_temp/mmi_sys_temp.c index 6216ed686327..6fbf614ca104 100644 --- a/drivers/misc/mmi_sys_temp/mmi_sys_temp.c +++ b/drivers/misc/mmi_sys_temp/mmi_sys_temp.c @@ -28,6 +28,7 @@ #include #include #include +#include #define TEMP_NODE_SENSOR_NAMES "mmi,temperature-names" #define SENSOR_LISTENER_NAMES "mmi,sensor-listener-names"