Re: Linux 2.6.17-rc1

[KAMEZAWA Hiroyuki]

On Sun, 2 Apr 2006 20:47:06 -0700 (PDT)
Linus Torvalds <torvalds@xxxxxxxx> wrote:

> 
> Ok, 
>  it's two weeks since 2.6.16, and the merge window is closed.
> 

Because my original patch was buggy and not tested, arm cannot work.
This is a fix patch.

Is this Okay? > Russell-san
-Kame
==
This patch fixes arch_local_page_offset(pfn,nid) in arm.
This macro calculate page offset in a node.

Note:
comment from arm's sub-archs. include/asm-arm/arch-clps711x/memory.h
/*
 * Given a kaddr, LOCAL_MAR_NR finds the owning node of the memory
 * and returns the index corresponding to the appropriate page in the
 * node's mem_map.
 */

Signed-Off-By:KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxx>

Index: linux-2.6.17-rc1/include/asm-arm/memory.h
===================================================================
--- linux-2.6.17-rc1.orig/include/asm-arm/memory.h
+++ linux-2.6.17-rc1/include/asm-arm/memory.h
@@ -188,7 +188,7 @@ static inline __deprecated void *bus_to_
  */
 #include <linux/numa.h>
 #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_to_kaddr(pfn)))
 
 #define pfn_valid(pfn)						\
 	({							\

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/