Merge branch 'x86/cleanups' into irq/sparseirq

Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>