From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FD0EC38A2A for ; Fri, 8 May 2020 13:24:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D9EE208DB for ; Fri, 8 May 2020 13:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588944264; bh=lzfuXVt3dhMt9V8K+8sDawX4ICe4lJX0t+yk7fsVlzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1sKfVE4+sWtL1CNXdiLVRINaqkArXhsfDTw/tjkQPHmVjmQDT7s7cHUX4z0lU+YvE u3f9ATeVTiwrDYEV0bse686dp1XFSxEdwqY9u5SBPMN/ILEURYYU4nrAivgusZMWud Tq3dipiUDXB44t/JDxMfSSNy0oLVkpdtM2A90gAc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727904AbgEHMhB (ORCPT ); Fri, 8 May 2020 08:37:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:50970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727959AbgEHMhA (ORCPT ); Fri, 8 May 2020 08:37:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D42A721835; Fri, 8 May 2020 12:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941419; bh=lzfuXVt3dhMt9V8K+8sDawX4ICe4lJX0t+yk7fsVlzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rH4KQK+eKtCaRrsJ3K8uH6dcJ0AI48f/jLtpjIbCnsqAHZbpxZMRNJWGDZVT2o9Rk yYoxG7y9oqHuK7jYJjmB1gh8onbRsqGaMxm30rHI/TPTzDZ5ddPBm44RvW1kY+dDES Xo/Jug/TQqQiWgSXy2lzpblwguA+MnHkYq3+Y0DI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaedon Shin , Alexander Sverdlin , Jonas Gorski , Masahiro Yamada , Paul Burton , Aaro Koskinen , linux-mips@linux-mips.org, Ralf Baechle Subject: [PATCH 4.4 009/312] MIPS: Fix macro typo Date: Fri, 8 May 2020 14:30:00 +0200 Message-Id: <20200508123125.163681325@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jaedon Shin commit 2549cc967ebb4043f3507b55e3dc579f44d3b516 upstream. Change the CONFIG_MIPS_CMDLINE_EXTEND to CONFIG_MIPS_CMDLINE_DTB_EXTEND to resolve the EXTEND_WITH_PROM macro. Signed-off-by: Jaedon Shin Fixes: 2024972ef533 ("MIPS: Make the kernel arguments from dtb available") Reviewed-by: Alexander Sverdlin Cc: Jonas Gorski Cc: Masahiro Yamada Cc: Paul Burton Cc: Aaro Koskinen Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/11909/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -695,7 +695,7 @@ static void __init request_crashkernel(s #define USE_PROM_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER) #define USE_DTB_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) -#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_EXTEND) +#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND) static void __init arch_mem_init(char **cmdline_p) {