Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (70f33fa5) · Commits · 戴 / test

Pull arch/tile fixes from Chris Metcalf: "This is one important change from Srivatsa Bhat that got dropped when I put together my pull request for -rc2, plus a trivial change to remove a compiler warning." * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch/tile: avoid unused variable warning in proc.c for tilegx tile/CPU hotplug: Add missing call to notify_cpu_starting()

arch/tile/kernel/proc.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ static ctl_table unaligned_table[] = {
		},
		{}
		};
		#endif

		static struct ctl_path tile_path[] = {
		{ .procname = "tile" },
		@@ -155,10 +154,9 @@ static struct ctl_path tile_path[] = {

		static int __init proc_sys_tile_init(void)
		{
		#ifndef __tilegx__ /* FIXME: GX: no support for unaligned access yet */
		register_sysctl_paths(tile_path, unaligned_table);
		#endif
		return 0;
		}

		arch_initcall(proc_sys_tile_init);
		#endif

arch/tile/kernel/smpboot.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,8 @@ void __cpuinit online_secondary(void)
		/* This must be done before setting cpu_online_mask */
		wmb();

		notify_cpu_starting(smp_processor_id());

		/*
		* We need to hold call_lock, so there is no inconsistency
		* between the time smp_call_function() determines number of

Admin message