Some of the fixes from Joe Perches <joe@perches.com> got missed out
of the last update.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>