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

Commit c46064b4 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: move page_to_phys to page.h 



Preparation for introducing asm-generic/io.h this move was required.
In asm-generic page_to_phys is placed in page.h - so do the same here.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8cf749a8

arch/sparc/include/asm/io_32.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <asm/page.h>      /* IO address mapping routines need this */

#include <asm-generic/pci_iomap.h>



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



static inline u32 flip_dword (u32 l)

{

	return ((l&0xff)<<24) | (((l>>8)&0xff)<<16) | (((l>>16)&0xff)<<8)| ((l>>24)&0xff);

arch/sparc/include/asm/io_64.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


/* BIO layer definitions. */

extern unsigned long kern_base, kern_size;

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



static inline u8 _inb(unsigned long addr)

{

arch/sparc/include/asm/page.h

+3 −0
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_PAGE_H

#define ___ASM_SPARC_PAGE_H



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



#if defined(__sparc__) && defined(__arch64__)

#include <asm/page_64.h>

#else