[PATCH] x86/boot: Rename boot_kstrtoul to kstrtoul

[Thorsten Blum]

The build error mentioned in commit 5fafbebc86a0 ("x86/boot: Add
kstrtoul() from lib/") can no longer be reproduced. Rename
boot_kstrtoul() back to kstrtoul().

Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
---
 arch/x86/boot/compressed/acpi.c | 2 +-
 arch/x86/boot/string.c          | 4 ++--
 arch/x86/boot/string.h          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index f196b1d1ddf8..8c7cb670a86b 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -188,7 +188,7 @@ static unsigned long get_cmdline_acpi_rsdp(void)
 	if (ret < 0)
 		return 0;
 
-	if (boot_kstrtoul(val, 16, &addr))
+	if (kstrtoul(val, 16, &addr))
 		return 0;
 #endif
 	return addr;
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c
index b25c6a9303b7..7a145fb70a4a 100644
--- a/arch/x86/boot/string.c
+++ b/arch/x86/boot/string.c
@@ -342,7 +342,7 @@ static int _kstrtoul(const char *s, unsigned int base, unsigned long *res)
 }
 
 /**
- * boot_kstrtoul - convert a string to an unsigned long
+ * kstrtoul - convert a string to an unsigned long
  * @s: The start of the string. The string must be null-terminated, and may also
  *  include a single newline before its terminating null. The first character
  *  may also be a plus sign, but not a minus sign.
@@ -356,7 +356,7 @@ static int _kstrtoul(const char *s, unsigned int base, unsigned long *res)
  * Returns 0 on success, -ERANGE on overflow and -EINVAL on parsing error.
  * Used as a replacement for the simple_strtoull.
  */
-int boot_kstrtoul(const char *s, unsigned int base, unsigned long *res)
+int kstrtoul(const char *s, unsigned int base, unsigned long *res)
 {
 	/*
 	 * We want to shortcut function call, but
diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h
index a5b05ebc037d..5bd2841f3947 100644
--- a/arch/x86/boot/string.h
+++ b/arch/x86/boot/string.h
@@ -29,5 +29,5 @@ extern unsigned long long simple_strtoull(const char *cp, char **endp,
 long simple_strtol(const char *cp, char **endp, unsigned int base);
 
 int kstrtoull(const char *s, unsigned int base, unsigned long long *res);
-int boot_kstrtoul(const char *s, unsigned int base, unsigned long *res);
+int kstrtoul(const char *s, unsigned int base, unsigned long *res);
 #endif /* BOOT_STRING_H */
-- 
Thorsten Blum <thorsten.blum@xxxxxxxxx>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4