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: Daniel J Blueman <daniel.blueman@gmail.com>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Daniel J Blueman
2008-06-15 12:32:15 +01:00
committed by Ingo Molnar
parent 41aefdcc98
commit 0b1faeef5f

View File

@@ -135,7 +135,7 @@ static __init void *spp_getpage(void)
return ptr; return ptr;
} }
static void static __init void
set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
{ {
pgd_t *pgd; pgd_t *pgd;
@@ -214,7 +214,7 @@ void __init cleanup_highmap(void)
} }
/* NOTE: this is meant to be run only at boot */ /* 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); 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) static void __init early_memtest(unsigned long start, unsigned long end)
{ {
u64 t_start, t_size; unsigned long t_start, t_size;
unsigned pattern; unsigned pattern;
if (!memtest_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) if (t_start + t_size > end)
t_size = end - t_start; 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); t_start, t_start + t_size, pattern);
memtest(t_start, t_size, pattern); memtest(t_start, t_size, pattern);