Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966386AbcDLSIs (ORCPT ); Tue, 12 Apr 2016 14:08:48 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49129 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030292AbcDLSI3 (ORCPT ); Tue, 12 Apr 2016 14:08:29 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: "Paul E. McKenney" , Borislav Petkov , Andrew Morton , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Kamal Mostafa , Luis Henriques Subject: [PATCH 3.16.y-ckt 13/17] cpu: Provide smpboot_thread_init() on !CONFIG_SMP kernels as well Date: Tue, 12 Apr 2016 19:08:00 +0100 Message-Id: <1460484484-22395-14-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> References: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1257 Lines: 42 3.16.7-ckt27 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Ingo Molnar commit 590ee7dbd569a012df705a5204fc5f1066f52b8c upstream. Now that we are using smpboot_thread_init() in init/main.c as well, provide it for !CONFIG_SMP as well. This addresses a !CONFIG_SMP build failure. Cc: Paul E. McKenney Cc: Borislav Petkov Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar Cc: Kamal Mostafa Signed-off-by: Luis Henriques --- include/linux/cpu.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index cd895a5e4d59..285111f95464 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -206,6 +206,10 @@ static inline void cpu_notifier_register_done(void) { } +static inline void smpboot_thread_init(void) +{ +} + #endif /* CONFIG_SMP */ extern struct bus_type cpu_subsys;