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

Commit 35337c83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] ap: Setup timer for sending messages after reset.
  [S390] cio: fix chsc_chp_vary
  [S390] cio: provide fake irb for transport mode IO
  [S390] cio: disallow driver io for known to be broken paths
  [S390] hibernate: directly trigger subchannel evaluation
  [S390] remove reset of system call restart on psw changes
  [S390] add missing .set function for NT_S390_LAST_BREAK regset
  [S390] fix page change underindication in pgste_update_all
  [S390] ptrace inferior call interactions with TIF_SYSCALL
  [S390] kdump: Replace is_kdump_kernel() with OLDMEM_BASE check
parents 8c9b0434 75464960

arch/s390/include/asm/pgtable.h

+4 −4
Original line number Diff line number Diff line
@@ -599,10 +599,10 @@ static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste) 
	skey = page_get_storage_key(address);

	bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);

	/* Clear page changed & referenced bit in the storage key */

	if (bits) {

		skey ^= bits;

		page_set_storage_key(address, skey, 1);

	}

	if (bits & _PAGE_CHANGED)

		page_set_storage_key(address, skey ^ bits, 1);

	else if (bits)

		page_reset_referenced(address);

	/* Transfer page changed & referenced bit to guest bits in pgste */

	pgste_val(pgste) |= bits << 48;		/* RCP_GR_BIT & RCP_GC_BIT */

	/* Get host changed & referenced bits from pgste */

arch/s390/kernel/ptrace.c

+18 −12
Original line number Diff line number Diff line
@@ -296,13 +296,6 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) 
		     ((data & PSW_MASK_EA) && !(data & PSW_MASK_BA))))

			/* Invalid psw mask. */

			return -EINVAL;

		if (addr == (addr_t) &dummy->regs.psw.addr)

			/*

			 * The debugger changed the instruction address,

			 * reset system call restart, see signal.c:do_signal

			 */

			task_thread_info(child)->system_call = 0;



		*(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr) = data;



	} else if (addr < (addr_t) (&dummy->regs.orig_gpr2)) {
@@ -614,11 +607,6 @@ static int __poke_user_compat(struct task_struct *child, 
			/* Transfer 31 bit amode bit to psw mask. */

			regs->psw.mask = (regs->psw.mask & ~PSW_MASK_BA) |

				(__u64)(tmp & PSW32_ADDR_AMODE);

			/*

			 * The debugger changed the instruction address,

			 * reset system call restart, see signal.c:do_signal

			 */

			task_thread_info(child)->system_call = 0;

		} else {

			/* gpr 0-15 */

			*(__u32*)((addr_t) &regs->psw + addr*2 + 4) = tmp;
@@ -905,6 +893,14 @@ static int s390_last_break_get(struct task_struct *target, 
	return 0;

}



static int s390_last_break_set(struct task_struct *target,

			       const struct user_regset *regset,

			       unsigned int pos, unsigned int count,

			       const void *kbuf, const void __user *ubuf)

{

	return 0;

}



#endif



static int s390_system_call_get(struct task_struct *target,
@@ -951,6 +947,7 @@ static const struct user_regset s390_regsets[] = { 
		.size = sizeof(long),

		.align = sizeof(long),

		.get = s390_last_break_get,

		.set = s390_last_break_set,

	},

#endif

	[REGSET_SYSTEM_CALL] = {
@@ -1116,6 +1113,14 @@ static int s390_compat_last_break_get(struct task_struct *target, 
	return 0;

}



static int s390_compat_last_break_set(struct task_struct *target,

				      const struct user_regset *regset,

				      unsigned int pos, unsigned int count,

				      const void *kbuf, const void __user *ubuf)

{

	return 0;

}



static const struct user_regset s390_compat_regsets[] = {

	[REGSET_GENERAL] = {

		.core_note_type = NT_PRSTATUS,
@@ -1139,6 +1144,7 @@ static const struct user_regset s390_compat_regsets[] = { 
		.size = sizeof(long),

		.align = sizeof(long),

		.get = s390_compat_last_break_get,

		.set = s390_compat_last_break_set,

	},

	[REGSET_SYSTEM_CALL] = {

		.core_note_type = NT_S390_SYSTEM_CALL,

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static unsigned long __init find_crash_base(unsigned long crash_size, 
		*msg = "first memory chunk must be at least crashkernel size";

		return 0;

	}

	if (is_kdump_kernel() && (crash_size == OLDMEM_SIZE))

	if (OLDMEM_BASE && crash_size == OLDMEM_SIZE)

		return OLDMEM_BASE;



	for (i = MEMORY_CHUNKS - 1; i >= 0; i--) {

arch/s390/kernel/signal.c

+3 −5
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ void do_signal(struct pt_regs *regs) 
						     regs->svc_code >> 16);

				break;

			}

		}

		/* No longer in a system call */

		clear_thread_flag(TIF_SYSCALL);

		}



		if ((is_compat_task() ?

		     handle_signal32(signr, &ka, &info, oldset, regs) :
@@ -486,6 +486,7 @@ void do_signal(struct pt_regs *regs) 
	}



	/* No handlers present - check for system call restart */

	clear_thread_flag(TIF_SYSCALL);

	if (current_thread_info()->system_call) {

		regs->svc_code = current_thread_info()->system_call;

		switch (regs->gprs[2]) {
@@ -500,9 +501,6 @@ void do_signal(struct pt_regs *regs) 
			regs->gprs[2] = regs->orig_gpr2;

			set_thread_flag(TIF_SYSCALL);

			break;

		default:

			clear_thread_flag(TIF_SYSCALL);

			break;

		}

	}

drivers/s390/cio/chsc.c

+2 −5
Original line number Diff line number Diff line
@@ -529,10 +529,7 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data) 
int chsc_chp_vary(struct chp_id chpid, int on)

{

	struct channel_path *chp = chpid_to_chp(chpid);

	struct chp_link link;



	memset(&link, 0, sizeof(struct chp_link));

	link.chpid = chpid;

	/* Wait until previous actions have settled. */

	css_wait_for_slow_path();

	/*
@@ -542,10 +539,10 @@ int chsc_chp_vary(struct chp_id chpid, int on) 
		/* Try to update the channel path descritor. */

		chsc_determine_base_channel_path_desc(chpid, &chp->desc);

		for_each_subchannel_staged(s390_subchannel_vary_chpid_on,

					   __s390_vary_chpid_on, &link);

					   __s390_vary_chpid_on, &chpid);

	} else

		for_each_subchannel_staged(s390_subchannel_vary_chpid_off,

					   NULL, &link);

					   NULL, &chpid);



	return 0;

}