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

Commit 0b1faeef authored by Daniel J Blueman's avatar Daniel J Blueman Committed by Ingo Molnar
Browse files

x86: section/warning fixes 



WARNING: arch/x86/mm/built-in.o(.text+0x3a1): Section mismatch in
reference from the function set_pte_phys() to the function
.init.text:spp_getpage()
The function set_pte_phys() references
the function __init spp_getpage().
This is often because set_pte_phys lacks a __init
annotation or the annotation of spp_getpage is wrong.

arch/x86/mm/init_64.c: In function 'early_memtest':
arch/x86/mm/init_64.c:520: warning: passing argument 2 of
'find_e820_area_size' from incompatible pointer type

Signed-off-by: default avatarDaniel J Blueman <daniel.blueman@gmail.com>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 41aefdcc

arch/x86/mm/init_64.c

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static __init void *spp_getpage(void) 
	return ptr;

}



static void

static __init void

set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)

{

	pgd_t *pgd;
@@ -214,7 +214,7 @@ void __init cleanup_highmap(void) 
}



/* NOTE: this is meant to be run only at boot */

void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)

void __init __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)

{

	unsigned long address = __fix_to_virt(idx);
@@ -506,7 +506,7 @@ early_param("memtest", parse_memtest); 


static void __init early_memtest(unsigned long start, unsigned long end)

{

	u64 t_start, t_size;

	unsigned long t_start, t_size;

	unsigned pattern;



	if (!memtest_pattern)
@@ -525,7 +525,7 @@ static void __init early_memtest(unsigned long start, unsigned long end) 
			if (t_start + t_size > end)

				t_size = end - t_start;



			printk(KERN_CONT "\n  %016llx - %016llx pattern %d",

			printk(KERN_CONT "\n  %016lx - %016lx pattern %d",

				t_start, t_start + t_size, pattern);



			memtest(t_start, t_size, pattern);