Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758612AbcJSS3N (ORCPT ); Wed, 19 Oct 2016 14:29:13 -0400 Received: from foss.arm.com ([217.140.101.70]:59826 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758418AbcJSS3B (ORCPT ); Wed, 19 Oct 2016 14:29:01 -0400 From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, akpm@linux-foundation.org, heiko.carstens@de.ibm.com, hpa@zytor.com, keescook@chromium.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, tglx@linutronix.de Subject: [PATCH 3/3] thread_info: include for THREAD_INFO_IN_TASK Date: Wed, 19 Oct 2016 19:28:13 +0100 Message-Id: <1476901693-8492-4-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476901693-8492-1-git-send-email-mark.rutland@arm.com> References: <1476901693-8492-1-git-send-email-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1311 Lines: 36 When CONFIG_THREAD_INFO_IN_TASK is selected, the current_thread_info() macro relies on current having been defined prior to its use. However, not all users of current_thread_info() include , and thus current is not guaranteed to be defined. When CONFIG_THREAD_INFO_IN_TASK is not selected, it's possible that get_current() / current are based upon current_thread_info(), and includes . Thus always including would result in circular dependences on some platforms. To ensure both cases work, this patch includes , but only when CONFIG_THREAD_INFO_IN_TASK is selected. Signed-off-by: Mark Rutland Cc: Andrew Morton Cc: Andy Lutomirski Cc: Heiko Carstens Cc: Kees Cook --- include/linux/thread_info.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index c75c6ab..ef1f4b0 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -12,6 +12,7 @@ #include #ifdef CONFIG_THREAD_INFO_IN_TASK +#include #define current_thread_info() ((struct thread_info *)current) #endif -- 1.9.1