From 497cf86c1ef8957cd8af50570670a93461747aba Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Mon, 23 Apr 2018 21:09:14 +0800 Subject: [PATCH] MGS-3705-2 [#imx-939] fix build break for 4.14 linux kernel remove the obsolete code to fix build break for 4.14 kernel Signed-off-by: Xianzhong (cherry picked from commit 17ef2e4e9f62f2ab24d5c6d3e053da38687b4519) --- .../mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h | 8 - .../hal/os/linux/kernel/gc_hal_kernel_os.c | 138 ------------------ 2 files changed, 146 deletions(-) diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h index f821f96f1cd0..83328c37fce6 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h @@ -293,14 +293,6 @@ typedef gctTHREADFUNCRESULT (gctTHREADFUNCTYPE * gctTHREADFUNC) ( ****************************** Kernel Debug Macro ****************************** \******************************************************************************/ -/* Set signal to signaled state for specified process. */ -gceSTATUS -gckOS_SetSignal( - IN gckOS Os, - IN gctHANDLE Process, - IN gctSIGNAL Signal - ); - /* Return the kernel logical pointer for the given physical one. */ gceSTATUS gckOS_GetKernelLogical( diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c index 9263a945795b..4b0a2ff50ce2 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c @@ -5965,66 +5965,6 @@ OnError: return status; } -#if gcdENABLE_VG -gceSTATUS -gckOS_SetSignalVG( - IN gckOS Os, - IN gctHANDLE Process, - IN gctSIGNAL Signal - ) -{ - gceSTATUS status; - gctINT result; - struct task_struct * userTask; - struct siginfo info; - - userTask = FIND_TASK_BY_PID((pid_t)(gctUINTPTR_T) Process); - - if (userTask != gcvNULL) - { - info.si_signo = 48; - info.si_code = __SI_CODE(__SI_RT, SI_KERNEL); - info.si_pid = 0; - info.si_uid = 0; - info.si_ptr = (gctPOINTER) Signal; - - /* Signals with numbers between 32 and 63 are real-time, - send a real-time signal to the user process. */ - result = send_sig_info(48, &info, userTask); - - printk("gckOS_SetSignalVG:0x%x\n", result); - /* Error? */ - if (result < 0) - { - status = gcvSTATUS_GENERIC_IO; - - gcmkTRACE( - gcvLEVEL_ERROR, - "%s(%d): an error has occurred.\n", - __FUNCTION__, __LINE__ - ); - } - else - { - status = gcvSTATUS_OK; - } - } - else - { - status = gcvSTATUS_GENERIC_IO; - - gcmkTRACE( - gcvLEVEL_ERROR, - "%s(%d): an error has occurred.\n", - __FUNCTION__, __LINE__ - ); - } - - /* Return status. */ - return status; -} -#endif - /******************************************************************************* ** ** gckOS_UserSignal @@ -6520,84 +6460,6 @@ gckOS_DecrementSemaphore( return status; } -/******************************************************************************* -** -** gckOS_SetSignal -** -** Set the specified signal to signaled state. -** -** INPUT: -** -** gckOS Os -** Pointer to the gckOS object. -** -** gctHANDLE Process -** Handle of process owning the signal. -** -** gctSIGNAL Signal -** Pointer to the gctSIGNAL. -** -** OUTPUT: -** -** Nothing. -*/ -gceSTATUS -gckOS_SetSignal( - IN gckOS Os, - IN gctHANDLE Process, - IN gctSIGNAL Signal - ) -{ - gceSTATUS status; - gctINT result; - struct task_struct * userTask; - struct siginfo info; - - userTask = FIND_TASK_BY_PID((pid_t)(gctUINTPTR_T) Process); - - if (userTask != gcvNULL) - { - info.si_signo = 48; - info.si_code = __SI_CODE(__SI_RT, SI_KERNEL); - info.si_pid = 0; - info.si_uid = 0; - info.si_ptr = (gctPOINTER) Signal; - - /* Signals with numbers between 32 and 63 are real-time, - send a real-time signal to the user process. */ - result = send_sig_info(48, &info, userTask); - - /* Error? */ - if (result < 0) - { - status = gcvSTATUS_GENERIC_IO; - - gcmkTRACE( - gcvLEVEL_ERROR, - "%s(%d): an error has occurred.\n", - __FUNCTION__, __LINE__ - ); - } - else - { - status = gcvSTATUS_OK; - } - } - else - { - status = gcvSTATUS_GENERIC_IO; - - gcmkTRACE( - gcvLEVEL_ERROR, - "%s(%d): an error has occurred.\n", - __FUNCTION__, __LINE__ - ); - } - - /* Return status. */ - return status; -} - /******************************************************************************\ ******************************** Thread Object ********************************* \******************************************************************************/ -- 2.17.1