From 817f72d680828bb848099adf69fd35c14ff2e182 Mon Sep 17 00:00:00 2001 From: Steven King Date: Wed, 11 Jun 2014 20:01:10 -0700 Subject: 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: Steven King Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/virtconvert.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch') diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h index f35229b8651d..b8a82fb1cef8 100644 --- a/arch/m68k/include/asm/virtconvert.h +++ b/arch/m68k/include/asm/virtconvert.h @@ -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, -- cgit v1.2.3-70-g09d2 From 9a1a1aea7572179bebb7e9755be4c7d220e05cb4 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 20 Jun 2014 09:29:36 +0200 Subject: m68knommu: Remove unnecessary prototype for kobjsize() The prototype for kobjsize() is already defined in linux/mm.h which is included where kobjsize() is used. Signed-off-by: Tobias Klauser Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/pgtable_no.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch') diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h index c527fc2ecf82..11859b86b1f9 100644 --- a/arch/m68k/include/asm/pgtable_no.h +++ b/arch/m68k/include/asm/pgtable_no.h @@ -45,11 +45,6 @@ static inline int pte_file(pte_t pte) { return 0; } */ #define ZERO_PAGE(vaddr) (virt_to_page(0)) -/* - * These would be in other places but having them here reduces the diffs. - */ -extern unsigned int kobjsize(const void *objp); - /* * No page table caches to initialise. */ -- cgit v1.2.3-70-g09d2