Merge branch 'pm-cpuidle' (a31434bc) · Commits · 戴 / test

drivers/cpuidle/cpuidle-haltpoll.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ static void haltpoll_uninit(void)
		haltpoll_cpuidle_devices = NULL;
		}

		static bool haltpool_want(void)
		static bool haltpoll_want(void)
		{
		return kvm_para_has_hint(KVM_HINTS_REALTIME) \|\| force;
		}
		@@ -110,7 +110,7 @@ static int __init haltpoll_init(void)

		cpuidle_poll_state_init(drv);

		if (!kvm_para_available() \|\| !haltpool_want())
		if (!kvm_para_available() \|\| !haltpoll_want())
		return -ENODEV;

		ret = cpuidle_register_driver(drv);