diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 13:57:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 13:57:09 -0800 |
| commit | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (patch) | |
| tree | 9fcee023682e2b28669207e70e1e72fe346f96d4 /libc/kernel/common/linux/android_pmem.h | |
| parent | e5cf8166dcfeebe50e0981467f93b79ac4f69a4f (diff) | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.tar.gz android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.tar.bz2 android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.zip | |
Merge "Update bionic kernel headers using update_all.py"
Diffstat (limited to 'libc/kernel/common/linux/android_pmem.h')
| -rw-r--r-- | libc/kernel/common/linux/android_pmem.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libc/kernel/common/linux/android_pmem.h b/libc/kernel/common/linux/android_pmem.h index be0b34221..8c605e46b 100644 --- a/libc/kernel/common/linux/android_pmem.h +++ b/libc/kernel/common/linux/android_pmem.h @@ -7,43 +7,43 @@ *** 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 _ANDROID_PMEM_H_ #define _ANDROID_PMEM_H_ - #define PMEM_IOCTL_MAGIC 'p' #define PMEM_GET_PHYS _IOW(PMEM_IOCTL_MAGIC, 1, unsigned int) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PMEM_MAP _IOW(PMEM_IOCTL_MAGIC, 2, unsigned int) #define PMEM_GET_SIZE _IOW(PMEM_IOCTL_MAGIC, 3, unsigned int) #define PMEM_UNMAP _IOW(PMEM_IOCTL_MAGIC, 4, unsigned int) - #define PMEM_ALLOCATE _IOW(PMEM_IOCTL_MAGIC, 5, unsigned int) - +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PMEM_CONNECT _IOW(PMEM_IOCTL_MAGIC, 6, unsigned int) - #define PMEM_GET_TOTAL_SIZE _IOW(PMEM_IOCTL_MAGIC, 7, unsigned int) #define PMEM_CACHE_FLUSH _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int) - struct android_pmem_platform_data +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ { const char* name; - unsigned long start; - unsigned long size; - +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned no_allocator; - unsigned cached; - unsigned buffered; }; - +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct pmem_region { unsigned long offset; unsigned long len; }; - +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif - |