diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-11-08 13:53:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-11-13 09:56:04 -0800 |
| commit | e5cac99d60ed711440aa10d134300d5180d0356f (patch) | |
| tree | 1b9c198149320a344dbd067b10c9aef63188bd3b | |
| parent | e3145e60d787d3178cdd2576ad158d254bbaf8f1 (diff) | |
| download | lwn-e5cac99d60ed711440aa10d134300d5180d0356f.tar.gz lwn-e5cac99d60ed711440aa10d134300d5180d0356f.zip | |
Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y
commit c5d712433ff57a66d8fb79a57a4fc7a7c3467b97 upstream
Fix the __pfn_to_page(pfn) macro so that it doesn't evaluate its
argument twice in the CONFIG_DISCONTIGMEM=y case, because 'pfn' may
be a result of a funtion call having side effects.
For example, the hibernation code applies pfn_to_page(pfn) to the
result of a function returning the pfn corresponding to the next set
bit in a bitmap and the current bit position is modified on each
call. This leads to "interesting" failures for CONFIG_DISCONTIGMEM=y
due to the current behavior of __pfn_to_page(pfn).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 @@ #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);\ }) |