Commit 0da32350 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Russell King

[ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1

This patch fixes arch_local_page_offset(pfn,nid) in arm.
This new one (added by unify_pfn_to_page patches) is obviously buggy.

This macro calculate page offset in a node.

Note: about LOCAL_MAP_NR()
comment in arm's sub-archs says...

 /*
  * Given a kaddr, LOCAL_MAP_NR finds the owning node of the memory
  * and returns the index corresponding to the appropriate page in the
  * node's mem_map.
  */

but LOCAL_MAP_NR() is designed to be able to take both paddr and kaddr.
In this case, paddr is better.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitu.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6246b612
...@@ -188,7 +188,7 @@ static inline __deprecated void *bus_to_virt(unsigned long x) ...@@ -188,7 +188,7 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
*/ */
#include <linux/numa.h> #include <linux/numa.h>
#define arch_pfn_to_nid(pfn) (PFN_TO_NID(pfn)) #define arch_pfn_to_nid(pfn) (PFN_TO_NID(pfn))
#define arch_local_page_offset(pfn, nid) (LOCAL_MAP_NR((pfn) << PAGE_OFFSET)) #define arch_local_page_offset(pfn, nid) LOCAL_MAP_NR((pfn) << PAGE_SHIFT)
#define pfn_valid(pfn) \ #define pfn_valid(pfn) \
({ \ ({ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment