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

Commit 8ee78c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches from Heiko Carstens:
 "A couple of s390 patches for the 3.5 merge window.  Just a collection
  of bug fixes and cleanups."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uaccess: fix access_ok compile warnings
  s390/cmpxchg: select HAVE_CMPXCHG_LOCAL option
  s390/cmpxchg: fix sign extension bugs
  s390/cmpxchg: fix 1 and 2 byte memory accesses
  s390/cmpxchg: fix compile warnings specific to s390
  s390/cmpxchg: add missing memory barrier to cmpxchg64
  s390/cpu: remove cpu "capabilities" sysfs attribute
  s390/kernel: Fix smp_call_ipl_cpu() for offline CPUs
  s390/kernel: Introduce memcpy_absolute() function
  s390/headers: replace __s390x__ with CONFIG_64BIT where possible
  s390/headers: remove #ifdef __KERNEL__ from not exported headers
  s390/irq: split irq stats for cpu-measurement alert facilities
  s390/kexec: Move early_pgm_check_handler() to text section
  s390/kdump: Use real mode for PSW restart and kexec
  s390/kdump: Account /sys/kernel/kexec_crash_size changes in OS info
  s390/kernel: Remove OS info init function call and diag 308 for kdump
parents aac422af 491af990

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ config S390 
	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_CMPXCHG_LOCAL

	select ARCH_DISCARD_MEMBLOCK

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

arch/s390/include/asm/bitops.h

+8 −13
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 *

 */



#ifdef __KERNEL__



#ifndef _LINUX_BITOPS_H

#error only <linux/bitops.h> can be included directly

#endif
@@ -63,7 +61,7 @@ extern const char _ni_bitmap[]; 
extern const char _zb_findmap[];

extern const char _sb_findmap[];



#ifndef __s390x__

#ifndef CONFIG_64BIT



#define __BITOPS_ALIGN		3

#define __BITOPS_WORDSIZE	32
@@ -83,7 +81,7 @@ extern const char _sb_findmap[]; 
		: "d" (__val), "Q" (*(unsigned long *) __addr)	\

		: "cc");



#else /* __s390x__ */

#else /* CONFIG_64BIT */



#define __BITOPS_ALIGN		7

#define __BITOPS_WORDSIZE	64
@@ -103,7 +101,7 @@ extern const char _sb_findmap[]; 
		: "d" (__val), "Q" (*(unsigned long *) __addr)	\

		: "cc");



#endif /* __s390x__ */

#endif /* CONFIG_64BIT */



#define __BITOPS_WORDS(bits) (((bits)+__BITOPS_WORDSIZE-1)/__BITOPS_WORDSIZE)

