The following changes since commit fe0bdec68b77020281dc814805edfe594ae89e0f:
Linus Torvalds (1):
Merge branch 'audit.b61' of git://git.kernel.org/.../viro/audit-current
are available in the git repository at:
/pub/scm/linux/kernel/git/kyle/parisc-2.6.git master
Adrian Bunk (2):
parisc: lib/: make code static
parisc: drivers/parisc/: make code static
FUJITA Tomonori (1):
parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
Harvey Harrison (1):
parisc: use the new byteorder headers
Helge Deller (4):
parisc: fix GFP_KERNEL use while atomic in unwinder
parisc: trivial fixes
parisc: Replace NR_CPUS in parisc code
parisc: add uevent helper for parisc bus
Julia Lawall (1):
parisc: Use DEFINE_SPINLOCK
Kyle McMartin (7):
parisc: use leX_to_cpu in place of __fswabX
parisc: factor out sid to protid conversion
parisc: fix braino in commit adding __space_to_prot
parisc: quiet palo not-found message from "which"
parisc: fix ipv6 checksum
parisc: fix kernel crash (protection id trap) when compiling ruby1.9
parisc: export length of os_hpmc vector
Roel Kluin (1):
parisc: set_time() catch errors
arch/parisc/Makefile | 2 +-
arch/parisc/include/asm/byteorder.h | 37 ++++++------------
arch/parisc/include/asm/checksum.h | 2 +-
arch/parisc/include/asm/io.h | 12 +----
arch/parisc/include/asm/mmu_context.h | 13 ++++--
arch/parisc/include/asm/processor.h | 4 +-
arch/parisc/include/asm/uaccess.h | 2 +
arch/parisc/kernel/drivers.c | 40 ++++++++++++++++---
arch/parisc/kernel/hpmc.S | 8 +++-
arch/parisc/kernel/irq.c | 11 +++--
arch/parisc/kernel/pdc_cons.c | 2 +-
arch/parisc/kernel/perf.c | 4 +-
arch/parisc/kernel/processor.c | 68 +++++++++++++++++----------------
arch/parisc/kernel/setup.c | 11 +----
arch/parisc/kernel/smp.c | 32 +++++++--------
arch/parisc/kernel/time.c | 4 +-
arch/parisc/kernel/topology.c | 4 +-
arch/parisc/kernel/traps.c | 9 +++-
arch/parisc/kernel/unwind.c | 2 +-
arch/parisc/lib/iomap.c | 2 +-
arch/parisc/lib/memcpy.c | 2 +-
arch/parisc/mm/fault.c | 58 +++++++++++++++-------------
drivers/parisc/asp.c | 3 +-
drivers/parisc/ccio-dma.c | 4 +-
drivers/parisc/dino.c | 4 +-
drivers/parisc/hppb.c | 2 +-
drivers/parisc/lasi.c | 5 +-
drivers/parisc/lba_pci.c | 2 +-
drivers/parisc/sba_iommu.c | 9 +---
drivers/parisc/wax.c | 3 +-
drivers/rtc/rtc-parisc.c | 3 +-
31 files changed, 191 insertions(+), 173 deletions(-)
Fix for the linux/byteorder.h removal.
Signed-off-by: Harvey Harrison <[email protected]>
---
Linus, please apply after doing the parisc pull. cris is the only
arch still outstanding.
Done with git diff -M -B
Harvey
arch/parisc/include/asm/Kbuild | 1 +
arch/parisc/include/asm/byteorder.h | 76 ++--------------------
arch/parisc/include/asm/{byteorder.h => swab.h} | 9 +--
3 files changed, 11 insertions(+), 75 deletions(-)
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index f88b252..2121d99 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,3 +1,4 @@
include include/asm-generic/Kbuild.asm
unifdef-y += pdc.h
+unifdef-y += swab.h
diff --git a/arch/parisc/include/asm/byteorder.h b/arch/parisc/include/asm/byteorder.h
dissimilarity index 94%
index 83095c5..da66029 100644
--- a/arch/parisc/include/asm/byteorder.h
+++ b/arch/parisc/include/asm/byteorder.h
@@ -1,69 +1,7 @@
-#ifndef _PARISC_BYTEORDER_H
-#define _PARISC_BYTEORDER_H
-
-#include <asm/types.h>
-#include <linux/compiler.h>
-
-#define __BIG_ENDIAN
-#define __SWAB_64_THRU_32__
-
-static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
-{
- __asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
- "shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
- : "=r" (x)
- : "0" (x));
- return x;
-}
-#define __arch_swab16 __arch_swab16
-
-static inline __attribute_const__ __u32 __arch_swab24(__u32 x)
-{
- __asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
- "dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
- "shd %%r0, %0, 8, %0" /* shift 0000cbab -> 0cba */
- : "=r" (x)
- : "0" (x));
- return x;
-}
-
-static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
-{
- unsigned int temp;
- __asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
- "dep %1, 15, 8, %1\n\t" /* deposit cdab -> cbab */
- "shd %0, %1, 8, %0" /* shift abcdcbab -> dcba */
- : "=r" (x), "=&r" (temp)
- : "0" (x));
- return x;
-}
-#define __arch_swab32 __arch_swab32
-
-#if BITS_PER_LONG > 32
-/*
-** From "PA-RISC 2.0 Architecture", HP Professional Books.
-** See Appendix I page 8 , "Endian Byte Swapping".
-**
-** Pretty cool algorithm: (* == zero'd bits)
-** PERMH 01234567 -> 67452301 into %0
-** HSHL 67452301 -> 7*5*3*1* into %1
-** HSHR 67452301 -> *6*4*2*0 into %0
-** OR %0 | %1 -> 76543210 into %0 (all done!)
-*/
-static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
-{
- __u64 temp;
- __asm__("permh,3210 %0, %0\n\t"
- "hshl %0, 8, %1\n\t"
- "hshr,u %0, 8, %0\n\t"
- "or %1, %0, %0"
- : "=r" (x), "=&r" (temp)
- : "0" (x));
- return x;
-}
-#define __arch_swab64 __arch_swab64
-#endif /* BITS_PER_LONG > 32 */
-
-#include <linux/byteorder.h>
-
-#endif /* _PARISC_BYTEORDER_H */
+#ifndef _PARISC_BYTEORDER_H
+#define _PARISC_BYTEORDER_H
+
+#include <asm/swab.h>
+#include <linux/byteorder/big_endian.h>
+
+#endif /* _PARISC_BYTEORDER_H */
diff --git a/arch/parisc/include/asm/byteorder.h b/arch/parisc/include/asm/swab.h
similarity index 92%
rename from arch/parisc/include/asm/byteorder.h
rename to arch/parisc/include/asm/swab.h
index 83095c5..3ff16c5 100644
--- a/arch/parisc/include/asm/byteorder.h
+++ b/arch/parisc/include/asm/swab.h
@@ -1,10 +1,9 @@
-#ifndef _PARISC_BYTEORDER_H
-#define _PARISC_BYTEORDER_H
+#ifndef _PARISC_SWAB_H
+#define _PARISC_SWAB_H
#include <asm/types.h>
#include <linux/compiler.h>
-#define __BIG_ENDIAN
#define __SWAB_64_THRU_32__
static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
@@ -64,6 +63,4 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
#define __arch_swab64 __arch_swab64
#endif /* BITS_PER_LONG > 32 */
-#include <linux/byteorder.h>
-
-#endif /* _PARISC_BYTEORDER_H */
+#endif /* _PARISC_SWAB_H */
--
1.6.1.94.g9388