vserver 1.9.5.x5
[linux-2.6.git] / include / asm-alpha / mmzone.h
index ce75633..726c150 100644 (file)
@@ -107,7 +107,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
 
 #define pfn_to_page(pfn)                                               \
 ({                                                                     \
-       unsigned long kaddr = (unsigned long)__va(pfn << PAGE_SHIFT);   \
+       unsigned long kaddr = (unsigned long)__va((pfn) << PAGE_SHIFT); \
        (node_mem_map(kvaddr_to_nid(kaddr)) + local_mapnr(kaddr));      \
 })
 
@@ -119,7 +119,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
        ((( (page) - page_zone(page)->zone_mem_map )                    \
        + page_zone(page)->zone_start_pfn) << PAGE_SHIFT)
 
-#define pfn_to_nid(pfn)                pa_to_nid(((u64)pfn << PAGE_SHIFT))
+#define pfn_to_nid(pfn)                pa_to_nid(((u64)(pfn) << PAGE_SHIFT))
 #define pfn_valid(pfn)                                                 \
        (((pfn) - node_start_pfn(pfn_to_nid(pfn))) <                    \
         node_spanned_pages(pfn_to_nid(pfn)))                                   \