am cdd6fdec: am 6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."

* commit 'cdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869':
  Add a temporary uapi/linux/compiler.h until upstream has one.
This commit is contained in:
Elliott Hughes 2013-11-08 15:25:38 -08:00 committed by Android Git Automerger
commit 5c56512eeb

View File

@ -0,0 +1,18 @@
#ifndef _UAPI_LINUX_COMPILER_H
#define _UAPI_LINUX_COMPILER_H
/*
* This file is not currently in the Linux kernel tree.
* Upstream uapi headers refer to <linux/compiler.h> but there is
* no such uapi file. We've sent this upstream, and are optimistically
* adding it to bionic in the meantime. This should be replaced by
* a scrubbed header from external/kernel-headers when possible.
*
* An alternative to this file is to check in a symbolic link to the
* non-uapi <linux/compiler.h>. That's fine for building bionic too.
*/
#define __user
#define __force
#endif /* _UAPI_LINUX_COMPILER_H */