Skip to contentSkip to conversation

pstore/ram: Undefine the correct macro after a recent renaming

PATCH In review Tyler Hicks 2 participants 2 messages May 21, 2020 Pstore filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pstore/ram: Undefine the correct macro after a recent renaming

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")

---

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(-)
fs/pstore/ram.c +1 -1
index df8965817c7b..ca6d8a867285 100644
@@ -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
Signature · 1 line
2.25.1
#1 lore raw
Quoted 10 lines · Tyler Hicks

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")

---

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.

Whoops! Thanks; applied!

-Kees

Quoted 22 lines

Tyler

 fs/pstore/ram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/ram.c +1 -1
index df8965817c7b..ca6d8a867285 100644
@@ -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
Signature · 1 line
2.25.1
Signature · 1 line
Kees Cook