[v1] only call the c function set_bios_mode if the value CONFIG_X86_64 is set.

[PATCH] only call the c function set_bios_mode if the value CONFIG_X86_64 is set.

Posted by Hans Weber 4 years, 4 months ago

Signed-off-by: Hans Weber <hwe.kernel@gmail.com>
---
 arch/x86/boot/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index e3add857c2c9..e4df8ff1e228 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -102,14 +102,12 @@ static void query_ist(void)
  */
 static void set_bios_mode(void)
 {
-#ifdef CONFIG_X86_64
 	struct biosregs ireg;
 
 	initregs(&ireg);
 	ireg.ax = 0xec00;
 	ireg.bx = 2;
 	intcall(0x15, &ireg, NULL);
-#endif
 }
 
 static void init_heap(void)
@@ -152,7 +150,9 @@ void main(void)
 	}
 
 	/* Tell the BIOS what CPU mode we intend to run in. */
+#ifdef CONFIG_X86_64
 	set_bios_mode();
+#endif
 
 	/* Detect memory layout */
 	detect_memory();
-- 
2.30.2

RE: [PATCH] only call the c function set_bios_mode if the value CONFIG_X86_64 is set.

Posted by David Laight 4 years, 4 months ago

From: Hans Weber
> Sent: 19 February 2022 20:40
> 
> Signed-off-by: Hans Weber <hwe.kernel@gmail.com>
> ---
>  arch/x86/boot/main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
> index e3add857c2c9..e4df8ff1e228 100644
> --- a/arch/x86/boot/main.c
> +++ b/arch/x86/boot/main.c
> @@ -102,14 +102,12 @@ static void query_ist(void)
>   */
>  static void set_bios_mode(void)
>  {
> -#ifdef CONFIG_X86_64
>  	struct biosregs ireg;
> 
>  	initregs(&ireg);
>  	ireg.ax = 0xec00;
>  	ireg.bx = 2;
>  	intcall(0x15, &ireg, NULL);
> -#endif
>  }
> 
>  static void init_heap(void)
> @@ -152,7 +150,9 @@ void main(void)
>  	}
> 
>  	/* Tell the BIOS what CPU mode we intend to run in. */
> +#ifdef CONFIG_X86_64
>  	set_bios_mode();
> +#endif

That should make absolutely no difference.
The empty static function will be inlined and thus discarded.

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)