From d2859c6a1145fe6053d9642ad8625609b873965d Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 13 Mar 2013 14:59:45 -0700
Subject: [PATCH] --- yaml --- r: 361294 b: refs/heads/master c:
 51b154ed5289682364b830858a4a1ca47fcd04e7 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/uapi/linux/aio_abi.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aea6103b32ab..e8bad8a191be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97da55fcec6e3898f50010a6847dfa64f7c085e6
+refs/heads/master: 51b154ed5289682364b830858a4a1ca47fcd04e7
diff --git a/trunk/include/uapi/linux/aio_abi.h b/trunk/include/uapi/linux/aio_abi.h
index 86fa7a71336a..bb2554f7fbd1 100644
--- a/trunk/include/uapi/linux/aio_abi.h
+++ b/trunk/include/uapi/linux/aio_abi.h
@@ -62,9 +62,9 @@ struct io_event {
 	__s64		res2;		/* secondary result */
 };
 
-#if defined(__LITTLE_ENDIAN)
+#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
 #define PADDED(x,y)	x, y
-#elif defined(__BIG_ENDIAN)
+#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
 #define PADDED(x,y)	y, x
 #else
 #error edit for your odd byteorder.