Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

2 files changed, 3 insertions, 6 deletions

diff --git a/arch/m32r/mm/extable.c b/arch/m32r/mm/extable.c
index 9a97363b6524..1743f23d49a3 100644
--- a/arch/m32r/mm/extable.c
+++ b/arch/m32r/mm/extable.c
@@ -1,10 +1,8 @@
 /*
- * linux/arch/i386/mm/extable.c
+ * linux/arch/m32r/mm/extable.c
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
-#include <linux/spinlock.h>
 #include <asm/uaccess.h>
 
 int fixup_exception(struct pt_regs *regs)
@@ -19,4 +17,3 @@ int fixup_exception(struct pt_regs *regs)
 
         return 0;
 }
-
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index bc423d838fb8..d9a40b1fe8ba 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -49,7 +49,7 @@ void show_mem(void)
         printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
         for_each_pgdat(pgdat) {
                 for (i = 0; i < pgdat->node_spanned_pages; ++i) {
-                        page = pgdat->node_mem_map + i;
+                        page = pgdat_page_nr(pgdat, i);
                         total++;
                         if (PageHighMem(page))
                                 highmem++;
@@ -152,7 +152,7 @@ int __init reservedpages_count(void)
         reservedpages = 0;
         for_each_online_node(nid)
                 for (i = 0 ; i < MAX_LOW_PFN(nid) - START_PFN(nid) ; i++)
-                        if (PageReserved(NODE_DATA(nid)->node_mem_map + i))
+                        if (PageReserved(nid_page_nr(nid, i)))
                                 reservedpages++;
 
         return reservedpages;