Reason: Bring bakc upstream modification to resolve conflicts
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>