2 files changed, 2 insertions, 1 deletions

diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h
index 2b799c90b2d4..11e57b6a85fc 100644
--- a/include/asm-generic/kdebug.h
+++ b/include/asm-generic/kdebug.h
@@ -3,6 +3,7 @@
 
 enum die_val {
         DIE_UNUSED,
+        DIE_OOPS=1
 };
 
 #endif /* _ASM_GENERIC_KDEBUG_H */
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);\
 })