diff options
| author | Colin Cross <ccross@android.com> | 2013-12-19 18:58:20 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-12-19 19:31:19 -0800 |
| commit | b04f75ab129e471eb0b45571f0c319c516de0c02 (patch) | |
| tree | 7170b50e288dbe52c1f3cd5d1d88f644f8aafbc4 /libion | |
| parent | cd8b953ede50f68dff5ea049e72aee130dc4a3cb (diff) | |
| download | system_core-b04f75ab129e471eb0b45571f0c319c516de0c02.zip system_core-b04f75ab129e471eb0b45571f0c319c516de0c02.tar.gz system_core-b04f75ab129e471eb0b45571f0c319c516de0c02.tar.bz2 | |
libion: update ion_test.h
Update ion_test.h to include a padding word to keep the same
struct size on 32-bit and 64-bit.
Change-Id: I68086ce49ca4cc4ed8e251752eaed331a35fbbd2
Diffstat (limited to 'libion')
| -rw-r--r-- | libion/kernel-headers/linux/ion_test.h | 4 | ||||
| -rw-r--r-- | libion/original-kernel-headers/linux/ion_test.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libion/kernel-headers/linux/ion_test.h b/libion/kernel-headers/linux/ion_test.h index 2b0f062..6f3e2a7 100644 --- a/libion/kernel-headers/linux/ion_test.h +++ b/libion/kernel-headers/linux/ion_test.h @@ -27,10 +27,12 @@ struct ion_test_rw_data { __u64 size; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int write; + int __padding; }; #define ION_IOC_MAGIC 'I' -#define ION_IOC_TEST_SET_FD _IO(ION_IOC_MAGIC, 0xf0) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ION_IOC_TEST_SET_FD _IO(ION_IOC_MAGIC, 0xf0) #define ION_IOC_TEST_DMA_MAPPING _IOW(ION_IOC_MAGIC, 0xf1, struct ion_test_rw_data) #define ION_IOC_TEST_KERNEL_MAPPING _IOW(ION_IOC_MAGIC, 0xf2, struct ion_test_rw_data) #endif +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/libion/original-kernel-headers/linux/ion_test.h b/libion/original-kernel-headers/linux/ion_test.h index 614d1e3..ffef06f 100644 --- a/libion/original-kernel-headers/linux/ion_test.h +++ b/libion/original-kernel-headers/linux/ion_test.h @@ -32,6 +32,7 @@ struct ion_test_rw_data { __u64 offset; __u64 size; int write; + int __padding; }; #define ION_IOC_MAGIC 'I' |