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

Commit 5b58e21a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] optimize pagefaults a little
  [IA64] Fix section conflict of ia64_mlogbuf_finish
  [IA64] s/scalibility/scalability/
  [IA64] kdump on INIT needs multi-nodes sync-up (v.2)
  [IA64] wire up {signal,timer,event}fd syscalls
  [IA64] spelling fixes: arch/ia64/
parents 52ade9b3 576fe0bd

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static __init int setup_additional_cpus(char *s) 
early_param("additional_cpus", setup_additional_cpus);



/*

 * cpu_possible_map should be static, it cannot change as cpu's

 * cpu_possible_map should be static, it cannot change as CPUs

 * are onlined, or offlined. The reason is per-cpu data-structures

 * are allocated by some modules at init time, and dont expect to

 * do this dynamically on cpu arrival/departure.

arch/ia64/kernel/crash.c

+16 −8
Original line number Diff line number Diff line
@@ -156,23 +156,29 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) 
	if (!kdump_on_init)

		return NOTIFY_DONE;



	if (val != DIE_INIT_MONARCH_ENTER &&

	    val != DIE_INIT_SLAVE_ENTER &&

	if (val != DIE_INIT_MONARCH_LEAVE &&

	    val != DIE_INIT_SLAVE_LEAVE &&

	    val != DIE_INIT_MONARCH_PROCESS &&

	    val != DIE_MCA_RENDZVOUS_LEAVE &&

	    val != DIE_MCA_MONARCH_LEAVE)

		return NOTIFY_DONE;



	nd = (struct ia64_mca_notify_die *)args->err;

	/* Reason code 1 means machine check rendezous*/

	if ((val == DIE_INIT_MONARCH_ENTER || val == DIE_INIT_SLAVE_ENTER) &&

		 nd->sos->rv_rc == 1)

	/* Reason code 1 means machine check rendezvous*/

	if ((val == DIE_INIT_MONARCH_LEAVE || val == DIE_INIT_SLAVE_LEAVE

	    || val == DIE_INIT_MONARCH_PROCESS) && nd->sos->rv_rc == 1)

		return NOTIFY_DONE;



	switch (val) {

		case DIE_INIT_MONARCH_ENTER:

		case DIE_INIT_MONARCH_PROCESS:

			atomic_set(&kdump_in_progress, 1);

			*(nd->monarch_cpu) = -1;

			break;

		case DIE_INIT_MONARCH_LEAVE:

			machine_kdump_on_init();

			break;

		case DIE_INIT_SLAVE_ENTER:

		case DIE_INIT_SLAVE_LEAVE:

			if (atomic_read(&kdump_in_progress))

				unw_init_running(kdump_cpu_freeze, NULL);

			break;

		case DIE_MCA_RENDZVOUS_LEAVE:
@@ -215,8 +221,10 @@ static ctl_table sys_table[] = { 
static int

machine_crash_setup(void)

{

	/* be notified before default_monarch_init_process */

	static struct notifier_block kdump_init_notifier_nb = {

		.notifier_call = kdump_init_notifier,

		.priority = 1,

	};

	int ret;

	if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)

arch/ia64/kernel/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -1585,5 +1585,8 @@ sys_call_table: 
	data8 sys_getcpu

	data8 sys_epoll_pwait			// 1305

	data8 sys_utimensat

	data8 sys_signalfd

	data8 sys_timerfd

	data8 sys_eventfd



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

arch/ia64/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *	Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar

 *

 * This file contains the code used by various IRQ handling routines:

 * asking for different IRQ's should be done through these routines

 * asking for different IRQs should be done through these routines

 * instead of just grabbing them. Thus setups with different IRQ numbers

 * shouldn't result in any weird surprises, and installing new handlers

 * should be easier.
@@ -12,7 +12,7 @@ 
 * Copyright (C) Ashok Raj<ashok.raj@intel.com>, Intel Corporation 2004

 *

 * 4/14/2004: Added code to handle cpu migration and do safe irq

 *			migration without lossing interrupts for iosapic

 *			migration without losing interrupts for iosapic

 *			architecture.

 */
@@ -190,7 +190,7 @@ void fixup_irqs(void) 
	}



	/*

	 * Phase 1: Locate irq's bound to this cpu and

	 * Phase 1: Locate IRQs bound to this cpu and

	 * relocate them for cpu removal.

	 */

	migrate_irqs();

arch/ia64/kernel/irq_lsapic.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ lsapic_noop_startup (unsigned int irq) 
static void

lsapic_noop (unsigned int irq)

{

	/* nuthing to do... */

	/* nothing to do... */

}



static int lsapic_retrigger(unsigned int irq)