Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752495AbcJNKnE (ORCPT ); Fri, 14 Oct 2016 06:43:04 -0400 Received: from foss.arm.com ([217.140.101.70]:34376 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbcJNKm4 (ORCPT ); Fri, 14 Oct 2016 06:42:56 -0400 From: Mark Rutland To: Heiko Carstens Cc: Andy Lutomirski , Peter Zijlstra , Linus Torvalds , Ingo Molnar , "H . Peter Anvin" , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Schwidefsky , Mark Rutland Subject: [PATCH] thread_info: include for THREAD_INFO_IN_TASK (WAS: [PATCH 2/3] sched/preempt: include asm/current.h) Date: Fri, 14 Oct 2016 11:42:25 +0100 Message-Id: <1476441745-10765-1-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20161014081638.GA4047@osiris> References: <20161014081638.GA4047@osiris> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1327 Lines: 38 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 --- include/linux/thread_info.h | 1 + 1 file changed, 1 insertion(+) As discussed, it would be great if this could go in along with the patch to make thread_info arch-specific again, to make merging the arch-specific parts easier (for arm64 and s390). Mark. diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 45f004e..521f84b 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -25,6 +25,7 @@ struct thread_info { #endif #ifdef CONFIG_THREAD_INFO_IN_TASK +#include #define current_thread_info() ((struct thread_info *)current) #endif -- 1.9.1