Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1729903ybk; Thu, 21 May 2020 13:54:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVO/xeCI5roZj/19S5usd/gh9sEbmLkWOYzT7N6Hiy6/fW8TIgj5h0RPps6PUai0ZfL/yI X-Received: by 2002:a05:6402:3128:: with SMTP id dd8mr542550edb.156.1590094481141; Thu, 21 May 2020 13:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590094481; cv=none; d=google.com; s=arc-20160816; b=tTG+OLt8+FBJKEACiANBC/mkvNkhiN0Y7ZBJO31EByjKKEHsFVOQZH7D21K4eHxebb XSC+03Y8V8b+/W6qNQASIM4CeJ9KDr1ZP6AYqDrFAYvCCDYhi/HL3V9fDaGJBr6K2IuO KWoBUsmRIlGeciNqw4gs56Np6BO1nRlajJ1VS28HfadvsRhGOXdtrnv8SO6SmP3Exvud 19rywl0x2k3MMxPDdlfOpPzBuMDzMJvbR9usP/N4HbDzzSNfV0lU9QBxB/EcjOPMm/9Y 3D/rYGLTfH+EPiS5A8PdVhIqKdBb2BghqF1gO3I9T5AFIKODRjJZRony5t6t0OUwRXiX QKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=+1AzLCrtBMWO9kmppJbH5Z5Mq2KpzrX0FhIXgB9Ixm4=; b=k3Z62/979jV1Z0EUsrWDBojVdc2pndYRqSj4X8YTlj6IWUxNZfLWk846mbtA9B1XaH Tk/yWLVzG0ZkyFsg7OERapTEBPpr39YlN9ew+PQ9ukCHEK8P4jGiPjyE4UY5m+KUMOvl uSudqLhd9ecNKuYcZbCBEYkbt+LNv7ggXkX9tk6mVkGevtRLV+murDHeS5z6uLIFOb7E YpqDdupZpBW1QqV/aYcSwV+QCqj9Buh+2t4BuccM6Spc6JR4f8+0U8m23X0/imK1n1ZA S6GIo+MGde4q10yHiiLH4M4Q0/qADBy0HMFpXG3msA/ezNUphgWs4GcDgt6wKBr0UBOl VCjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=DtXt1pBX; 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=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f8si3934311edk.160.2020.05.21.13.54.18; Thu, 21 May 2020 13:54:41 -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=@linux.microsoft.com header.s=default header.b=DtXt1pBX; 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=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730032AbgEUUwm (ORCPT + 99 others); Thu, 21 May 2020 16:52:42 -0400 Received: from linux.microsoft.com ([13.77.154.182]:33122 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728778AbgEUUwm (ORCPT ); Thu, 21 May 2020 16:52:42 -0400 Received: from sequoia.work.tihix.com (162-237-133-238.lightspeed.rcsntx.sbcglobal.net [162.237.133.238]) by linux.microsoft.com (Postfix) with ESMTPSA id 57DDE20B717B; Thu, 21 May 2020 13:52:41 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 57DDE20B717B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1590094361; bh=+1AzLCrtBMWO9kmppJbH5Z5Mq2KpzrX0FhIXgB9Ixm4=; h=From:To:Cc:Subject:Date:From; b=DtXt1pBXWGv1oRLaEreW/zbQI16f4J283YC7QFhxJv9+m/Wx/YJPEzxXi6c9yz5gZ 1ZlblXOGW0dj3lmlNvVJy1tVfV7bvbHLNpmJBEKl0lrX2EpXJ8bTRrkaVxRs84GIPd 4axLISzWPVAE3YSIoviT2FFYzAzaq2PHHDXDAIdE= From: Tyler Hicks To: Kees Cook Cc: Anton Vorontsov , Colin Cross , Tony Luck , Pavel Tatashin , linux-kernel@vger.kernel.org Subject: [PATCH -next] pstore/ram: Undefine the correct macro after a recent renaming Date: Thu, 21 May 2020 15:52:23 -0500 Message-Id: <20200521205223.175957-1-tyhicks@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Undefine parse_u32, instead of parse_size, as the name of the macro recently changed but the #undef directive wasn't updated at that time. Fixes: 6b31e99b85b0 ("pstore/ram: Refactor DT size parsing") Signed-off-by: Tyler Hicks --- Hi Kees - Here's a minor fixup that I noticed was needed while reviewing your for-next/pstore branch. It is only build-tested but I think that's all that's needed here. Tyler fs/pstore/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index df8965817c7b..ca6d8a867285 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -674,7 +674,7 @@ static int ramoops_parse_dt(struct platform_device *pdev, parse_u32("flags", pdata->flags, 0); parse_u32("max-reason", pdata->max_reason, pdata->max_reason); -#undef parse_size +#undef parse_u32 /* * Some old Chromebooks relied on the kernel setting the -- 2.25.1