renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 03:04:01 +08:00
Code

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse Source 
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:
Linus Torvalds 2014-08-05 09:58:37 -07:00
commit f67d251a87
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/m68k/include/asm/pgtable_no.h
View File

@ -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.
*/

6
arch/m68k/include/asm/virtconvert.h
View File

@ -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,