3 files changed, 19 insertions, 10 deletions

diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index d022cb8fd725..5c29a9fb4a44 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -251,7 +251,9 @@ static int msr_class_device_create(int i)
         return err;
 }
 
-static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+#ifdef CONFIG_HOTPLUG_CPU
+static int msr_class_cpu_callback(struct notifier_block *nfb,
+                                unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
 
@@ -270,6 +272,7 @@ static struct notifier_block __cpuinitdata msr_class_cpu_notifier =
 {
         .notifier_call = msr_class_cpu_callback,
 };
+#endif
 
 static int __init msr_init(void)
 {
@@ -292,7 +295,7 @@ static int __init msr_init(void)
                 if (err != 0)
                         goto out_class;
         }
-        register_cpu_notifier(&msr_class_cpu_notifier);
+        register_hotcpu_notifier(&msr_class_cpu_notifier);
 
         err = 0;
         goto out;
@@ -315,7 +318,7 @@ static void __exit msr_exit(void)
                 class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
         class_destroy(msr_class);
         unregister_chrdev(MSR_MAJOR, "cpu/msr");
-        unregister_cpu_notifier(&msr_class_cpu_notifier);
+        unregister_hotcpu_notifier(&msr_class_cpu_notifier);
 }
 
 module_init(msr_init);
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c
index 5b8b579a079f..6e9e494c6c3d 100644
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
@@ -1938,3 +1938,9 @@ smp_cpus_done(unsigned int max_cpus)
 {
         zap_low_mappings();
 }
+
+void __init
+smp_setup_processor_id(void)
+{
+        current_thread_info()->cpu = hard_smp_processor_id();
+}
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c
index 2889567e21a1..5e735ff90e8a 100644
--- a/arch/i386/mm/pgtable.c
+++ b/arch/i386/mm/pgtable.c
@@ -30,7 +30,6 @@ void show_mem(void)
         struct page *page;
         pg_data_t *pgdat;
         unsigned long i;
-        struct page_state ps;
         unsigned long flags;
 
         printk(KERN_INFO "Mem-info:\n");
@@ -58,12 +57,13 @@ void show_mem(void)
         printk(KERN_INFO "%d pages shared\n", shared);
         printk(KERN_INFO "%d pages swap cached\n", cached);
 
-        get_page_state(&ps);
-        printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);
-        printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
-        printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);
-        printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);
-        printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
+        printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY));
+        printk(KERN_INFO "%lu pages writeback\n",
+                                        global_page_state(NR_WRITEBACK));
+        printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));
+        printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB));
+        printk(KERN_INFO "%lu pages pagetables\n",
+                                        global_page_state(NR_PAGETABLE));
 }
 
 /*