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

Commit 42062234 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm 

Pull APM cleanup from Jiri Kosina.
parents cd3de83f 53675abb

arch/x86/kernel/apm_32.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -841,7 +841,6 @@ static int apm_do_idle(void) 
	u32 eax;

	u32 eax;

	u8 ret = 0;

	u8 ret = 0;

	int idled = 0;

	int idled = 0;

	int polling;

	int err = 0;

	int err = 0;





	if (!need_resched()) {

	if (!need_resched()) {