From a1282400e152206a444ab1784cee8c2a9714b672 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 8 Nov 2008 13:53:33 +0100 Subject: [PATCH] --- yaml --- r: 118598 b: refs/heads/master c: c5d712433ff57a66d8fb79a57a4fc7a7c3467b97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/memory_model.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b70768643561..92c3a3ed8f4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fed4d59b6ec5481caceb17863f19a0b0e5eaa939 +refs/heads/master: c5d712433ff57a66d8fb79a57a4fc7a7c3467b97 diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h index ae060c62aff1..18546d8eb78e 100644 --- a/trunk/include/asm-generic/memory_model.h +++ b/trunk/include/asm-generic/memory_model.h @@ -34,7 +34,7 @@ #define __pfn_to_page(pfn) \ ({ unsigned long __pfn = (pfn); \ - unsigned long __nid = arch_pfn_to_nid(pfn); \ + unsigned long __nid = arch_pfn_to_nid(__pfn); \ NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\ })