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

Commit 817f72d6 authored by Steven King's avatar Steven King Committed by Greg Ungerer
Browse files

m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero. 



The definition of page_to_phys for nommu produces an incorrect value when
PAGE_OFFSET is non-zero.  The nommu version of page_to_pfn works correctly
for non-zero PAGE_OFFSET, so use that instead.

Signed-off-by: default avatarSteven King <sfking@fdwdc.com>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 7171511e

arch/m68k/include/asm/virtconvert.h

+1 −5
Original line number Diff line number Diff line
@@ -26,16 +26,12 @@ static inline void *phys_to_virt(unsigned long address) 
}



/* Permanent address of a page. */

#ifdef CONFIG_MMU

#ifdef CONFIG_SINGLE_MEMORY_CHUNK

#if defined(CONFIG_MMU) && defined(CONFIG_SINGLE_MEMORY_CHUNK)

#define page_to_phys(page) \

	__pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))

#else

#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)

#endif

#else

#define page_to_phys(page)	(((page) - mem_map) << PAGE_SHIFT)

#endif



/*

 * IO bus memory addresses are 1:1 with the physical address,