am 5ff62cbe: am 51166a7e: am 434f97f6: Merge "Remove some old kernel header cruft not needed with uapi."

* commit '5ff62cbe9df50eb9d1bac01180ca7f40c1e2c6e2':
  Remove some old kernel header cruft not needed with uapi.
This commit is contained in:
Elliott Hughes 2013-12-21 02:34:51 +00:00 committed by Android Git Automerger
commit a255bce6d2

View File

@ -44,9 +44,7 @@
#else #else
/* For 32-bit, we're stuck with the definitions we already shipped, /* For 32-bit, we're stuck with the definitions we already shipped,
* even though they contain a sigset_t that's too small. */ * even though they contain a sigset_t that's too small. */
# define __ARCH_SI_UID_T __kernel_uid32_t /* TODO: 64-bit: remove this when we've switch 32-bit to uapi too. */
# include <linux/signal.h> # include <linux/signal.h>
# undef __ARCH_SI_UID_T
#endif #endif
__BEGIN_DECLS __BEGIN_DECLS