Commit fe1b4ba4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: Call cancel_halt_clear even when actl == 0.
  [S390] cio: Use path verification to check for path state.
  [S390] cio: Fix locking when calling notify function.
  [S390] Fixed handling of access register mode faults.
  [S390] dasd: Use default recovery for SNSS requests
  [S390] check_bugs() should be inline.
  [S390] tape: Compression overwrites crypto setting
  [S390] nss: disable kexec.
  [S390] reipl: move dump_prefix_page out of text section.
  [S390] smp: disable preemption in smp_call_function/smp_call_function_on
  [S390] kprobes breaks BUG_ON
parents ae5dd8e3 2470b648

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ config SHARED_KERNEL 
	  Select this option, if you want to share the text segment of the

	  Linux kernel between different VM guests. This reduces memory

	  usage with lots of guests but greatly increases kernel size.

	  Also if a kernel was IPL'ed from a shared segment the kexec system

	  call will not work.

	  You should only select this option if you know what you are

	  doing and want to exploit this feature.

arch/s390/kernel/head31.S

+8 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ startup_continue: 
	.long	.Lduct			# cr2: dispatchable unit control table

	.long	0			# cr3: instruction authorization

	.long	0			# cr4: instruction authorization

	.long	0xffffffff		# cr5: primary-aste origin

	.long	.Lduct			# cr5: primary-aste origin

	.long	0			# cr6:	I/O interrupts

	.long	0			# cr7:	secondary space segment table

	.long	0			# cr8:	access registers translation
@@ -132,8 +132,6 @@ startup_continue: 
	.long	0			# cr13: home space segment table

	.long	0xc0000000		# cr14: machine check handling off

	.long	0			# cr15: linkage stack operations

.Lduct:	.long	0,0,0,0,0,0,0,0

	.long	0,0,0,0,0,0,0,0

.Lpcfpu:.long	0x00080000,0x80000000 + .Lchkfpu

.Lpccsp:.long	0x00080000,0x80000000 + .Lchkcsp

.Lpcmvpg:.long	0x00080000,0x80000000 + .Lchkmvpg
@@ -147,6 +145,13 @@ startup_continue: 
.Linittu:   .long init_thread_union

.Lstartup_init:

	    .long startup_init

	.align	64

.Lduct:	.long	0,0,0,0,.Lduald,0,0,0

	.long	0,0,0,0,0,0,0,0

	.align	128

.Lduald:.rept	8

	.long	0x80000000,0,0,0	# invalid access-list entries

	.endr



	.org	0x12000

	.globl	_ehead

arch/s390/kernel/head64.S

+8 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ startup_continue: 
	.quad	.Lduct			# cr2: dispatchable unit control table

	.quad	0			# cr3: instruction authorization

	.quad	0			# cr4: instruction authorization

	.quad	0xffffffffffffffff	# cr5: primary-aste origin

	.quad	.Lduct			# cr5: primary-aste origin

	.quad	0			# cr6:	I/O interrupts

	.quad	0			# cr7:	secondary space segment table

	.quad	0			# cr8:	access registers translation
@@ -145,14 +145,19 @@ startup_continue: 
	.quad	0			# cr13: home space segment table

	.quad	0xc0000000		# cr14: machine check handling off

	.quad	0			# cr15: linkage stack operations

.Lduct: .long	0,0,0,0,0,0,0,0

	.long	0,0,0,0,0,0,0,0

.Lpcmsk:.quad	0x0000000180000000

.L4malign:.quad 0xffffffffffc00000

.Lscan2g:.quad	0x80000000 + 0x20000 - 8	# 2GB + 128K - 8

.Lnop:	.long	0x07000700

.Lparmaddr:

	.quad	PARMAREA

	.align	64

.Lduct: .long	0,0,0,0,.Lduald,0,0,0

	.long	0,0,0,0,0,0,0,0

	.align	128

.Lduald:.rept	8

	.long	0x80000000,0,0,0	# invalid access-list entries

	.endr



	.org	0x12000

	.globl	_ehead

arch/s390/kernel/ipl.c

+2 −2
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ static void do_reset_calls(void) 
		reset->fn();

}



extern __u32 dump_prefix_page;

u32 dump_prefix_page;



void s390_reset_system(void)

{
@@ -1078,7 +1078,7 @@ void s390_reset_system(void) 
	lc->panic_stack = S390_lowcore.panic_stack;



	/* Save prefix page address for dump case */

	dump_prefix_page = (unsigned long) lc;

	dump_prefix_page = (u32)(unsigned long) lc;



	/* Disable prefixing */

	set_prefix(0);

arch/s390/kernel/kprobes.c

+7 −14
Original line number Diff line number Diff line
@@ -337,21 +337,14 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
	}



	p = get_kprobe(addr);

	if (!p) {

		if (*addr != BREAKPOINT_INSTRUCTION) {

	if (!p)

		/*

			 * The breakpoint instruction was removed right

			 * after we hit it.  Another cpu has removed

			 * either a probepoint or a debugger breakpoint

			 * at this address.  In either case, no further

			 * handling of this interrupt is appropriate.

			 *

		 * No kprobe at this address. The fault has not been

		 * caused by a kprobe breakpoint. The race of breakpoint

		 * vs. kprobe remove does not exist because on s390 we

		 * use stop_machine_run to arm/disarm the breakpoints.

		 */

			ret = 1;

		}

		/* Not one of ours: let kernel handle it */

		goto no_kprobe;

	}



	kcb->kprobe_status = KPROBE_HIT_ACTIVE;

	set_current_kprobe(p, regs, kcb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE