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

Unverified Commit 31875a54 authored by Paul Burton's avatar Paul Burton
Browse files

MIPS: Make virt_addr_valid() return bool 



virt_addr_valid() really returns a boolean value, but currently uses an
integer to represent it. Switch to the bool type to make it clearer that
we really are returning a true or false value.

Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Cc: linux-mips@vger.kernel.org
parent 074a1e11

arch/mips/include/asm/page.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ static inline int pfn_valid(unsigned long pfn) 
#define virt_to_pfn(kaddr)   	PFN_DOWN(virt_to_phys((void *)(kaddr)))

#define virt_to_pfn(kaddr)   	PFN_DOWN(virt_to_phys((void *)(kaddr)))

#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))

#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))





extern int __virt_addr_valid(const volatile void *kaddr);

extern bool __virt_addr_valid(const volatile void *kaddr);

#define virt_addr_valid(kaddr)						\

#define virt_addr_valid(kaddr)						\

	__virt_addr_valid((const volatile void *) (kaddr))

	__virt_addr_valid((const volatile void *) (kaddr))

arch/mips/mm/mmap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -201,12 +201,12 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 
	return ret;

	return ret;

}

}





int __virt_addr_valid(const volatile void *kaddr)

bool __virt_addr_valid(const volatile void *kaddr)

{

{

	unsigned long vaddr = (unsigned long)vaddr;

	unsigned long vaddr = (unsigned long)vaddr;





	if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE))

	if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE))

		return 0;

		return false;





	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));

	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));

}

}