From patchwork Thu Oct 25 14:14:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149533 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1397219ljp; Thu, 25 Oct 2018 07:16:21 -0700 (PDT) X-Google-Smtp-Source: AJdET5c7aYNPI/5eHp1GLn+kRHHmcNzEjPBJL2A++jBrQp4AItmGcRHhe1cP1Jy/A/RotddVHp3y X-Received: by 2002:a63:4243:: with SMTP id p64-v6mr1671828pga.127.1540476981667; Thu, 25 Oct 2018 07:16:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540476981; cv=none; d=google.com; s=arc-20160816; b=sEPp9RbaeEFcuxS/tseRBqb/hGDrZWqbrq9act7Bf6mkMZjuuqmy+yJKAfTOKJJFuu OeoaZygToXzRWgZ8D3KEYWKVT12yL1/nR3B/shdcGY1RposZcz7gZw2EuSzGXb2VJqwt FZvdlioho8gq3eZfYtcfz9o6iSNOaT4uuk+Sik3TAl6WQDBOxn/G2BbIwdbkzwVkdcCZ pKrAZYyio3b/PMy7YT9k3jVQcBPKCW8nijBxBm4er/c3xZ/I8HYKP9UenkWkO8lBee0c kOwb2HxmL/+zaqqr261Ramsq9J3NpGjpVXqlmPHUHUk+VNLi0Sl2vZYOdyVYd1bLTlpB GoVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=WBZgvMSl30OiPmPPDkP7nAVO4ubqS3mk5nNsvTffsZw=; b=tgCsvaIO8xKPDOvZg39rB9A6rAtQ0RuucxgJsjknUpuSqCCxwk4nBkVSn2nV845kr1 sp+BMoc9JuVCpoJxypTyotcj3nLPiNpa8taofrUBehRmtO8r6FvtTrpmvp8/RvKqqXWK SXLsox9lONuXI1O6dOUL9o+oYlnCfcuug6Q8GeHUeUhqX0ZpLzqfFXjiloKyQkkxm8ip Jr+E0fcm2Y9bBnMsPJ5VUXAK2uB0/ZwcLxUHQ5d1ukKwrD0cf+TTzmFfJfamQs/8eViT 8+OkVsaNS15JWtGKSgkbbpB6Chz0WQ5Sv4XDI3uuLIHTqXc4liACosF81Ucv49NEtbfw AbjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="STpXb/rr"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b35-v6si8322904plh.177.2018.10.25.07.16.20; Thu, 25 Oct 2018 07:16:21 -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; dkim=pass header.i=@kernel.org header.s=default header.b="STpXb/rr"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729302AbeJYWtO (ORCPT + 32 others); Thu, 25 Oct 2018 18:49:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727421AbeJYWtN (ORCPT ); Thu, 25 Oct 2018 18:49:13 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0315620848; Thu, 25 Oct 2018 14:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476977; bh=7/AXBXlqVLHSozKAzLiFYjb2J3zMulxLngF0jB098BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=STpXb/rrWYXgUYFothTa06FIQW1PQwfeZYaa3AxQ87jYDXDTH2w2Ni3dxVHtTOkt6 1ZLn8rpgD5205JnDdbtFAgEWtylBTS6Ph4J4hpeL1qHdBgIu13zv/FgfZZG56VZHaO CefsVc6upvDHoAS5oqYP4E1oULn+DTesnob4FZ/c= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Jessica Yu , Sasha Levin Subject: [PATCH AUTOSEL 4.9 77/98] module: fix DEBUG_SET_MODULE_RONX typo Date: Thu, 25 Oct 2018 10:14:02 -0400 Message-Id: <20181025141423.213774-77-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141423.213774-1-sashal@kernel.org> References: <20181025141423.213774-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 4d217a5adccf5e806790c37c61cc374a08bd7381 ] The newly added 'rodata_enabled' global variable is protected by the wrong #ifdef, leading to a link error when CONFIG_DEBUG_SET_MODULE_RONX is turned on: kernel/module.o: In function `disable_ro_nx': module.c:(.text.unlikely.disable_ro_nx+0x88): undefined reference to `rodata_enabled' kernel/module.o: In function `module_disable_ro': module.c:(.text.module_disable_ro+0x8c): undefined reference to `rodata_enabled' kernel/module.o: In function `module_enable_ro': module.c:(.text.module_enable_ro+0xb0): undefined reference to `rodata_enabled' CONFIG_SET_MODULE_RONX does not exist, so use the correct one instead. Fixes: 39290b389ea2 ("module: extend 'rodata=off' boot cmdline parameter to module mappings") Signed-off-by: Arnd Bergmann Signed-off-by: Jessica Yu Signed-off-by: Sasha Levin --- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/init/main.c b/init/main.c index 4313772d634a..3c7f71d8e704 100644 --- a/init/main.c +++ b/init/main.c @@ -915,7 +915,7 @@ static int try_to_run_init_process(const char *init_filename) static noinline void __init kernel_init_freeable(void); -#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_SET_MODULE_RONX) +#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_DEBUG_SET_MODULE_RONX) bool rodata_enabled __ro_after_init = true; static int __init set_debug_rodata(char *str) {