Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 655a0443470a73d5dc36e974a241e8db59bb1ccb

Authored by KAMEZAWA Hiroyuki
Committed by Linus Torvalds
1 parent e6009f1ba5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] unify pfn_to_page: xtensa pfn_to_page 

xtensa can use generic funcs.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

include/asm-xtensa/page.h
Diff comments   View file @ 655a044
... ... @@ -109,10 +109,7 @@
109 109 #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
110 110 #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
111 111 #define pfn_valid(pfn) ((unsigned long)pfn < max_mapnr)
112   -#ifndef CONFIG_DISCONTIGMEM
113   -# define pfn_to_page(pfn) (mem_map + (pfn))
114   -# define page_to_pfn(page) ((unsigned long)((page) - mem_map))
115   -#else
  112 +#ifdef CONFIG_DISCONTIGMEM
116 113 # error CONFIG_DISCONTIGMEM not supported
117 114 #endif
118 115  
... ... @@ -130,5 +127,6 @@
130 127 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
131 128  
132 129 #endif /* __KERNEL__ */
  130 +#include <asm-generic/memory_model.h>
133 131 #endif /* _XTENSA_PAGE_H */