Merge in the cleanups because a followup x86/apic change relies on them.
Signed-off-by: NIngo Molnar <mingo@kernel.org>