From 54546c97c780f86a050021d38109aa6c681bfd15 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 5 Aug 2015 00:52:13 -0500 Subject: [PATCH] stage_cache: make prog const in stage_cache_add() The stage_cache_add() function should not be manipulating the struct prog argument in anyway. Therefore, mark it as const. BUG=chrome-os-partner:43636 BRANCH=None TEST=Built, booted, suspended, and resumed on glados. Original-Change-Id: I4509e478d3c98247b9d776f6534b949d9ba6282c Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/290721 Original-Reviewed-by: Leroy P Leahy Original-Reviewed-by: Duncan Laurie Change-Id: Ibadc00a9e1cbbf12119def92d77a79077625fb85 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11192 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/include/stage_cache.h | 2 +- src/lib/cbmem_stage_cache.c | 2 +- src/lib/ext_stage_cache.c | 2 +- src/lib/prog_loaders.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/include/stage_cache.h b/src/include/stage_cache.h index 5a4c16a5e7..68cfdb7e41 100644 --- a/src/include/stage_cache.h +++ b/src/include/stage_cache.h @@ -30,7 +30,7 @@ enum { }; /* Cache the loaded stage provided according to the parameters. */ -void stage_cache_add(int stage_id, struct prog *stage); +void stage_cache_add(int stage_id, const struct prog *stage); /* Load the cached stage at given location returning the stage entry point. */ void stage_cache_load_stage(int stage_id, struct prog *stage); /* Fill in parameters for the external stage cache, if utilized. */ diff --git a/src/lib/cbmem_stage_cache.c b/src/lib/cbmem_stage_cache.c index 4a114438bb..eb5e2b3247 100644 --- a/src/lib/cbmem_stage_cache.c +++ b/src/lib/cbmem_stage_cache.c @@ -23,7 +23,7 @@ #include /* Stage cache uses cbmem. */ -void stage_cache_add(int stage_id, struct prog *stage) +void stage_cache_add(int stage_id, const struct prog *stage) { struct stage_cache *meta; void *c; diff --git a/src/lib/ext_stage_cache.c b/src/lib/ext_stage_cache.c index 4e588f1c01..bbadb70dd4 100644 --- a/src/lib/ext_stage_cache.c +++ b/src/lib/ext_stage_cache.c @@ -62,7 +62,7 @@ static void stage_cache_recover(void) printk(BIOS_DEBUG, "Unable to recover external stage cache.\n"); } -void stage_cache_add(int stage_id, struct prog *stage) +void stage_cache_add(int stage_id, const struct prog *stage) { struct imd *imd; const struct imd_entry *e; diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 7c00abad71..2f4a2c118a 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -60,7 +60,8 @@ fail: halt(); } -void __attribute__((weak)) stage_cache_add(int stage_id, struct prog *stage) {} +void __attribute__((weak)) stage_cache_add(int stage_id, + const struct prog *stage) {} void __attribute__((weak)) stage_cache_load_stage(int stage_id, struct prog *stage) {} void __attribute__((weak)) ramstage_cache_invalid(void) {}