Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a41e9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: export length of os_hpmc vector
  parisc: fix kernel crash (protection id trap) when compiling ruby1.9
  parisc: Use DEFINE_SPINLOCK
  parisc: add uevent helper for parisc bus
  parisc: fix ipv6 checksum
  parisc: quiet palo not-found message from "which"
  parisc: Replace NR_CPUS in parisc code
  parisc: trivial fixes
  parisc: fix braino in commit adding __space_to_prot
  parisc: factor out sid to protid conversion
  parisc: use leX_to_cpu in place of __fswabX
  parisc: fix GFP_KERNEL use while atomic in unwinder
  parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
  parisc: set_time() catch errors
  parisc: use the new byteorder headers
  parisc: drivers/parisc/: make code static
  parisc: lib/: make code static
parents d9e8a3a5 ae16489e

arch/parisc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ libs-y += arch/parisc/lib/ `$(CC) -print-libgcc-file-name` 


drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/



PALO := $(shell if which palo; then : ; \

PALO := $(shell if (which palo 2>&1); then : ; \

	elif [ -x /sbin/palo ]; then echo /sbin/palo; \

	fi)

arch/parisc/include/asm/byteorder.h

+12 −25
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ 
#include <asm/types.h>

#include <linux/compiler.h>



#ifdef __GNUC__

#define __BIG_ENDIAN

#define __SWAB_64_THRU_32__



static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)

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 */
@@ -14,8 +15,9 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x) 
		: "0" (x));

	return x;

}

#define __arch_swab16 __arch_swab16



static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)

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 */
@@ -25,7 +27,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x) 
	return x;

}



static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

static inline __attribute_const__ __u32 __arch_swab32(__u32 x)

{

	unsigned int temp;

	__asm__("shd %0, %0, 16, %1\n\t"	/* shift abcdabcd -> cdab */
@@ -35,7 +37,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) 
		: "0" (x));

	return x;

}



#define __arch_swab32 __arch_swab32



#if BITS_PER_LONG > 32

/*
@@ -48,7 +50,8 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) 
**      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) {

static inline __attribute_const__ __u64 __arch_swab64(__u64 x)

{

	__u64 temp;

	__asm__("permh,3210 %0, %0\n\t"

		"hshl %0, 8, %1\n\t"
@@ -58,25 +61,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) { 
		: "0" (x));

	return x;

}

#define __arch__swab64(x) ___arch__swab64(x)

#define __BYTEORDER_HAS_U64__

#elif !defined(__STRICT_ANSI__)

static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)

{

	__u32 t1 = ___arch__swab32((__u32) x);

	__u32 t2 = ___arch__swab32((__u32) (x >> 32));

	return (((__u64) t1 << 32) | t2);

}

#define __arch__swab64(x) ___arch__swab64(x)

#define __BYTEORDER_HAS_U64__

#endif



#define __arch__swab16(x) ___arch__swab16(x)

#define __arch__swab24(x) ___arch__swab24(x)

#define __arch__swab32(x) ___arch__swab32(x)



#endif /* __GNUC__ */

#define __arch_swab64 __arch_swab64

#endif /* BITS_PER_LONG > 32 */



#include <linux/byteorder/big_endian.h>

#include <linux/byteorder.h>



#endif /* _PARISC_BYTEORDER_H */

arch/parisc/include/asm/checksum.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 
#endif

	: "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len)

	: "0" (sum), "1" (saddr), "2" (daddr), "3" (len), "r" (proto)

	: "r19", "r20", "r21", "r22");

	: "r19", "r20", "r21", "r22", "memory");

	return csum_fold(sum);

}

arch/parisc/include/asm/io.h

+3 −9
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 
#include <linux/types.h>

#include <asm/pgtable.h>



extern unsigned long parisc_vmerge_boundary;

extern unsigned long parisc_vmerge_max_size;



#define BIO_VMERGE_BOUNDARY	parisc_vmerge_boundary

#define BIO_VMERGE_MAX_SIZE	parisc_vmerge_max_size



#define virt_to_phys(a) ((unsigned long)__pa(a))

#define phys_to_virt(a) __va(a)

#define virt_to_bus virt_to_phys
@@ -182,9 +176,9 @@ static inline void __raw_writeq(unsigned long long b, volatile void __iomem *add 


/* readb can never be const, so use __fswab instead of le*_to_cpu */

#define readb(addr) __raw_readb(addr)

#define readw(addr) __fswab16(__raw_readw(addr))

#define readl(addr) __fswab32(__raw_readl(addr))

#define readq(addr) __fswab64(__raw_readq(addr))

#define readw(addr) le16_to_cpu(__raw_readw(addr))

#define readl(addr) le32_to_cpu(__raw_readl(addr))

#define readq(addr) le64_to_cpu(__raw_readq(addr))

#define writeb(b, addr) __raw_writeb(b, addr)

#define writew(b, addr) __raw_writew(cpu_to_le16(b), addr)

#define writel(b, addr) __raw_writel(cpu_to_le32(b), addr)

arch/parisc/include/asm/mmu_context.h

+9 −4
Original line number Diff line number Diff line
@@ -34,16 +34,21 @@ destroy_context(struct mm_struct *mm) 
	mm->context = 0;

}



static inline void load_context(mm_context_t context)

static inline unsigned long __space_to_prot(mm_context_t context)

{

	mtsp(context, 3);

#if SPACEID_SHIFT == 0

	mtctl(context << 1,8);

	return context << 1;

#else

	mtctl(context >> (SPACEID_SHIFT - 1),8);

	return context >> (SPACEID_SHIFT - 1);

#endif

}



static inline void load_context(mm_context_t context)

{

	mtsp(context, 3);

	mtctl(__space_to_prot(context), 8);

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)

{