Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp615378pxb; Tue, 14 Sep 2021 05:12:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzzdWp4QuNx56xVaiwWGuzJZuDA8nhlkhfBM6562D2f8XAWhpP74QQugavLmSJNuRyUy6p X-Received: by 2002:a92:c744:: with SMTP id y4mr11415326ilp.288.1631621551375; Tue, 14 Sep 2021 05:12:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631621551; cv=none; d=google.com; s=arc-20160816; b=OJHYKMB1bZBX5uCaby4VHlUz5pS203xqhK5jGANDD8xC2r+zs4rgZoS9U2c34OfmAB UeI/qRgyDSyfxjpeHiw3afpIT5V9fTT9P/h51P4VbP6uv6PgMRbEFNNqCSSaskcvMeKA DN3A2yoaHi52uJ6iAIlNN0UdivZO92zHkk7dcC26PtiYbesoAGuLrhyKpc/zwK9nKKgr xudCIx+iBL4+WGiHF0WILuNpRZQXVfzb5VeqTiT95QUFatx3++4N7x+EdrKyjdyyBvjS kR6RtuacSiNlpQ9QoEXAQYnpQkPEE4DQg9IljGH/JRH/KPuqTa16zpu6M+2FpDFxP90a INWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gtgpjYeKblSSwcagqSBxnlfpit8lkk7wIOjo+aadJiA=; b=Yj6Cp4yljtif3NLzsGLO6Q+5kSlAtnoLvYP6qxRIwN43rBIywzHzP2aUaexeB3pySb m/2Do8THuNJoIPoF0nlEWeWA55kNDSdTLH5FrzicI8V99LHXS4yyLSBITV9hxIjtF1w7 eJ4Qf+2n3G8WNqCUkwTk9ViUGM39owRzU/oNlG2e6c1IHNX+INcNlcEnCDFzQOyGYPEF Vy1iDaPuT5IUqc9/xwcacnFl1XndYv1SUw8yyj6Nu5/QNwGTWSIHl7I9IzFTIEGbrHB8 9kaDiIU8dvuA0dT3p3dqDPZqHU363mGvAMk272Gxm9zKjCS806btuaSDIv/uVfRl1PQy O94Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bWOE2Fcg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d39si9095699jaa.115.2021.09.14.05.12.20; Tue, 14 Sep 2021 05:12:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bWOE2Fcg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232583AbhINMM2 (ORCPT + 99 others); Tue, 14 Sep 2021 08:12:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:42380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232587AbhINMM1 (ORCPT ); Tue, 14 Sep 2021 08:12:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D6A9D61151; Tue, 14 Sep 2021 12:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631621470; bh=0gZ7g4PrdHovHhvTbvNDdx6ByPhH72YCH9mSQcGy7nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWOE2FcgJCPImZMVbgRai97mW40puruvu263BNQpF0CEHWNMsO826h665RsNX/7Jr aqgwL0RlnK8VJxV7LLj9nd6yswsVqUQGV82MtpUJjfx0LwA9SHq4rk56b2jwiD+VgK cqD25xaieY1IenKCbr7MoLWsXxwK0Kgak0Wck7CgA3p0h7TjmCFBrR0IgSRbuA3fZ2 yxbWKo/wj1bx49qHZiMF7N3XdoVIlTNx/u0Q/KzGeXlYQxfFlk8VTcGg1gTg5W6lci FGMqXMPbJDkb4kUSIPn3rntL0eeF3iDCcqaD/ilJ9Dh7doCYOr//PRPgiPV1swNdk9 8bmEuLMDGLldA== From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Keith Packard , Russell King , Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Christophe Leroy , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Peter Zijlstra , Kees Cook , Andy Lutomirski , Linus Torvalds , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org Subject: [RFC PATCH 4/8] powerpc: add CPU field to struct thread_info Date: Tue, 14 Sep 2021 14:10:32 +0200 Message-Id: <20210914121036.3975026-5-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210914121036.3975026-1-ardb@kernel.org> References: <20210914121036.3975026-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The CPU field will be moved back into thread_info even when THREAD_INFO_IN_TASK is enabled, so add it back to powerpc's definition of struct thread_info. Signed-off-by: Ard Biesheuvel --- arch/powerpc/include/asm/thread_info.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index b4ec6c7dd72e..5725029aaa29 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h @@ -47,6 +47,9 @@ struct thread_info { int preempt_count; /* 0 => preemptable, <0 => BUG */ +#ifdef CONFIG_SMP + unsigned int cpu; +#endif unsigned long local_flags; /* private flags for thread */ #ifdef CONFIG_LIVEPATCH unsigned long *livepatch_sp; -- 2.30.2