Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7df26da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 68e681e8 fb573856

arch/ia64/kernel/process.c

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


static int __init nohalt_setup(char * str)

{

	pal_halt = 0;

	pal_halt = can_do_pal_halt = 0;

	return 1;

}

__setup("nohalt", nohalt_setup);