From patchwork Wed Oct 19 18:28:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 78319 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp390851qge; Wed, 19 Oct 2016 11:30:44 -0700 (PDT) X-Received: by 10.99.60.66 with SMTP id i2mr1447756pgn.24.1476901844780; Wed, 19 Oct 2016 11:30:44 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j73si38219208pge.111.2016.10.19.11.30.43; Wed, 19 Oct 2016 11:30:44 -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 S1758623AbcJSS3O (ORCPT + 27 others); Wed, 19 Oct 2016 14:29:14 -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 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 377E914D1; Wed, 19 Oct 2016 11:29:01 -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 A4AB43F32C; Wed, 19 Oct 2016 11:28:59 -0700 (PDT) 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 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 Cc: Andrew Morton Cc: Andy Lutomirski Cc: Heiko Carstens Cc: Kees Cook --- include/linux/thread_info.h | 1 + 1 file changed, 1 insertion(+) -- 1.9.1 Acked-by: Heiko Carstens Reviewed-by: Andy Lutomirski 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