[kernel] r13108 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Sun Mar 15 09:07:29 2009
New Revision: 13108

Log:
Add patch "mips: introduce asm/swab.h" (closes: #519761).


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/introduce-swab.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Mar 15 09:07:29 2009
@@ -3,6 +3,7 @@
   [ Martin Michlmayr ]
   * CONFIG_BLK_DEV_IDE was renamed to CONFIG_IDE_GD upstream.  Update all
     configs accordingly.
+  * Add patch "mips: introduce asm/swab.h" (closes: #519761).
 
   [ Bastian Blank ]
   * Add stable release 2.6.28.7: (closes: #517347)

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/introduce-swab.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/introduce-swab.patch	Sun Mar 15 09:07:29 2009
@@ -0,0 +1,150 @@
+From: Harvey Harrison <harvey.harrison at gmail.com>
+Date: Tue, 6 Jan 2009 22:56:23 +0000 (-0800)
+Subject: mips: introduce asm/swab.h
+X-Git-Tag: v2.6.29-rc1~217
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8cdd3a9261e8efe36aeb6c708edb76d7e2b5d13f
+
+mips: introduce asm/swab.h
+
+Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
+index 7897f05..023866c 100644
+--- a/arch/mips/include/asm/Kbuild
++++ b/arch/mips/include/asm/Kbuild
+@@ -1,3 +1,4 @@
+ include include/asm-generic/Kbuild.asm
+ 
+ header-y += cachectl.h sgidefs.h sysmips.h
++header-y += swab.h
+diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h
+index 33790b9..607b718 100644
+--- a/arch/mips/include/asm/byteorder.h
++++ b/arch/mips/include/asm/byteorder.h
+@@ -8,60 +8,14 @@
+ #ifndef _ASM_BYTEORDER_H
+ #define _ASM_BYTEORDER_H
+ 
+-#include <linux/compiler.h>
+-#include <asm/types.h>
++#include <asm/swab.h>
+ 
+ #if defined(__MIPSEB__)
+-# define __BIG_ENDIAN
++#include <linux/byteorder/big_endian.h>
+ #elif defined(__MIPSEL__)
+-# define __LITTLE_ENDIAN
++#include <linux/byteorder/little_endian.h>
+ #else
+ # error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
+ #endif
+ 
+-#define __SWAB_64_THRU_32__
+-
+-#ifdef CONFIG_CPU_MIPSR2
+-
+-static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
+-{
+-	__asm__(
+-	"	wsbh	%0, %1			\n"
+-	: "=r" (x)
+-	: "r" (x));
+-
+-	return x;
+-}
+-#define __arch_swab16 __arch_swab16
+-
+-static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
+-{
+-	__asm__(
+-	"	wsbh	%0, %1			\n"
+-	"	rotr	%0, %0, 16		\n"
+-	: "=r" (x)
+-	: "r" (x));
+-
+-	return x;
+-}
+-#define __arch_swab32 __arch_swab32
+-
+-#ifdef CONFIG_CPU_MIPS64_R2
+-static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
+-{
+-	__asm__(
+-	"	dsbh	%0, %1\n"
+-	"	dshd	%0, %0"
+-	: "=r" (x)
+-	: "r" (x));
+-
+-	return x;
+-}
+-#define __arch_swab64 __arch_swab64
+-#endif /* CONFIG_CPU_MIPS64_R2 */
+-
+-#endif /* CONFIG_CPU_MIPSR2 */
+-
+-#include <linux/byteorder.h>
+-
+ #endif /* _ASM_BYTEORDER_H */
+diff --git a/arch/mips/include/asm/swab.h b/arch/mips/include/asm/swab.h
+new file mode 100644
+index 0000000..88f1f7d
+--- /dev/null
++++ b/arch/mips/include/asm/swab.h
+@@ -0,0 +1,55 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 1996, 99, 2003 by Ralf Baechle
++ */
++#ifndef _ASM_SWAB_H
++#define _ASM_SWAB_H
++
++#include <linux/compiler.h>
++#include <asm/types.h>
++
++#define __SWAB_64_THRU_32__
++
++#ifdef CONFIG_CPU_MIPSR2
++
++static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
++{
++	__asm__(
++	"	wsbh	%0, %1			\n"
++	: "=r" (x)
++	: "r" (x));
++
++	return x;
++}
++#define __arch_swab16 __arch_swab16
++
++static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
++{
++	__asm__(
++	"	wsbh	%0, %1			\n"
++	"	rotr	%0, %0, 16		\n"
++	: "=r" (x)
++	: "r" (x));
++
++	return x;
++}
++#define __arch_swab32 __arch_swab32
++
++#ifdef CONFIG_CPU_MIPS64_R2
++static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
++{
++	__asm__(
++	"	dsbh	%0, %1\n"
++	"	dshd	%0, %0"
++	: "=r" (x)
++	: "r" (x));
++
++	return x;
++}
++#define __arch_swab64 __arch_swab64
++#endif /* CONFIG_CPU_MIPS64_R2 */
++#endif /* CONFIG_CPU_MIPSR2 */
++#endif /* _ASM_SWAB_H */

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2	Sun Mar 15 09:07:29 2009
@@ -1,6 +1,8 @@
 + debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
 + features/all/drivers-net-acenic-firmwar_request.patch
 
++ bugfix/mips/introduce-swab.patch
+
 + bugfix/all/stable/2.6.28.7.patch
 
 # m68k patches
@@ -151,3 +153,4 @@
 + bugfix/m68k/2.6.28/0002-m68k-wire-up-sys_restart_syscall.patch arch=m68k
 
 # end m68k
+