commit bc474943a59c67fc5f4f370be4e6f2e7eb73a405
author Jeffrey Vander Stoep <jeffv@google.com> Wed Apr 06 23:41:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 06 23:41:06 2016 +0000
tree 7562f81078eb12dafdbc7535130b9bbe1567dcc4
parent fd4bced48fc99f8275c930cf1d36a814c1cc435f
parent 0d98d4fc9a465ac8eaef910cd0f2f703405cc30d

Merge "whitelist additional gpu ioctls" into nyc-dev

sepolicy/ioctl_macros

diff --git a/sepolicy/ioctl_macros b/sepolicy/ioctl_macros
index 44de156..b237965 100644
--- a/sepolicy/ioctl_macros
+++ b/sepolicy/ioctl_macros
@@ -12,6 +12,8 @@
 # 0xc0080935
 # 0xc0280936
 # 0x00000937
+# 0x00000938
+# 0x00000939
 # 0xc02c093d
 define(`gpu_unused_ioctls', `{
 IOCTL_KGSL_DEVICE_WAITTIMESTAMP
@@ -32,8 +34,6 @@
 IOCTL_KGSL_CFF_SYNCMEM
 IOCTL_KGSL_TIMESTAMP_EVENT_OLD
 IOCTL_KGSL_GPUMEM_SYNC_CACHE
-IOCTL_KGSL_PERFCOUNTER_GET
-IOCTL_KGSL_PERFCOUNTER_PUT
 IOCTL_KGSL_PERFCOUNTER_QUERY
 IOCTL_KGSL_PERFCOUNTER_READ
 IOCTL_KGSL_GPUMEM_SYNC_CACHE_BULK
@@ -53,5 +53,7 @@
 IOCTL_KGSL_GPUMEM_FREE_ID
 IOCTL_KGSL_GPUMEM_GET_INFO
 IOCTL_KGSL_GPUMEM_SYNC_CACHE
+IOCTL_KGSL_PERFCOUNTER_GET
+IOCTL_KGSL_PERFCOUNTER_PUT
 IOCTL_KGSL_SUBMIT_COMMANDS
 }')