[Skiboot] [PATCH 03/16] core/init: rename setup_reset_vector

Nicholas Piggin npiggin at gmail.com
Tue Jan 8 01:04:15 AEDT 2019


Use the word copy, to match copy_exception_vectors.

Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
 core/fast-reboot.c | 2 +-
 core/init.c        | 4 ++--
 include/skiboot.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index 8e95d8344..02ef84646 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -172,7 +172,7 @@ void fast_reboot(void)
 
 	/* Restore skiboot vectors  */
 	copy_exception_vectors();
-	setup_reset_vector();
+	copy_sreset_vector();
 
 	/* Send everyone else to 0x100 */
 	if (sreset_all_others() != OPAL_SUCCESS) {
diff --git a/core/init.c b/core/init.c
index 262ac5fb3..a2ddbae1e 100644
--- a/core/init.c
+++ b/core/init.c
@@ -748,7 +748,7 @@ static void setup_branch_null_catcher(void)
 }
 #endif
 
-void setup_reset_vector(void)
+void copy_sreset_vector(void)
 {
 	uint32_t *src, *dst;
 
@@ -1067,7 +1067,7 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
 	/* We can now overwrite the 0x100 vector as we are no longer being
 	 * entered there.
 	 */
-	setup_reset_vector();
+	copy_sreset_vector();
 
 	/* We can now do NAP mode */
 	cpu_set_sreset_enable(true);
diff --git a/include/skiboot.h b/include/skiboot.h
index 8b53c7681..fedd7b345 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -199,7 +199,7 @@ extern void init_shared_sprs(void);
 extern void init_replicated_sprs(void);
 extern bool start_preload_kernel(void);
 extern void copy_exception_vectors(void);
-extern void setup_reset_vector(void);
+extern void copy_sreset_vector(void);
 
 /* Various probe routines, to replace with an initcall system */
 extern void probe_p7ioc(void);
-- 
2.18.0



More information about the Skiboot mailing list