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

Commit 710675d3 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] Move psw_set_key.
  [S390] Add oops_enter()/oops_exit() calls to die().
  [S390] Print list of modules on die().
  [S390] Fix yet another two section mismatches.
  [S390] Fix zfcpdump header
  [S390] Missing blank when appending cio_ignore kernel parameter
parents a289bbe2 dc74d7f9

arch/s390/appldata/appldata_base.c

+2 −3
Original line number Diff line number Diff line
@@ -535,8 +535,7 @@ void appldata_unregister_ops(struct appldata_ops *ops) 


/******************************* init / exit *********************************/



static void

appldata_online_cpu(int cpu)

static void __cpuinit appldata_online_cpu(int cpu)

{

	init_virt_timer(&per_cpu(appldata_timer, cpu));

	per_cpu(appldata_timer, cpu).function = appldata_timer_function;
@@ -580,7 +579,7 @@ appldata_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block appldata_nb = {

static struct notifier_block __cpuinitdata appldata_nb = {

	.notifier_call = appldata_cpu_notify,

};

arch/s390/kernel/entry.S

+7 −1
Original line number Diff line number Diff line
@@ -769,10 +769,13 @@ mcck_return: 


	RESTORE_ALL __LC_RETURN_MCCK_PSW,0



#ifdef CONFIG_SMP

/*

 * Restart interruption handler, kick starter for additional CPUs

 */

#ifdef CONFIG_SMP

#ifndef CONFIG_HOTPLUG_CPU

	.section .init.text,"ax"

#endif

	.globl restart_int_handler

restart_int_handler:

	l	%r15,__LC_SAVE_AREA+60	# load ksp
@@ -785,6 +788,9 @@ restart_int_handler: 
	br	%r14			# branch to start_secondary

restart_addr:

	.long	start_secondary

#ifndef CONFIG_HOTPLUG_CPU

	.previous

#endif

#else

/*

 * If we do not run with SMP enabled, let the new CPU crash ...

arch/s390/kernel/entry64.S

+7 −1
Original line number Diff line number Diff line
@@ -745,10 +745,13 @@ mcck_return: 
#endif

	lpswe	__LC_RETURN_MCCK_PSW	# back to caller



#ifdef CONFIG_SMP

/*

 * Restart interruption handler, kick starter for additional CPUs

 */

#ifdef CONFIG_SMP

#ifndef CONFIG_HOTPLUG_CPU

	.section .init.text,"ax"

#endif

	.globl restart_int_handler

restart_int_handler:

	lg	%r15,__LC_SAVE_AREA+120 # load ksp
@@ -759,6 +762,9 @@ restart_int_handler: 
	lmg	%r6,%r15,__SF_GPRS(%r15) # load registers from clone

	stosm	__SF_EMPTY(%r15),0x04	# now we can turn dat on

	jg	start_secondary

#ifndef CONFIG_HOTPLUG_CPU

	.previous

#endif

#else

/*

 * If we do not run with SMP enabled, let the new CPU crash ...

arch/s390/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ static void __init setup_zfcpdump(unsigned int console_devno) 
	else

		sprintf(str, "cio_ignore=all,!0.0.%04x",

			ipl_info.data.fcp.dev_id.devno);

	strcat(COMMAND_LINE, " ");

	strcat(COMMAND_LINE, str);

	console_loglevel = 2;

}

arch/s390/kernel/traps.c

+6 −3
Original line number Diff line number Diff line
@@ -253,11 +253,13 @@ void die(const char * str, struct pt_regs * regs, long err) 
{

	static int die_counter;



	oops_enter();

	debug_stop_all();

	console_verbose();

	spin_lock_irq(&die_lock);

	bust_spinlocks(1);

	printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);

	print_modules();

	show_regs(regs);

	bust_spinlocks(0);

	spin_unlock_irq(&die_lock);
@@ -265,6 +267,7 @@ void die(const char * str, struct pt_regs * regs, long err) 
		panic("Fatal exception in interrupt");

	if (panic_on_oops)

		panic("Fatal exception: panic_on_oops");

	oops_exit();

	do_exit(SIGSEGV);

}