Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/ (dbd43d08) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/sysctl/kernel.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered.

		0: try to continue operation

		1: delay a few seconds (to give klogd time to record the oops output) and
		then panic. If the `panic' sysctl is also non-zero then the machine will
		be rebooted.
		1: panic immediatly. If the `panic' sysctl is also non-zero then the
		machine will be rebooted.

		==============================================================

+8 −0

Original line number	Diff line number	Diff line
		@@ -2648,6 +2648,14 @@ M: dbrownell@users.sourceforge.net
		L: spi-devel-general@lists.sourceforge.net
		S: Maintained

		STABLE BRANCH:
		P: Greg Kroah-Hartman
		M: greg@kroah.com
		P: Chris Wright
		M: chrisw@sous-sol.org
		L: stable@kernel.org
		S: Maintained

		TPM DEVICE DRIVER
		P: Kylene Hall
		M: kjhall@us.ibm.com

+1 −1

+7 −3

Original line number	Diff line number	Diff line
		@@ -421,18 +421,22 @@ static struct miscdevice sq_dev = {

		static int __init sq_api_init(void)
		{
		int ret;
		printk(KERN_NOTICE "sq: Registering store queue API.\n");

		#ifdef CONFIG_PROC_FS
		create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
		#endif

		return misc_register(&sq_dev);
		ret = misc_register(&sq_dev);
		if (ret)
		remove_proc_entry("sq_mapping", NULL);

		return ret;
		}

		static void __exit sq_api_exit(void)
		{
		misc_deregister(&sq_dev);
		remove_proc_entry("sq_mapping", NULL);
		}

		module_init(sq_api_init);

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
		{
		int i;
		for_each_cpu_mask(i, cpu_possible_map) {
		spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
		spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
		}
		return 0;
		}