Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f560bd19 authored by Matteo Croce's avatar Matteo Croce Committed by Borislav Petkov
Browse files

x86/realmode: Make set_real_mode_mem() static inline 



Remove the unused @size argument and move it into a header file, so it
can be inlined.

 [ bp: Massage. ]

Signed-off-by: default avatarMatteo Croce <mcroce@redhat.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-efi <linux-efi@vger.kernel.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190328114233.27835-1-mcroce@redhat.com
parent f6027c81

arch/x86/include/asm/realmode.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,11 @@ static inline size_t real_mode_size_needed(void) 
	return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE);

	return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE);

}

}





void set_real_mode_mem(phys_addr_t mem, size_t size);

static inline void set_real_mode_mem(phys_addr_t mem)

{

	real_mode_header = (struct real_mode_header *) __va(mem);

}



void reserve_real_mode(void);

void reserve_real_mode(void);





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */

arch/x86/platform/efi/quirks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -449,7 +449,7 @@ void __init efi_free_boot_services(void) 
		 */

		 */

		rm_size = real_mode_size_needed();

		rm_size = real_mode_size_needed();

		if (rm_size && (start + rm_size) < (1<<20) && size >= rm_size) {

		if (rm_size && (start + rm_size) < (1<<20) && size >= rm_size) {

			set_real_mode_mem(start, rm_size);

			set_real_mode_mem(start);

			start += rm_size;

			start += rm_size;

			size -= rm_size;

			size -= rm_size;

		}

		}

arch/x86/realmode/init.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -15,13 +15,6 @@ u32 *trampoline_cr4_features; 
/* Hold the pgd entry used on booting additional CPUs */

/* Hold the pgd entry used on booting additional CPUs */

pgd_t trampoline_pgd_entry;

pgd_t trampoline_pgd_entry;





void __init set_real_mode_mem(phys_addr_t mem, size_t size)

{

	void *base = __va(mem);



	real_mode_header = (struct real_mode_header *) base;

}



void __init reserve_real_mode(void)

void __init reserve_real_mode(void)

{

{

	phys_addr_t mem;

	phys_addr_t mem;
@@ -40,7 +33,7 @@ void __init reserve_real_mode(void) 
	}

	}





	memblock_reserve(mem, size);

	memblock_reserve(mem, size);

	set_real_mode_mem(mem, size);

	set_real_mode_mem(mem);

}

}





static void __init setup_real_mode(void)

static void __init setup_real_mode(void)