diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2014-04-26 09:57:34 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-02 01:30:20 -0400 |
| commit | c46064b4e8fecc469ec2fa606ad0cccf4d2e49c0 (patch) | |
| tree | e623d7a823215a98c52ec443f7124b6cb2241eab | |
| parent | Merge branch 'sparc32-sparse' (diff) | |
| download | linux-dev-c46064b4e8fecc469ec2fa606ad0cccf4d2e49c0.tar.xz linux-dev-c46064b4e8fecc469ec2fa606ad0cccf4d2e49c0.zip | |
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: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/include/asm/io_32.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/io_64.h | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/page.h | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h index c1acbd891cbc..271c94a74aad 100644 --- a/arch/sparc/include/asm/io_32.h +++ b/arch/sparc/include/asm/io_32.h @@ -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); diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h index 09b0b88aeb2a..44845632e983 100644 --- a/arch/sparc/include/asm/io_64.h +++ b/arch/sparc/include/asm/io_64.h @@ -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) { diff --git a/arch/sparc/include/asm/page.h b/arch/sparc/include/asm/page.h index f21de0349025..1be2fdec6268 100644 --- a/arch/sparc/include/asm/page.h +++ b/arch/sparc/include/asm/page.h @@ -1,5 +1,8 @@ #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 |