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

Commit 5dda676c authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: x86: use the correct function type for native_set_fixmap 



Bug: 133186739
Change-Id: Iae48f393231e53f390bb0bfd5ebbe4bb3c0fd463
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 2d96fcbd

arch/x86/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ extern pte_t *kmap_pte; 
extern pte_t *pkmap_page_table;



void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);

void native_set_fixmap(enum fixed_addresses idx,

void native_set_fixmap(unsigned /* enum fixed_addresses */ idx,

		       phys_addr_t phys, pgprot_t flags);



#ifndef CONFIG_PARAVIRT

arch/x86/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) 
	fixmaps_set++;

}



void native_set_fixmap(enum fixed_addresses idx, phys_addr_t phys,

void native_set_fixmap(unsigned /* enum fixed_addresses */ idx, phys_addr_t phys,

		       pgprot_t flags)

{

	/* Sanitize 'prot' against any unsupported bits: */