Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer: "Just a couple of small fixes. Fix definition of page_to_phys() and remove unecesary prototype of kobjsize()" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: Remove unnecessary prototype for kobjsize() m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero.
This commit is contained in:
commit
f67d251a87
|
@ -45,11 +45,6 @@ static inline int pte_file(pte_t pte) { return 0; }
|
||||||
*/
|
*/
|
||||||
#define ZERO_PAGE(vaddr) (virt_to_page(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.
|
* No page table caches to initialise.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,16 +26,12 @@ static inline void *phys_to_virt(unsigned long address)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Permanent address of a page. */
|
/* Permanent address of a page. */
|
||||||
#ifdef CONFIG_MMU
|
#if defined(CONFIG_MMU) && defined(CONFIG_SINGLE_MEMORY_CHUNK)
|
||||||
#ifdef CONFIG_SINGLE_MEMORY_CHUNK
|
|
||||||
#define page_to_phys(page) \
|
#define page_to_phys(page) \
|
||||||
__pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
|
__pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
|
||||||
#else
|
#else
|
||||||
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
|
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
|
||||||
#endif
|
#endif
|
||||||
#else
|
|
||||||
#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IO bus memory addresses are 1:1 with the physical address,
|
* IO bus memory addresses are 1:1 with the physical address,
|
||||||
|
|
Loading…
Reference in a new issue