diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /include/asm-generic/memory_model.h | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
Diffstat (limited to 'include/asm-generic/memory_model.h')
| -rw-r--r-- | include/asm-generic/memory_model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index ae060c62aff1..18546d8eb78e 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #define __pfn_to_page(pfn) \ | 35 | #define __pfn_to_page(pfn) \ |
| 36 | ({ unsigned long __pfn = (pfn); \ | 36 | ({ unsigned long __pfn = (pfn); \ |
| 37 | unsigned long __nid = arch_pfn_to_nid(pfn); \ | 37 | unsigned long __nid = arch_pfn_to_nid(__pfn); \ |
| 38 | NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\ | 38 | NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\ |
| 39 | }) | 39 | }) |
| 40 | 40 | ||