Merge branch 'master' into upstream-fixes (701328a7) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+24 −11

Original line number	Diff line number	Diff line
		@@ -2261,6 +2261,17 @@ T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
		T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
		S: Maintained

		PC87360 HARDWARE MONITORING DRIVER
		P: Jim Cromie
		M: jim.cromie@gmail.com
		L: lm-sensors@lm-sensors.org
		S: Maintained

		PC8736x GPIO DRIVER
		P: Jim Cromie
		M: jim.cromie@gmail.com
		S: Maintained

		PCI ERROR RECOVERY
		P: Linas Vepstas
		M: linas@austin.ibm.com
		@@ -2592,10 +2603,19 @@ L: lksctp-developers@lists.sourceforge.net
		S: Supported

		SCx200 CPU SUPPORT
		P: Christer Weinigel
		M: christer@weinigel.se
		W: http://www.weinigel.se
		S: Supported
		P: Jim Cromie
		M: jim.cromie@gmail.com
		S: Odd Fixes

		SCx200 GPIO DRIVER
		P: Jim Cromie
		M: jim.cromie@gmail.com
		S: Maintained

		SCx200 HRT CLOCKSOURCE DRIVER
		P: Jim Cromie
		M: jim.cromie@gmail.com
		S: Maintained

		SECURITY CONTACT
		P: Security Officers
		@@ -2760,14 +2780,7 @@ S: Maintained
		UltraSPARC (sparc64):
		P: David S. Miller
		M: davem@davemloft.net
		P: Eddie C. Dost
		M: ecd@brainaid.de
		P: Jakub Jelinek
		M: jj@sunsite.ms.mff.cuni.cz
		P: Anton Blanchard
		M: anton@samba.org
		L: sparclinux@vger.kernel.org
		L: ultralinux@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
		S: Maintained

+2 −3

Original line number	Diff line number	Diff line
		@@ -387,8 +387,7 @@ apecs_pci_clr_err(void)
		}

		void
		apecs_machine_check(unsigned long vector, unsigned long la_ptr,
		struct pt_regs * regs)
		apecs_machine_check(unsigned long vector, unsigned long la_ptr)
		{
		struct el_common *mchk_header;
		struct el_apecs_procdata *mchk_procdata;
		@@ -412,7 +411,7 @@ apecs_machine_check(unsigned long vector, unsigned long la_ptr,
		wrmces(0x7); /* reset machine check pending flag */
		mb();

		process_mcheck_info(vector, la_ptr, regs, "APECS",
		process_mcheck_info(vector, la_ptr, "APECS",
		(mcheck_expected(0)
		&& (mchk_sysdata->epic_dcsr & 0x0c00UL)));
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -1192,8 +1192,7 @@ cia_decode_mchk(unsigned long la_ptr)
		}

		void
		cia_machine_check(unsigned long vector, unsigned long la_ptr,
		struct pt_regs * regs)
		cia_machine_check(unsigned long vector, unsigned long la_ptr)
		{
		int expected;

		@@ -1208,5 +1207,5 @@ cia_machine_check(unsigned long vector, unsigned long la_ptr,
		expected = mcheck_expected(0);
		if (!expected && vector == 0x660)
		expected = cia_decode_mchk(la_ptr);
		process_mcheck_info(vector, la_ptr, regs, "CIA", expected);
		process_mcheck_info(vector, la_ptr, "CIA", expected);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/tty.h>

		#include <asm/ptrace.h>
		#include <asm/irq_regs.h>
		#include <asm/smp.h>

		#include "proto.h"
		@@ -386,8 +387,7 @@ ioc_error(__u32 stat0, __u32 stat1)
		}

		void
		lca_machine_check(unsigned long vector, unsigned long la_ptr,
		struct pt_regs *regs)
		lca_machine_check(unsigned long vector, unsigned long la_ptr)
		{
		const char * reason;
		union el_lca el;
		@@ -397,7 +397,7 @@ lca_machine_check(unsigned long vector, unsigned long la_ptr,
		wrmces(rdmces()); /* reset machine check pending flag */

		printk(KERN_CRIT "LCA machine check: vector=%#lx pc=%#lx code=%#x\n",
		vector, regs->pc, (unsigned int) el.c->code);
		vector, get_irq_regs()->pc, (unsigned int) el.c->code);

		/*
		* The first quadword after the common header always seems to

+2 −3

Original line number	Diff line number	Diff line
		@@ -572,8 +572,7 @@ mcpcia_print_system_area(unsigned long la_ptr)
		}

		void
		mcpcia_machine_check(unsigned long vector, unsigned long la_ptr,
		struct pt_regs * regs)
		mcpcia_machine_check(unsigned long vector, unsigned long la_ptr)
		{
		struct el_common *mchk_header;
		struct el_MCPCIA_uncorrected_frame_mcheck *mchk_logout;
		@@ -610,7 +609,7 @@ mcpcia_machine_check(unsigned long vector, unsigned long la_ptr,
		wrmces(0x7);
		mb();

		process_mcheck_info(vector, la_ptr, regs, "MCPCIA", expected != 0);
		process_mcheck_info(vector, la_ptr, "MCPCIA", expected != 0);
		if (!expected && vector != 0x620 && vector != 0x630) {
		mcpcia_print_uncorrectable(mchk_logout);
		mcpcia_print_system_area(la_ptr);