X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fgpu%2Farm%2Fmali400%2Fump%2Flinux%2Fump_ukk_ref_wrappers.h;h=b8b2ccefe603a4b384bbf2aa8d723b556efe1ec2;hb=25b0332fe62be1cbb384bb1094aa30848d4a5c0c;hp=ba028f2668ff96b2b9d75c0a57f41d2afbb9b971;hpb=d03390bfcdb71807a537254455a2938322926d57;p=firefly-linux-kernel-4.4.55.git diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h index ba028f2668ff..b8b2ccefe603 100755 --- a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -1,11 +1,11 @@ /* - * This confidential and proprietary software may be used only as - * authorised by a licensing agreement from ARM Limited - * (C) COPYRIGHT 2009-2010, 2013 ARM Limited - * ALL RIGHTS RESERVED - * The entire notice above must be reproduced on all authorised - * copies and copies may only be made to the extent permitted - * by a licensing agreement from ARM Limited. + * Copyright (C) 2010, 2013-2014, 2016 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained from Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -24,8 +24,10 @@ extern "C" { #endif -int ump_allocate_wrapper(u32 __user * argument, struct ump_session_data * session_data); - +int ump_allocate_wrapper(u32 __user *argument, struct ump_session_data *session_data); +#ifdef CONFIG_DMA_SHARED_BUFFER +int ump_dmabuf_import_wrapper(u32 __user *argument, struct ump_session_data *session_data); +#endif #ifdef __cplusplus }