Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 (a7df26da) · Commits · e / devices / android_kernel_xiaomi_markw

arch/ia64/kernel/process.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -179,7 +179,7 @@ static int can_do_pal_halt = 1;

	static int __init nohalt_setup(char * str)		static int __init nohalt_setup(char * str)
	{		{
	pal_halt = 0;		pal_halt = can_do_pal_halt = 0;
	return 1;		return 1;
	}		}
	__setup("nohalt", nohalt_setup);		__setup("nohalt", nohalt_setup);