From patchwork Fri Oct 11 00:05:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11184633 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 12E651575 for ; Fri, 11 Oct 2019 00:07:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E71422196E for ; Fri, 11 Oct 2019 00:07:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="TBJeuKMY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727083AbfJKAHb (ORCPT ); Thu, 10 Oct 2019 20:07:31 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46828 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727505AbfJKAGY (ORCPT ); Thu, 10 Oct 2019 20:06:24 -0400 Received: by mail-pg1-f194.google.com with SMTP id b8so4670267pgm.13 for ; Thu, 10 Oct 2019 17:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7MxClQbH59XRrbTRajW1Gh8uACzcU2+htsVcXyM7D1g=; b=TBJeuKMY2z8zTRQ1bFw/ImZS5YFoYQAHk+uSCJMry9jQKOeGheQ5i7gXGHU01GWcTB uOgoFqPErAXZia+mP12x9qnkRfY1Ys9PjUB5SmB5We4kWHLZQ5n99yhQi0dIKcFUZu6/ hILLkVhE9upOn1PuRtaesOlh4SL00TV9kLm5U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7MxClQbH59XRrbTRajW1Gh8uACzcU2+htsVcXyM7D1g=; b=ng+iuRwYbj32cU3jSUxf4NF6gcZDbOZYA00unSyt8FQmkynKv8eQ+1T05O2FIe8Jn8 yFEdfp+Fyn79Hx5P6Kg6A63vTpsp+/nDXrteImy3mKYT8QysvR6JquD/NsXMR6UTN+UF XbOPSsiNEA8XRL7woj64MpIEyRG1Oafnbk9fFNmwN7CgixjqRGXF0hKt/YjqXllWpSVQ NoeYSyBEE1aI4bV/JY+0/TMFGmn9rdUBxXjfFxldHv0aPi8x4Xz87tJ+tHeD7YQGreS0 5AzJ972v2x4n9uUiGOJMA4adBgrNDuQT2+WLlB7CEmxwfll6Ob+0IJ5OarrXfnr9AIgW 6HZw== X-Gm-Message-State: APjAAAV67HqW5odPDKgS5DBYAr9ms+1KqmNNmpj6wrUYqgiidYGITWEA 1eeAD9HpXsvAFCXXZf8iYLBzUA== X-Google-Smtp-Source: APXvYqwg7IWyK5GALjp45zOGgCtbjryTtA5MoWvVIZiHDTE9GJEt+Ue8rYJCs4VD37qrCGGbQgqtBg== X-Received: by 2002:a62:5bc1:: with SMTP id p184mr12930072pfb.180.1570752383534; Thu, 10 Oct 2019 17:06:23 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d5sm5372814pjw.31.2019.10.10.17.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 17:06:20 -0700 (PDT) From: Kees Cook To: Borislav Petkov Cc: Kees Cook , Rick Edgecombe , Dave Hansen , Andy Lutomirski , Arnd Bergmann , Michael Ellerman , Heiko Carstens , Will Deacon , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org, Yoshinori Sato , Michal Simek , linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/29] alpha: Rename PT_LOAD identifier "kernel" to "text" Date: Thu, 10 Oct 2019 17:05:44 -0700 Message-Id: <20191011000609.29728-5-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011000609.29728-1-keescook@chromium.org> References: <20191011000609.29728-1-keescook@chromium.org> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org In preparation for moving NOTES into RO_DATA, rename the linker script internal identifier for the PT_LOAD Program Header from "kernel" to "text" to match other architectures. Signed-off-by: Kees Cook --- arch/alpha/kernel/vmlinux.lds.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index c4b5ceceab52..781090cacc96 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -8,7 +8,7 @@ OUTPUT_FORMAT("elf64-alpha") OUTPUT_ARCH(alpha) ENTRY(__start) -PHDRS { kernel PT_LOAD; note PT_NOTE; } +PHDRS { text PT_LOAD; note PT_NOTE; } jiffies = jiffies_64; SECTIONS { @@ -27,14 +27,14 @@ SECTIONS LOCK_TEXT *(.fixup) *(.gnu.warning) - } :kernel + } :text swapper_pg_dir = SWAPPER_PGD; _etext = .; /* End of text section */ - NOTES :kernel :note + NOTES :text :note .dummy : { *(.dummy) - } :kernel + } :text RODATA EXCEPTION_TABLE(16)