提交: 7c1860fce4e369bdcabc1f574feb6b9af19999a3 - uboot (git)

Commit MetaInfo

• 修订版: 7c1860fce4e369bdcabc1f574feb6b9af19999a3 (tree)
• 时间: 2022-07-26 15:23:54
• 作者: Ashok Reddy Soma <ashok.reddy.soma@xili...>
• Commiter: Michal Simek

Log Message

lmb: Fix lmb property's defination under struct lmb

Under struct lmb {} the lmb property's should be defined only if
CONFIG_LMB_MEMORY_REGIONS is defined.

Signed-off-by: Ashok Reddy Soma <[e-mail]>
Signed-off-by: Michal Simek <[e-mail]>

Signed-off-by: Michal Simek <[e-mail]>
Link: https://lore.kernel.org/r/c24a[e-mail]

更改概述

• modified: include/lmb.h
• modified: lib/lmb.c

差异

--- a/include/lmb.h
+++ b/include/lmb.h
@@ -68,7 +68,7 @@ struct lmb_region {
 struct lmb {
 	struct lmb_region memory;
 	struct lmb_region reserved;
-#if !IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
+#if IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS)
 	struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS];
 	struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS];
 #endif

--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -108,7 +108,7 @@ void lmb_init(struct lmb *lmb)
 #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
 	lmb->memory.max = CONFIG_LMB_MAX_REGIONS;
 	lmb->reserved.max = CONFIG_LMB_MAX_REGIONS;
-#else
+#elif IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS)
 	lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS;
 	lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS;
 	lmb->memory.region = lmb->memory_regions;