summaryrefslogtreecommitdiff
path: root/src/security/vboot
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2020-04-04 21:00:56 +0200
committerFelix Held <felix-coreboot@felixheld.de>2020-04-04 21:42:43 +0000
commit7c45c8363d86280d70cb671ea713a06fd462a6e7 (patch)
treecbe753d309fc8b555f6906161a408d3b57b81b2c /src/security/vboot
parent37f3d7bb706f4ee93e7a378028fc328ebbe08ca8 (diff)
downloadcoreboot-7c45c8363d86280d70cb671ea713a06fd462a6e7.tar.xz
assert.h: Add a tag parameter to dead_code()
When dead_code() is used in inline functions in a header file, the generated function names (based on the line number) may collide with a dead_code() in the code file. Now that we are hit by such a case, we need a quick solution: Add a tag argument for all invocations in header files. Change-Id: I0c548ce998cf8e28ae9f76b5c0ea5630b4e91ae2 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40140 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/security/vboot')
-rw-r--r--src/security/vboot/misc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index fd422b2ff7..22cc75052c 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -53,7 +53,7 @@ static inline int verification_should_run(void)
else if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK))
return ENV_BOOTBLOCK;
else
- dead_code();
+ dead_code(_in_vboot_misc_h);
}
static inline int verstage_should_load(void)
@@ -82,7 +82,7 @@ static inline int vboot_logic_executed(void)
/* Post-RAM stages are "after the romstage" */
return !ENV_ROMSTAGE_OR_BEFORE;
} else {
- dead_code();
+ dead_code(_in_vboot_misc_h);
}
}