Merge branch 'x86/cleanups' into x86/apic

Merge in the cleanups because a followup x86/apic change relies on them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/platform/uv/uv_irq.c
Simple merge