Commit 40ba9309 authored by Vamshi K Sthambamkadi's avatar Vamshi K Sthambamkadi Committed by Borislav Petkov

x86/boot: Fix -Wint-to-pointer-cast build warning

Fix this warning when building 32-bit with

CONFIG_RANDOMIZE_BASE=y
CONFIG_MEMORY_HOTREMOVE=y

  arch/x86/boot/compressed/acpi.c:316:9: warning: \
    cast to pointer from integer of different size [-Wint-to-pointer-cast]

Have get_cmdline_acpi_rsdp() return unsigned long which is the proper
type to convert to a pointer of the respective width.

 [ bp: Rewrite commit message, touch ups. ]
Signed-off-by: default avatarVamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/1587645588-7130-3-git-send-email-vamshi.k.sthambamkadi@gmail.com
parent 5fafbebc
...@@ -280,9 +280,9 @@ acpi_physical_address get_rsdp_addr(void) ...@@ -280,9 +280,9 @@ acpi_physical_address get_rsdp_addr(void)
*/ */
#define MAX_ADDR_LEN 19 #define MAX_ADDR_LEN 19
static acpi_physical_address get_cmdline_acpi_rsdp(void) static unsigned long get_cmdline_acpi_rsdp(void)
{ {
acpi_physical_address addr = 0; unsigned long addr = 0;
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
char val[MAX_ADDR_LEN] = { }; char val[MAX_ADDR_LEN] = { };
...@@ -292,7 +292,7 @@ static acpi_physical_address get_cmdline_acpi_rsdp(void) ...@@ -292,7 +292,7 @@ static acpi_physical_address get_cmdline_acpi_rsdp(void)
if (ret < 0) if (ret < 0)
return 0; return 0;
if (kstrtoull(val, 16, &addr)) if (boot_kstrtoul(val, 16, &addr))
return 0; return 0;
#endif #endif
return addr; return addr;
...@@ -314,7 +314,6 @@ static unsigned long get_acpi_srat_table(void) ...@@ -314,7 +314,6 @@ static unsigned long get_acpi_srat_table(void)
* different ideas about whether to trust a command-line parameter. * different ideas about whether to trust a command-line parameter.
*/ */
rsdp = (struct acpi_table_rsdp *)get_cmdline_acpi_rsdp(); rsdp = (struct acpi_table_rsdp *)get_cmdline_acpi_rsdp();
if (!rsdp) if (!rsdp)
rsdp = (struct acpi_table_rsdp *)(long) rsdp = (struct acpi_table_rsdp *)(long)
boot_params->acpi_rsdp_addr; boot_params->acpi_rsdp_addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment