From d9c74f71b04c825c626d3cb154ba6eb0cff3e802 Mon Sep 17 00:00:00 2001 From: Mauro Ribeiro Date: Wed, 15 Oct 2014 02:50:36 -0300 Subject: [PATCH] mali: fixes ump build Change-Id: I7431bc059a011c8db122ece1c35749c0593b7b19 Signed-off-by: Dongjin Kim --- drivers/gpu/arm/mali/linux/mali_memory_types.h | 2 +- drivers/gpu/arm/mali/linux/mali_memory_ump.c | 2 +- drivers/gpu/arm/ump/Kbuild | 12 ++++++------ drivers/gpu/arm/ump/common/ump_kernel_api.c | 2 +- drivers/gpu/arm/ump/common/ump_kernel_common.h | 2 +- .../gpu/arm/ump/common/ump_kernel_memory_backend.h | 2 +- drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c | 2 +- drivers/gpu/arm/ump/common/ump_kernel_types.h | 2 +- drivers/gpu/arm/ump/linux/ump_kernel_linux.c | 8 ++++---- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/arm/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali/linux/mali_memory_types.h index 10672785a233..8b01f3b584a8 100644 --- a/drivers/gpu/arm/mali/linux/mali_memory_types.h +++ b/drivers/gpu/arm/mali/linux/mali_memory_types.h @@ -12,7 +12,7 @@ #define __MALI_MEMORY_TYPES_H__ #if defined(CONFIG_MALI400_UMP) -#include "ump_kernel_interface.h" +#include #endif typedef u32 mali_address_t; diff --git a/drivers/gpu/arm/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali/linux/mali_memory_ump.c index 1115c1d1add0..c5dca465ee35 100644 --- a/drivers/gpu/arm/mali/linux/mali_memory_ump.c +++ b/drivers/gpu/arm/mali/linux/mali_memory_ump.c @@ -16,7 +16,7 @@ #include "mali_memory.h" -#include "ump_kernel_interface.h" +#include static int mali_ump_map(struct mali_session_data *session, mali_mem_allocation *descriptor) { diff --git a/drivers/gpu/arm/ump/Kbuild b/drivers/gpu/arm/ump/Kbuild index 4bbb87ee102b..cad1c13647de 100755 --- a/drivers/gpu/arm/ump/Kbuild +++ b/drivers/gpu/arm/ump/Kbuild @@ -66,12 +66,12 @@ ump-y = common/ump_kernel_common.o \ linux/ump_ukk_ref_wrappers.o \ linux/ump_osk_atomics.o \ linux/ump_osk_low_level_mem.o \ - linux/ump_osk_misc.o \ - $(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \ - $(UDD_FILE_PREFIX)linux/mali_osk_locks.o \ - $(UDD_FILE_PREFIX)linux/mali_osk_memory.o \ - $(UDD_FILE_PREFIX)linux/mali_osk_math.o \ - $(UDD_FILE_PREFIX)linux/mali_osk_misc.o + linux/ump_osk_misc.o +# $(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \ +# $(UDD_FILE_PREFIX)linux/mali_osk_locks.o \ +# $(UDD_FILE_PREFIX)linux/mali_osk_memory.o \ +# $(UDD_FILE_PREFIX)linux/mali_osk_math.o \ +# $(UDD_FILE_PREFIX)linux/mali_osk_misc.o obj-$(CONFIG_UMP) := ump.o diff --git a/drivers/gpu/arm/ump/common/ump_kernel_api.c b/drivers/gpu/arm/ump/common/ump_kernel_api.c index 000a91287164..58df0a2d31e4 100755 --- a/drivers/gpu/arm/ump/common/ump_kernel_api.c +++ b/drivers/gpu/arm/ump/common/ump_kernel_api.c @@ -12,7 +12,7 @@ #include "mali_osk_list.h" #include "ump_osk.h" #include "ump_uk_types.h" -#include "ump_kernel_interface.h" +#include #include "ump_kernel_common.h" diff --git a/drivers/gpu/arm/ump/common/ump_kernel_common.h b/drivers/gpu/arm/ump/common/ump_kernel_common.h index fa4639ff0c74..49cea7ee7477 100755 --- a/drivers/gpu/arm/ump/common/ump_kernel_common.h +++ b/drivers/gpu/arm/ump/common/ump_kernel_common.h @@ -12,7 +12,7 @@ #define __UMP_KERNEL_COMMON_H__ #include "ump_kernel_types.h" -#include "ump_kernel_interface.h" +#include #include "ump_kernel_descriptor_mapping.h" #include "ump_kernel_memory_backend.h" diff --git a/drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h index 705c705d89c7..887a2c7d89d7 100755 --- a/drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h +++ b/drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h @@ -15,7 +15,7 @@ #ifndef __UMP_KERNEL_MEMORY_BACKEND_H__ #define __UMP_KERNEL_MEMORY_BACKEND_H__ -#include "ump_kernel_interface.h" +#include #include "ump_kernel_types.h" diff --git a/drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c index 99eb17217b98..14320fc86bd7 100755 --- a/drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c +++ b/drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c @@ -13,7 +13,7 @@ #include "ump_osk.h" #include "ump_uk_types.h" -#include "ump_kernel_interface_ref_drv.h" +#include #include "ump_kernel_common.h" #include "ump_kernel_descriptor_mapping.h" diff --git a/drivers/gpu/arm/ump/common/ump_kernel_types.h b/drivers/gpu/arm/ump/common/ump_kernel_types.h index 08704ab4053f..081fab3caf32 100755 --- a/drivers/gpu/arm/ump/common/ump_kernel_types.h +++ b/drivers/gpu/arm/ump/common/ump_kernel_types.h @@ -11,7 +11,7 @@ #ifndef __UMP_KERNEL_TYPES_H__ #define __UMP_KERNEL_TYPES_H__ -#include "ump_kernel_interface.h" +#include #include "mali_osk.h" diff --git a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c index b22585da7c85..ef771766decd 100755 --- a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c +++ b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c @@ -21,8 +21,8 @@ #include "arch/config.h" /* Configuration for current platform. The symlinc for arch is set by Makefile */ #include "ump_ioctl.h" #include "ump_kernel_common.h" -#include "ump_kernel_interface.h" -#include "ump_kernel_interface_ref_drv.h" +#include +#include #include "ump_kernel_descriptor_mapping.h" #include "ump_kernel_memory_backend.h" #include "ump_kernel_memory_backend_os.h" @@ -356,7 +356,7 @@ static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int c return err; } -int map_errcode( _mali_osk_errcode_t err ) +/*int map_errcode( _mali_osk_errcode_t err ) { switch(err) { case _MALI_OSK_ERR_OK : @@ -378,7 +378,7 @@ int map_errcode( _mali_osk_errcode_t err ) default: return -EFAULT; } -} +}*/ /* * Handle from OS to map specified virtual memory to specified UMP memory.