Author: mcayland Date: Thu Dec 30 14:28:36 2010 New Revision: 990 URL: http://tracker.coreboot.org/trac/openbios/changeset/990
Log: Remove inline declaration from existing va2pa() and pa2va() functions as suggested by Blue.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@siriusit.co.uk
Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/include/libopenbios/ofmem.h
Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc32/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -88,7 +88,7 @@ #define ALLOC_BLOCK (64 * 1024)
/* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -98,7 +98,7 @@ return va; }
-inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) &&
Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc64/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -37,7 +37,7 @@ }
/* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -47,7 +47,7 @@ return va; }
-inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) &&
Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:28:36 2010 (r990) @@ -76,8 +76,8 @@ ucell mode );
/* Private functions for mapping between physical/virtual addresses */ -extern inline phys_addr_t va2pa(unsigned long va); -extern inline unsigned long pa2va(phys_addr_t pa); +extern phys_addr_t va2pa(unsigned long va); +extern unsigned long pa2va(phys_addr_t pa); /* malloc interface */ extern void* ofmem_malloc( size_t size );