[S] Change in coreboot[main]: arch/x86: Rename breakpoint removal function

[Patrick Rudolph (Code Review)]

Attention is currently required from: Andrey Petrov, Jérémy Compostella, Ronak Kanabar.

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85540?usp=email )

Change subject: arch/x86: Rename breakpoint removal function
......................................................................

arch/x86: Rename breakpoint removal function

Match function name "init" with "remove" by renaming all
*_breakpoint_disable() to *_breakpoint_remove().

Change-Id: Id3da25cfa6fc0594887f3112e269e57e8ecb32b3
Signed-off-by: Patrick Rudolph 
---
M src/arch/x86/include/arch/null_breakpoint.h
M src/arch/x86/include/arch/stack_canary_breakpoint.h
M src/arch/x86/null_breakpoint.c
M src/arch/x86/stack_canary_breakpoint.c
M src/device/oprom/realmode/x86.c
M src/drivers/intel/fsp2_0/memory_init.c
M src/drivers/intel/fsp2_0/notify.c
M src/drivers/intel/fsp2_0/silicon_init.c
8 files changed, 21 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/85540/1

diff --git a/src/arch/x86/include/arch/null_breakpoint.h b/src/arch/x86/include/arch/null_breakpoint.h
index 9d69d3c..030ebee 100644
--- a/src/arch/x86/include/arch/null_breakpoint.h
+++ b/src/arch/x86/include/arch/null_breakpoint.h
@@ -7,13 +7,13 @@

/* Places data and instructions breakpoints at address zero. */
 void null_breakpoint_init(void);
-void null_breakpoint_disable(void);
+void null_breakpoint_remove(void);
 #else
 static inline void null_breakpoint_init(void)
 {
    /* Not implemented */
 }
-static inline void null_breakpoint_disable(void)
+static inline void null_breakpoint_remove(void)
 {
    /* Not implemented */
 }
diff --git a/src/arch/x86/include/arch/stack_canary_breakpoint.h b/src/arch/x86/include/arch/stack_canary_breakpoint.h
index 98c7922..01ab5e2 100644
--- a/src/arch/x86/include/arch/stack_canary_breakpoint.h
+++ b/src/arch/x86/include/arch/stack_canary_breakpoint.h
@@ -7,13 +7,13 @@

/* Places a data breakpoint at stack canary. */
 void stack_canary_breakpoint_init(void);
-void stack_canary_breakpoint_disable(void);
+void stack_canary_breakpoint_remove(void);
 #else
 static inline void stack_canary_breakpoint_init(void)
 {
    /* Not implemented */
 }
-static inline void stack_canary_breakpoint_disable(void)
+static inline void stack_canary_breakpoint_remove(void)
 {
    /* Not implemented */
 }
diff --git a/src/arch/x86/null_breakpoint.c b/src/arch/x86/null_breakpoint.c
index 44c7ae9..e07566f 100644
--- a/src/arch/x86/null_breakpoint.c
+++ b/src/arch/x86/null_breakpoint.c
@@ -58,16 +58,16 @@
    create_instruction_breakpoint();
 }

-void null_breakpoint_disable(void)
+void null_breakpoint_remove(void)
 {
    breakpoint_remove(null_fetch_bp);
    breakpoint_remove(null_deref_bp);
 }

-static void null_breakpoint_disable_hook(void *unused)
+static void null_breakpoint_remove_hook(void *unused)
 {
-	null_breakpoint_disable();
+	null_breakpoint_remove();
 }

-BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL);
-BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_remove_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_remove_hook, NULL);
diff --git a/src/arch/x86/stack_canary_breakpoint.c b/src/arch/x86/stack_canary_breakpoint.c
index 6db8d63..d1dc3c3 100644
--- a/src/arch/x86/stack_canary_breakpoint.c
+++ b/src/arch/x86/stack_canary_breakpoint.c
@@ -49,15 +49,15 @@
    create_stack_canary_breakpoint(addr);
 }

-void stack_canary_breakpoint_disable(void)
+void stack_canary_breakpoint_remove(void)
 {
    breakpoint_remove(stack_canary_bp);
 }

-static void stack_canary_breakpoint_disable_hook(void *unused)
+static void stack_canary_breakpoint_remove_hook(void *unused)
 {
-	stack_canary_breakpoint_disable();
+	stack_canary_breakpoint_remove();
 }

-BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, stack_canary_breakpoint_disable_hook, NULL);
-BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, stack_canary_breakpoint_disable_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, stack_canary_breakpoint_remove_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, stack_canary_breakpoint_remove_hook, NULL);
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index c3adf40..15dd8b5 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -181,7 +181,7 @@

/* It's expected that we write to the NULL page in the first two iterations of the
       following loop, so temporarily disable the NULL breakpoint. */
-	null_breakpoint_disable();
+	null_breakpoint_remove();

/* Copy IDT stub code for each interrupt. This might seem wasteful
     * but it is really simple
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 39d7ce9..ce0d283 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -412,8 +412,8 @@
    fsp_debug_before_memory_init(fsp_raminit, upd, &fspm_upd);

/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
    post_code(POSTCODE_FSP_MEMORY_INIT);
    timestamp_add_now(TS_FSP_MEMORY_INIT_START);
    if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c
index 3ec78d5..358589d 100644
--- a/src/drivers/intel/fsp2_0/notify.c
+++ b/src/drivers/intel/fsp2_0/notify.c
@@ -78,8 +78,8 @@
    post_code(data->post_code_before);

/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
    if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
    	ret = protected_mode_call_1arg(fspnotify, (uintptr_t)&notify_params);
    else
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 1e1ff99..1caf00f 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -132,8 +132,8 @@
    post_code(POSTCODE_FSP_SILICON_INIT);

/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
    if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
    	status = protected_mode_call_1arg(silicon_init, (uintptr_t)upd);
    else