diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
| commit | 9f48c89862e39b7f33b44123fc425cf901c89428 (patch) | |
| tree | 373886606ada8c2e0c362afbcce490af27d21552 /arch/sparc/include/asm/page.h | |
| parent | 2a211f320ee3d86835b40efd2948642482d3c933 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/include/asm/page.h')
| -rw-r--r-- | arch/sparc/include/asm/page.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
| 1 | #ifndef ___ASM_SPARC_PAGE_H | 1 | #ifndef ___ASM_SPARC_PAGE_H |
| 2 | #define ___ASM_SPARC_PAGE_H | 2 | #define ___ASM_SPARC_PAGE_H |
| 3 | |||
| 4 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | ||
| 5 | |||
| 3 | #if defined(__sparc__) && defined(__arch64__) | 6 | #if defined(__sparc__) && defined(__arch64__) |
| 4 | #include <asm/page_64.h> | 7 | #include <asm/page_64.h> |
| 5 | #else | 8 | #else |