From 310b6334b8210354ec01758ab0f43b9a36db05c2 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 May 2010 08:30:15 -0700
Subject: [PATCH] --- yaml --- r: 198634 b: refs/heads/master c:
 13da9e200fe4740b02cd51e07ab454627e228920 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/alpha/math-emu/sfp-util.h          | 5 +++++
 trunk/arch/powerpc/include/asm/sfp-machine.h  | 6 ++++++
 trunk/arch/s390/include/asm/sfp-util.h        | 2 ++
 trunk/arch/sh/math-emu/sfp-util.h             | 4 ++++
 trunk/arch/sparc/math-emu/sfp-util_32.h       | 6 ++++++
 trunk/arch/sparc/math-emu/sfp-util_64.h       | 6 ++++++
 trunk/arch/x86/boot/compressed/relocs.c       | 4 ++--
 trunk/include/linux/byteorder/big_endian.h    | 3 ---
 trunk/include/linux/byteorder/little_endian.h | 3 ---
 10 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b26a0f4c1c10..4bf33fd09984 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e89e8f61bcdff82a7b63b80ed83a6725028d61b
+refs/heads/master: 13da9e200fe4740b02cd51e07ab454627e228920
diff --git a/trunk/arch/alpha/math-emu/sfp-util.h b/trunk/arch/alpha/math-emu/sfp-util.h
index d4c6ae7fee47..f53707f77455 100644
--- a/trunk/arch/alpha/math-emu/sfp-util.h
+++ b/trunk/arch/alpha/math-emu/sfp-util.h
@@ -28,3 +28,8 @@ extern unsigned long __udiv_qrnnd (unsigned long *, unsigned long,
 #define UDIV_NEEDS_NORMALIZATION 1  
 
 #define abort()			goto bad_insn
+
+#ifndef __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN -1
+#endif
+#define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/trunk/arch/powerpc/include/asm/sfp-machine.h b/trunk/arch/powerpc/include/asm/sfp-machine.h
index 8b8fab91ad1e..3a7a67a0d006 100644
--- a/trunk/arch/powerpc/include/asm/sfp-machine.h
+++ b/trunk/arch/powerpc/include/asm/sfp-machine.h
@@ -353,6 +353,12 @@
 #define abort()								\
 	return 0
 
+#ifdef __BIG_ENDIAN
+#define __BYTE_ORDER __BIG_ENDIAN
+#else
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
+
 /* Exception flags. */
 #define EFLAG_INVALID		(1 << (31 - 2))
 #define EFLAG_OVERFLOW		(1 << (31 - 3))
diff --git a/trunk/arch/s390/include/asm/sfp-util.h b/trunk/arch/s390/include/asm/sfp-util.h
index 7d43fee17e32..0addc6466d95 100644
--- a/trunk/arch/s390/include/asm/sfp-util.h
+++ b/trunk/arch/s390/include/asm/sfp-util.h
@@ -73,3 +73,5 @@ extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int,
 #define UDIV_NEEDS_NORMALIZATION 0
 
 #define abort() return 0
+
+#define __BYTE_ORDER __BIG_ENDIAN
diff --git a/trunk/arch/sh/math-emu/sfp-util.h b/trunk/arch/sh/math-emu/sfp-util.h
index e8526021892f..8ae1bd310ad0 100644
--- a/trunk/arch/sh/math-emu/sfp-util.h
+++ b/trunk/arch/sh/math-emu/sfp-util.h
@@ -66,3 +66,7 @@
   } while (0)
 
 #define abort()	return 0
+
+#define __BYTE_ORDER __LITTLE_ENDIAN
+
+
diff --git a/trunk/arch/sparc/math-emu/sfp-util_32.h b/trunk/arch/sparc/math-emu/sfp-util_32.h
index 0ea35afbb914..d1b2aff3c259 100644
--- a/trunk/arch/sparc/math-emu/sfp-util_32.h
+++ b/trunk/arch/sparc/math-emu/sfp-util_32.h
@@ -107,3 +107,9 @@
 
 #define abort()								\
 	return 0
+
+#ifdef __BIG_ENDIAN
+#define __BYTE_ORDER __BIG_ENDIAN
+#else
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
diff --git a/trunk/arch/sparc/math-emu/sfp-util_64.h b/trunk/arch/sparc/math-emu/sfp-util_64.h
index d17c9bc72181..425d3cf01af4 100644
--- a/trunk/arch/sparc/math-emu/sfp-util_64.h
+++ b/trunk/arch/sparc/math-emu/sfp-util_64.h
@@ -112,3 +112,9 @@
 
 #define abort() \
 	return 0
+
+#ifdef __BIG_ENDIAN
+#define __BYTE_ORDER __BIG_ENDIAN
+#else
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#endif
diff --git a/trunk/arch/x86/boot/compressed/relocs.c b/trunk/arch/x86/boot/compressed/relocs.c
index 7b1aaa20c7b5..89bbf4e4d05d 100644
--- a/trunk/arch/x86/boot/compressed/relocs.c
+++ b/trunk/arch/x86/boot/compressed/relocs.c
@@ -195,11 +195,11 @@ static const char *sym_name(const char *sym_strtab, Elf32_Sym *sym)
 
 
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 #define le16_to_cpu(val) (val)
 #define le32_to_cpu(val) (val)
 #endif
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
 #define le16_to_cpu(val) bswap_16(val)
 #define le32_to_cpu(val) bswap_32(val)
 #endif
diff --git a/trunk/include/linux/byteorder/big_endian.h b/trunk/include/linux/byteorder/big_endian.h
index d53a67dff018..3c80fd7e8b56 100644
--- a/trunk/include/linux/byteorder/big_endian.h
+++ b/trunk/include/linux/byteorder/big_endian.h
@@ -7,9 +7,6 @@
 #ifndef __BIG_ENDIAN_BITFIELD
 #define __BIG_ENDIAN_BITFIELD
 #endif
-#ifndef __BYTE_ORDER
-#define __BYTE_ORDER __BIG_ENDIAN
-#endif
 
 #include <linux/types.h>
 #include <linux/swab.h>
diff --git a/trunk/include/linux/byteorder/little_endian.h b/trunk/include/linux/byteorder/little_endian.h
index f7f8ad13adb6..83195fb82962 100644
--- a/trunk/include/linux/byteorder/little_endian.h
+++ b/trunk/include/linux/byteorder/little_endian.h
@@ -7,9 +7,6 @@
 #ifndef __LITTLE_ENDIAN_BITFIELD
 #define __LITTLE_ENDIAN_BITFIELD
 #endif
-#ifndef __BYTE_ORDER
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
 
 #include <linux/types.h>
 #include <linux/swab.h>