tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
staging: android: Split uapi out of ashmem.h
Move the userspace interface of ashmem.h to
drivers/staging/android/uapi/ashmem.h
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Colin Cross <ccross@android.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: Minor commit message tweak]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
authored by
Colin Cross
and committed by
Greg Kroah-Hartman
fe8a78e4
a6b09619
+48
-29
+1
-29
drivers/staging/android/ashmem.h
+1
-29
drivers/staging/android/ashmem.h
···
16
16
#include <linux/ioctl.h>
17
17
#include <linux/compat.h>
18
18
19
-
#define ASHMEM_NAME_LEN 256
20
-
21
-
#define ASHMEM_NAME_DEF "dev/ashmem"
22
-
23
-
/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */
24
-
#define ASHMEM_NOT_PURGED 0
25
-
#define ASHMEM_WAS_PURGED 1
26
-
27
-
/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */
28
-
#define ASHMEM_IS_UNPINNED 0
29
-
#define ASHMEM_IS_PINNED 1
30
-
31
-
struct ashmem_pin {
32
-
__u32 offset; /* offset into region, in bytes, page-aligned */
33
-
__u32 len; /* length forward from offset, in bytes, page-aligned */
34
-
};
35
-
36
-
#define __ASHMEMIOC 0x77
37
-
38
-
#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
39
-
#define ASHMEM_GET_NAME _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
40
-
#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t)
41
-
#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4)
42
-
#define ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned long)
43
-
#define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6)
44
-
#define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin)
45
-
#define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin)
46
-
#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9)
47
-
#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10)
19
+
#include "uapi/ashmem.h"
48
20
49
21
/* support of 32bit userspace on 64bit platforms */
50
22
#ifdef CONFIG_COMPAT
+47
drivers/staging/android/uapi/ashmem.h
+47
drivers/staging/android/uapi/ashmem.h
···
1
+
/*
2
+
* drivers/staging/android/uapi/ashmem.h
3
+
*
4
+
* Copyright 2008 Google Inc.
5
+
* Author: Robert Love
6
+
*
7
+
* This file is dual licensed. It may be redistributed and/or modified
8
+
* under the terms of the Apache 2.0 License OR version 2 of the GNU
9
+
* General Public License.
10
+
*/
11
+
12
+
#ifndef _UAPI_LINUX_ASHMEM_H
13
+
#define _UAPI_LINUX_ASHMEM_H
14
+
15
+
#include <linux/ioctl.h>
16
+
17
+
#define ASHMEM_NAME_LEN 256
18
+
19
+
#define ASHMEM_NAME_DEF "dev/ashmem"
20
+
21
+
/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */
22
+
#define ASHMEM_NOT_PURGED 0
23
+
#define ASHMEM_WAS_PURGED 1
24
+
25
+
/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */
26
+
#define ASHMEM_IS_UNPINNED 0
27
+
#define ASHMEM_IS_PINNED 1
28
+
29
+
struct ashmem_pin {
30
+
__u32 offset; /* offset into region, in bytes, page-aligned */
31
+
__u32 len; /* length forward from offset, in bytes, page-aligned */
32
+
};
33
+
34
+
#define __ASHMEMIOC 0x77
35
+
36
+
#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
37
+
#define ASHMEM_GET_NAME _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
38
+
#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t)
39
+
#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4)
40
+
#define ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned long)
41
+
#define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6)
42
+
#define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin)
43
+
#define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin)
44
+
#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9)
45
+
#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10)
46
+
47
+
#endif /* _UAPI_LINUX_ASHMEM_H */