Merge "Export ion_4.12.h and ion_4.19.h" (524dc3f8) · Commits · e / os / android_system_core

libion/ion.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		#include <unistd.h>

		#include <ion/ion.h>
		#include "ion_4.19.h"
		#include <linux/ion_4.19.h>

		#include <log/log.h>

libion/ion_4.12.h→libion/kernel-headers/linux/ion_4.12.h

+16 −16

File changed and moved.

Contains only whitespace changes.

libion/ion_4.19.h→libion/kernel-headers/linux/ion_4.19.h

+0 −0

File moved.

View file

libion/tests/ion_4.12.h

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		/****************************************************************************
		****************************************************************************
		***
		*** This header was automatically generated from a Linux kernel header
		*** of the same name, to make information necessary for userspace to
		*** call into the kernel available to libc. It contains only constants,
		*** structures, and macros generated from the original header, and thus,
		*** contains no copyrightable information.
		***
		*** To edit the content of this header, modify the corresponding
		*** source file (e.g. under external/kernel-headers/original/) then
		*** run bionic/libc/kernel/tools/update_all.py
		***
		*** Any manual change here will be lost the next time this script will
		*** be run. You've been warned!
		***
		****************************************************************************
		****************************************************************************/
		#ifndef _UAPI_LINUX_ION_NEW_H
		#define _UAPI_LINUX_ION_NEW_H
		#include <linux/ioctl.h>
		#include <linux/types.h>
		#define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8)
		struct ion_new_allocation_data {
		__u64 len;
		__u32 heap_id_mask;
		__u32 flags;
		__u32 fd;
		__u32 unused;
		};
		#define MAX_HEAP_NAME 32
		struct ion_heap_data {
		char name[MAX_HEAP_NAME];
		__u32 type;
		__u32 heap_id;
		__u32 reserved0;
		__u32 reserved1;
		__u32 reserved2;
		};
		struct ion_heap_query {
		__u32 cnt;
		__u32 reserved0;
		__u64 heaps;
		__u32 reserved1;
		__u32 reserved2;
		};
		#define ION_IOC_MAGIC 'I'
		#define ION_IOC_NEW_ALLOC _IOWR(ION_IOC_MAGIC, 0, struct ion_new_allocation_data)
		#define ION_IOC_HEAP_QUERY _IOWR(ION_IOC_MAGIC, 8, struct ion_heap_query)
		#endif

libion/tests/ion_test_fixture.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@
		#define ION_TEST_FIXTURE_H_

		#include <gtest/gtest.h>
		#include <linux/ion_4.12.h>
		#include <vector>
		#include "ion_4.12.h"

		using ::testing::Test;