#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
@@ -412,7 +410,7 @@ static inline unsigned long __ffz_word_loop(const unsigned long *addr, 
	unsigned long bytes = 0;



	asm volatile(

#ifndef __s390x__

#ifndef CONFIG_64BIT

		"	ahi	%1,-1\n"

		"	sra	%1,5\n"

		"	jz	1f\n"
@@ -449,7 +447,7 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr, 
	unsigned long bytes = 0;



	asm volatile(

#ifndef __s390x__

#ifndef CONFIG_64BIT

		"	ahi	%1,-1\n"

		"	sra	%1,5\n"

		"	jz	1f\n"
@@ -481,7 +479,7 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr, 
 */

static inline unsigned long __ffz_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

#ifdef CONFIG_64BIT

	if ((word & 0xffffffff) == 0xffffffff) {

		word >>= 32;

		nr += 32;
@@ -505,7 +503,7 @@ static inline unsigned long __ffz_word(unsigned long nr, unsigned long word) 
 */

static inline unsigned long __ffs_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

#ifdef CONFIG_64BIT

	if ((word & 0xffffffff) == 0) {

		word >>= 32;

		nr += 32;
@@ -546,7 +544,7 @@ static inline unsigned long __load_ulong_le(const unsigned long *p, 
	unsigned long word;



	p = (unsigned long *)((unsigned long) p + offset);

#ifndef __s390x__

#ifndef CONFIG_64BIT

	asm volatile(

		"	ic	%0,%O1(%R1)\n"

		"	icm	%0,2,%O1+1(%R1)\n"
@@ -834,7 +832,4 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size, 


#include <asm-generic/bitops/ext2-atomic-setbit.h>





#endif /* __KERNEL__ */



#endif /* _S390_BITOPS_H */

arch/s390/include/asm/cio.h

+0 −4
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#include <linux/spinlock.h>

#include <asm/types.h>



#ifdef __KERNEL__



#define LPM_ANYPATH 0xff

#define __MAX_CSSID 0
@@ -291,5 +289,3 @@ int chsc_sstpc(void *page, unsigned int op, u16 ctrl); 
int chsc_sstpi(void *page, void *result, size_t size);



#endif
 


#endif

arch/s390/include/asm/cmpxchg.h

+36 −18
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline unsigned long __xchg(unsigned long x, void *ptr, int size) 
			"	cs	%0,0,%4\n"

			"	jl	0b\n"

			: "=&d" (old), "=Q" (*(int *) addr)

			: "d" (x << shift), "d" (~(255 << shift)),

			: "d" ((x & 0xff) << shift), "d" (~(0xff << shift)),

			  "Q" (*(int *) addr) : "memory", "cc", "0");

		return old >> shift;

	case 2:
@@ -44,7 +44,7 @@ static inline unsigned long __xchg(unsigned long x, void *ptr, int size) 
			"	cs	%0,0,%4\n"

			"	jl	0b\n"

			: "=&d" (old), "=Q" (*(int *) addr)

			: "d" (x << shift), "d" (~(65535 << shift)),

			: "d" ((x & 0xffff) << shift), "d" (~(0xffff << shift)),

			  "Q" (*(int *) addr) : "memory", "cc", "0");

		return old >> shift;

	case 4:
@@ -113,9 +113,10 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old, 
			"	nr	%1,%5\n"

			"	jnz	0b\n"

			"1:"

			: "=&d" (prev), "=&d" (tmp), "=Q" (*(int *) ptr)

			: "d" (old << shift), "d" (new << shift),

			  "d" (~(255 << shift)), "Q" (*(int *) ptr)

			: "=&d" (prev), "=&d" (tmp), "+Q" (*(int *) addr)

			: "d" ((old & 0xff) << shift),

			  "d" ((new & 0xff) << shift),

			  "d" (~(0xff << shift))

			: "memory", "cc");

		return prev >> shift;

	case 2:
@@ -134,9 +135,10 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old, 
			"	nr	%1,%5\n"

			"	jnz	0b\n"

			"1:"

			: "=&d" (prev), "=&d" (tmp), "=Q" (*(int *) ptr)

			: "d" (old << shift), "d" (new << shift),

			  "d" (~(65535 << shift)), "Q" (*(int *) ptr)

			: "=&d" (prev), "=&d" (tmp), "+Q" (*(int *) addr)

			: "d" ((old & 0xffff) << shift),

			  "d" ((new & 0xffff) << shift),

			  "d" (~(0xffff << shift))

			: "memory", "cc");

		return prev >> shift;

	case 4:
@@ -161,8 +163,13 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old, 
}



#define cmpxchg(ptr, o, n)						 \

	((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o),	\

				       (unsigned long)(n), sizeof(*(ptr))))

({									 \

	__typeof__(*(ptr)) __ret;					 \

	__ret = (__typeof__(*(ptr)))					 \

		__cmpxchg((ptr), (unsigned long)(o), (unsigned long)(n), \

			  sizeof(*(ptr)));				 \

	__ret;								 \

})



#ifdef CONFIG_64BIT

#define cmpxchg64(ptr, o, n)						\
@@ -181,13 +188,19 @@ static inline unsigned long long __cmpxchg64(void *ptr, 
		"	cds	%0,%2,%1"

		: "+&d" (rp_old), "=Q" (ptr)

		: "d" (rp_new), "Q" (ptr)

		: "cc");

		: "memory", "cc");

	return rp_old.pair;

}



#define cmpxchg64(ptr, o, n)				\

	((__typeof__(*(ptr)))__cmpxchg64((ptr),				\

({							\

	__typeof__(*(ptr)) __ret;			\

	__ret = (__typeof__(*(ptr)))			\

		__cmpxchg64((ptr),			\

			    (unsigned long long)(o),	\

					 (unsigned long long)(n)))

			    (unsigned long long)(n));	\

	__ret;						\

})

#endif /* CONFIG_64BIT */



#include <asm-generic/cmpxchg-local.h>
@@ -216,8 +229,13 @@ static inline unsigned long __cmpxchg_local(void *ptr, 
 * them available.

 */

#define cmpxchg_local(ptr, o, n)					\

	((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o),	\

			(unsigned long)(n), sizeof(*(ptr))))

({									\

	__typeof__(*(ptr)) __ret;					\

	__ret = (__typeof__(*(ptr)))					\

		__cmpxchg_local((ptr), (unsigned long)(o),		\

				(unsigned long)(n), sizeof(*(ptr)));	\

	__ret;								\

})



#define cmpxchg64_local(ptr, o, n)	cmpxchg64((ptr), (o), (n))

arch/s390/include/asm/cputime.h

+5 −5
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ typedef unsigned long long __nocast cputime64_t; 


static inline unsigned long __div(unsigned long long n, unsigned long base)

{

#ifndef __s390x__

#ifndef CONFIG_64BIT

	register_pair rp;



	rp.pair = n >> 1;

	asm ("dr %0,%1" : "+d" (rp) : "d" (base >> 1));

	return rp.subreg.odd;

#else /* __s390x__ */

#else /* CONFIG_64BIT */

	return n / base;

#endif /* __s390x__ */

#endif /* CONFIG_64BIT */

}



#define cputime_one_jiffy		jiffies_to_cputime(1)
@@ -100,7 +100,7 @@ static inline void cputime_to_timespec(const cputime_t cputime, 
				       struct timespec *value)

{

	unsigned long long __cputime = (__force unsigned long long) cputime;

#ifndef __s390x__

#ifndef CONFIG_64BIT

	register_pair rp;



	rp.pair = __cputime >> 1;
@@ -128,7 +128,7 @@ static inline void cputime_to_timeval(const cputime_t cputime, 
				      struct timeval *value)

{

	unsigned long long __cputime = (__force unsigned long long) cputime;

#ifndef __s390x__

#ifndef CONFIG_64BIT

	register_pair rp;



	rp.pair = __cputime >> 1;