Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d749879e authored by Stephen Boyd's avatar Stephen Boyd Committed by Matt Wagantall
Browse files

ashmem: Move ashmem.h from staging to include/linux and export it 



Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[abhimany: resolve trivial merge conflicts]
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 9a55ab01

drivers/staging/android/ashmem.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/bitops.h>

#include <linux/mutex.h>

#include <linux/shmem_fs.h>

#include "ashmem.h"

#include <linux/ashmem.h>



#define ASHMEM_NAME_PREFIX "dev/ashmem/"

#define ASHMEM_NAME_PREFIX_LEN (sizeof(ASHMEM_NAME_PREFIX) - 1)

drivers/staging/android/ashmem.h→include/linux/ashmem.h

+1 −11
Original line number Diff line number Diff line
@@ -12,16 +12,6 @@ 
#ifndef _LINUX_ASHMEM_H

#define _LINUX_ASHMEM_H



#include <linux/limits.h>

#include <linux/ioctl.h>

#include <linux/compat.h>



#include "uapi/ashmem.h"



/* support of 32bit userspace on 64bit platforms */

#ifdef CONFIG_COMPAT

#define COMPAT_ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, compat_size_t)

#define COMPAT_ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned int)

#endif

#include <uapi/linux/ashmem.h>



#endif	/* _LINUX_ASHMEM_H */

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ header-y += agpgart.h 
header-y += aio_abi.h

header-y += apm_bios.h

header-y += arcfb.h

header-y += ashmem.h

header-y += atalk.h

header-y += atm.h

header-y += atm_eni.h

drivers/staging/android/uapi/ashmem.h→include/uapi/linux/ashmem.h

+10 −12
Original line number Diff line number Diff line 
/*

 * drivers/staging/android/uapi/ashmem.h

 *

 * Copyright 2008 Google Inc.

 * Author: Robert Love

 *

 * This file is dual licensed.  It may be redistributed and/or modified

 * under the terms of the Apache 2.0 License OR version 2 of the GNU

 * General Public License.

 */



#ifndef _UAPI_LINUX_ASHMEM_H

#define _UAPI_LINUX_ASHMEM_H



#include <linux/limits.h>

#include <linux/ioctl.h>

#include <linux/types.h>

#include <linux/compat.h>



#define ASHMEM_NAME_LEN		256
@@ -45,4 +36,11 @@ struct ashmem_pin { 
#define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)

#define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)





/* support of 32bit userspace on 64bit platforms */

#ifdef CONFIG_COMPAT

#define COMPAT_ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, compat_size_t)

#define COMPAT_ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned int)

#endif



#endif /* _UAPI_LINUX_ASHMEM_H */