From patchwork Fri Oct 14 10:42:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 77652 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp231442qge; Fri, 14 Oct 2016 03:43:07 -0700 (PDT) X-Received: by 10.98.90.130 with SMTP id o124mr17068856pfb.53.1476441787550; Fri, 14 Oct 2016 03:43:07 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wy10si15056430pab.203.2016.10.14.03.43.07; Fri, 14 Oct 2016 03:43:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147AbcJNKnF (ORCPT + 27 others); Fri, 14 Oct 2016 06:43:05 -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 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 856FB46; Fri, 14 Oct 2016 03:42:55 -0700 (PDT) Received: from leverpostej.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EF7C63F318; Fri, 14 Oct 2016 03:42:53 -0700 (PDT) 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- 1.9.1 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