Merge branch into tip/master: 'x86/cleanups'

 # New commits in x86/cleanups:
    c64545594daf ("x86/Kconfig: Remove obsolete config X86_32_SMP")
    03f111710af9 ("x86/io: Remove the unused 'bw' parameter from the BUILDIO() macro")
    4e15b91c5b79 ("x86/mtrr: Document missing function parameters in kernel-doc")
    f7a25cf1d470 ("x86/setup: Make relocated_ramdisk a local variable of relocate_initrd()")

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