Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (6d23c8bc) · Commits · e / devices / android_kernel_fairphone_FP5

arch/ia64/kernel/efi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -987,7 +987,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
		break;
		}

		if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) {
		if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
		printk(KERN_ERR "failed to alocate resource for iomem\n");
		return;
		}

arch/ia64/kernel/kprobes.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -739,10 +739,14 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,

		switch(val) {
		case DIE_BREAK:
		/* err is break number from ia64_bad_break() */
		if (args->err == 0x80200 \|\| args->err == 0x80300)
		if (pre_kprobes_handler(args))
		ret = NOTIFY_STOP;
		break;
		case DIE_SS:
		case DIE_FAULT:
		/* err is vector number from ia64_fault() */
		if (args->err == 36)
		if (post_kprobes_handler(args->regs))
		ret = NOTIFY_STOP;
		break;

arch/ia64/kernel/mca.c

+95 −25

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@
		*
		* 2005-08-12 Keith Owens <kaos@sgi.com>
		* Convert MCA/INIT handlers to use per event stacks and SAL/OS state.
		*
		* 2005-10-07 Keith Owens <kaos@sgi.com>
		* Add notify_die() hooks.
		*/
		#include <linux/config.h>
		#include <linux/types.h>
		@@ -58,7 +61,6 @@
		#include <linux/sched.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>
		#include <linux/kallsyms.h>
		#include <linux/smp_lock.h>
		#include <linux/bootmem.h>
		#include <linux/acpi.h>
		@@ -69,6 +71,7 @@
		#include <linux/workqueue.h>

		#include <asm/delay.h>
		#include <asm/kdebug.h>
		#include <asm/machvec.h>
		#include <asm/meminit.h>
		#include <asm/page.h>
		@@ -132,6 +135,14 @@ extern void salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe);

		static int mca_init;


		static void inline
		ia64_mca_spin(const char *func)
		{
		printk(KERN_EMERG "%s: spinning here, not returning to SAL\n", func);
		while (1)
		cpu_relax();
		}
		/*
		* IA64_MCA log support
		*/
		@@ -526,13 +537,16 @@ ia64_mca_wakeup_all(void)
		* Outputs : None
		*/
		static irqreturn_t
		ia64_mca_rendez_int_handler(int rendez_irq, void arg, struct pt_regs ptregs)
		ia64_mca_rendez_int_handler(int rendez_irq, void arg, struct pt_regs regs)
		{
		unsigned long flags;
		int cpu = smp_processor_id();

		/* Mask all interrupts */
		local_irq_save(flags);
		if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_DONE;
		/* Register with the SAL monarch that the slave has
		@@ -540,10 +554,18 @@ ia64_mca_rendez_int_handler(int rendez_irq, void arg, struct pt_regs ptregs)
		*/
		ia64_sal_mc_rendez();

		if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		/* Wait for the monarch cpu to exit. */
		while (monarch_cpu != -1)
		cpu_relax(); /* spin until monarch leaves */

		if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		/* Enable all interrupts */
		local_irq_restore(flags);
		return IRQ_HANDLED;
		@@ -933,6 +955,9 @@ ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		oops_in_progress = 1; /* FIXME: make printk NMI/MCA/INIT safe */
		previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
		monarch_cpu = cpu;
		if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		ia64_wait_for_slaves(cpu);

		/* Wakeup all the processors which are spinning in the rendezvous loop.
		@@ -942,6 +967,9 @@ ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		* spinning in SAL does not work.
		*/
		ia64_mca_wakeup_all();
		if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		/* Get the MCA error record and log it */
		ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
		@@ -960,6 +988,9 @@ ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		ia64_sal_clear_state_info(SAL_INFO_TYPE_MCA);
		sos->os_status = IA64_MCA_CORRECTED;
		}
		if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, 0, 0, recover)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		set_curr_task(cpu, previous_current);
		monarch_cpu = -1;
		@@ -1188,6 +1219,37 @@ ia64_mca_cpe_poll (unsigned long dummy)

		#endif /* CONFIG_ACPI */

		static int
		default_monarch_init_process(struct notifier_block self, unsigned long val, void data)
		{
		int c;
		struct task_struct g, t;
		if (val != DIE_INIT_MONARCH_PROCESS)
		return NOTIFY_DONE;
		printk(KERN_ERR "Processes interrupted by INIT -");
		for_each_online_cpu(c) {
		struct ia64_sal_os_state *s;
		t = __va(__per_cpu_mca[c] + IA64_MCA_CPU_INIT_STACK_OFFSET);
		s = (struct ia64_sal_os_state )((char )t + MCA_SOS_OFFSET);
		g = s->prev_task;
		if (g) {
		if (g->pid)
		printk(" %d", g->pid);
		else
		printk(" %d (cpu %d task 0x%p)", g->pid, task_cpu(g), g);
		}
		}
		printk("\n\n");
		if (read_trylock(&tasklist_lock)) {
		do_each_thread (g, t) {
		printk("\nBacktrace of pid %d (%s)\n", t->pid, t->comm);
		show_stack(t, NULL);
		} while_each_thread (g, t);
		read_unlock(&tasklist_lock);
		}
		return NOTIFY_DONE;
		}

		/*
		* C portion of the OS INIT handler
		*
		@@ -1212,8 +1274,7 @@ ia64_init_handler(struct pt_regs regs, struct switch_stack sw,
		static atomic_t slaves;
		static atomic_t monarchs;
		task_t *previous_current;
		int cpu = smp_processor_id(), c;
		struct task_struct g, t;
		int cpu = smp_processor_id();

		oops_in_progress = 1; /* FIXME: make printk NMI/MCA/INIT safe */
		console_loglevel = 15; /* make sure printks make it to console */
		@@ -1253,8 +1314,17 @@ ia64_init_handler(struct pt_regs regs, struct switch_stack sw,
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
		while (monarch_cpu == -1)
		cpu_relax(); /* spin until monarch enters */
		if (notify_die(DIE_INIT_SLAVE_ENTER, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		if (notify_die(DIE_INIT_SLAVE_PROCESS, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		while (monarch_cpu != -1)
		cpu_relax(); /* spin until monarch leaves */
		if (notify_die(DIE_INIT_SLAVE_LEAVE, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		printk("Slave on cpu %d returning to normal service.\n", cpu);
		set_curr_task(cpu, previous_current);
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
		@@ -1263,6 +1333,9 @@ ia64_init_handler(struct pt_regs regs, struct switch_stack sw,
		}

		monarch_cpu = cpu;
		if (notify_die(DIE_INIT_MONARCH_ENTER, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);

		/*
		* Wait for a bit. On some machines (e.g., HP's zx2000 and zx6000, INIT can be
		@@ -1273,27 +1346,16 @@ ia64_init_handler(struct pt_regs regs, struct switch_stack sw,
		printk("Delaying for 5 seconds...\n");
		udelay(5*1000000);
		ia64_wait_for_slaves(cpu);
		printk(KERN_ERR "Processes interrupted by INIT -");
		for_each_online_cpu(c) {
		struct ia64_sal_os_state *s;
		t = __va(__per_cpu_mca[c] + IA64_MCA_CPU_INIT_STACK_OFFSET);
		s = (struct ia64_sal_os_state )((char )t + MCA_SOS_OFFSET);
		g = s->prev_task;
		if (g) {
		if (g->pid)
		printk(" %d", g->pid);
		else
		printk(" %d (cpu %d task 0x%p)", g->pid, task_cpu(g), g);
		}
		}
		printk("\n\n");
		if (read_trylock(&tasklist_lock)) {
		do_each_thread (g, t) {
		printk("\nBacktrace of pid %d (%s)\n", t->pid, t->comm);
		show_stack(t, NULL);
		} while_each_thread (g, t);
		read_unlock(&tasklist_lock);
		}
		/* If nobody intercepts DIE_INIT_MONARCH_PROCESS then we drop through
		* to default_monarch_init_process() above and just print all the
		* tasks.
		*/
		if (notify_die(DIE_INIT_MONARCH_PROCESS, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		if (notify_die(DIE_INIT_MONARCH_LEAVE, "INIT", regs, 0, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		printk("\nINIT dump complete. Monarch on cpu %d returning to normal service.\n", cpu);
		atomic_dec(&monarchs);
		set_curr_task(cpu, previous_current);
		@@ -1462,6 +1524,10 @@ ia64_mca_init(void)
		s64 rc;
		struct ia64_sal_retval isrv;
		u64 timeout = IA64_MCA_RENDEZ_TIMEOUT; /* platform specific */
		static struct notifier_block default_init_monarch_nb = {
		.notifier_call = default_monarch_init_process,
		.priority = 0/* we need to notified last */
		};

		IA64_MCA_DEBUG("%s: begin\n", __FUNCTION__);

		@@ -1555,6 +1621,10 @@ ia64_mca_init(void)
		"(status %ld)\n", rc);
		return;
		}
		if (register_die_notifier(&default_init_monarch_nb)) {
		printk(KERN_ERR "Failed to register default monarch INIT process\n");
		return;
		}

		IA64_MCA_DEBUG("%s: registered OS INIT handler with SAL\n", __FUNCTION__);

arch/ia64/kernel/mca_drv.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -547,9 +547,20 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
		(pal_processor_state_info_t*)peidx_psp(peidx);

		/*
		* We cannot recover errors with other than bus_check.
		* Processor recovery status must key off of the PAL recovery
		* status in the Processor State Parameter.
		*/
		if (psp->cc \|\| psp->rc \|\| psp->uc)

		/*
		* The machine check is corrected.
		*/
		if (psp->cm == 1)
		return 1;

		/*
		* The error was not contained. Software must be reset.
		*/
		if (psp->us \|\| psp->ci == 0)
		return 0;

		/*
		@@ -570,8 +581,6 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
		return 0;
		if (pbci->eb && pbci->bsi > 0)
		return 0;
		if (psp->ci == 0)
		return 0;

		/*
		* This is a local MCA and estimated as recoverble external bus error.

arch/ia64/kernel/process.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,9 @@
		* Copyright (C) 1998-2003 Hewlett-Packard Co
		* David Mosberger-Tang <davidm@hpl.hp.com>
		* 04/11/17 Ashok Raj <ashok.raj@intel.com> Added CPU Hotplug Support
		*
		* 2005-10-07 Keith Owens <kaos@sgi.com>
		* Add notify_die() hooks.
		*/
		#define __KERNEL_SYSCALLS__ /* see <asm/unistd.h> */
		#include <linux/config.h>
		@@ -34,6 +37,7 @@
		#include <asm/elf.h>
		#include <asm/ia32.h>
		#include <asm/irq.h>
		#include <asm/kdebug.h>
		#include <asm/pgalloc.h>
		#include <asm/processor.h>
		#include <asm/sal.h>
		@@ -808,12 +812,14 @@ cpu_halt (void)
		void
		machine_restart (char *restart_cmd)
		{
		(void) notify_die(DIE_MACHINE_RESTART, restart_cmd, NULL, 0, 0, 0);
		(*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL);
		}

		void
		machine_halt (void)
		{
		(void) notify_die(DIE_MACHINE_HALT, "", NULL, 0, 0, 0);
		cpu_halt();
		}