From patchwork Mon Oct 12 14:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11832827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94E50109B for ; Mon, 12 Oct 2020 14:12:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 690202076E for ; Mon, 12 Oct 2020 14:12:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="V/xi3CUW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KpXTQvmA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 690202076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=7S1hVCWHj0/ZVEjvNSCacexYMWcf8kcZEMZjZHKTdRI=; b=V/xi3CUWUbSEDfyazqMTNZFguN UABJX8CcPUQmeg9/mlcs6lGTD9AIqW92GUWpnPCxI/tVt43llUmruX9u8gqLjYWQu2lXOrZ1RLyMc /Chjg/VVAMSur3s9fQLnuJthXPs8rvfNs6yA2rLGtZPmsOqq2zFToh1OR3o5qNJVLRhh20eiGshM4 KSE+UVdiHUXVVT6EZZ+43NbBqhpNDOgFTFfatKereAdvu0lBl3ZCPAVDApWNx6Zk3XQV+IsFFH0gl VtKme455NGoVtnMucuX7B3C9/GDwj6qXKNApShH+jKijSumdOxwxPGlKuiXx0MBwl+LVH5zP02v8l EewRkSAw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRyXS-000800-El; Mon, 12 Oct 2020 14:10:58 +0000 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRyXQ-0007zL-1S for linux-arm-kernel@lists.infradead.org; Mon, 12 Oct 2020 14:10:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602511854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qeLRzZ2kmlgn/5uncvk+yQgdLuVN4fv/HfcAAmZlzhY=; b=KpXTQvmA9uuRxWoP7PFkhvQYIEG9mMhPIEFjFLqFSXqBADYo/YpecePuBt/bELuVb1f7m/ xpu56esSUK5YqCn0SkkagB0eNw+UxHAoEow77KG9+aQiywrEoCXwpt5YKK6xBtrGeUW6hg 5ryXiESZUmPk75mzsXaeqP4LVG/BTrQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-R7YYZCLVOIC0kqtErudtYQ-1; Mon, 12 Oct 2020 10:10:52 -0400 X-MC-Unique: R7YYZCLVOIC0kqtErudtYQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 655F1104D3E0; Mon, 12 Oct 2020 14:10:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-187.rdu2.redhat.com [10.10.117.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 166B760C0F; Mon, 12 Oct 2020 14:10:48 +0000 (UTC) From: Qian Cai To: Arnd Bergmann , Will Deacon Subject: [PATCH -next] arm64: Fix redefinition of init_new_context() Date: Mon, 12 Oct 2020 10:10:32 -0400 Message-Id: <20201012141032.6333-1-cai@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201012_101056_107560_CDF3387B X-CRM114-Status: GOOD ( 14.10 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [63.128.21.124 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [63.128.21.124 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Jean-Philippe Brucker , Stephen Rothwell , Catalin Marinas , Linux Kernel Mailing List , Nicholas Piggin , Linux Next Mailing List , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The linux-next commit c870baeede75 ("asm-generic: add generic MMU versions of mmu context functions") missed a case in the arm64/for-next branch. Signed-off-by: Qian Cai Tested-by: Nick Desaulniers --- arch/arm64/include/asm/mmu_context.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index da5f146e665b..cd5c33a50469 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -176,6 +176,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp) */ void check_and_switch_context(struct mm_struct *mm); +#define init_new_context init_new_context static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) {