Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / proc_ppc64.c

diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index a1c19502fe8bb9f96e35261a97d87e95add7c919..3c2cf661f6d997bf589c6f1c95cd617be599b622 100644 (file)
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -23,7 +23,8 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 
-#include <asm/systemcfg.h>
+#include <asm/machdep.h>
+#include <asm/vdso_datapage.h>
 #include <asm/rtas.h>
 #include <asm/uaccess.h>
 #include <asm/prom.h>
@@ -51,7 +52,7 @@ static int __init proc_ppc64_create(void)
        if (!root)
                return 1;
 
-       if (!(platform_is_pseries() || _machine == PLATFORM_CELL))
+       if (!machine_is(pseries) && !machine_is(cell))
                return 0;
 
        if (!proc_mkdir("rtas", root))
@@ -72,7 +73,7 @@ static int __init proc_ppc64_init(void)
        if (!pde)
                return 1;
        pde->nlink = 1;
-       pde->data = _systemcfg;
+       pde->data = vdso_data;
        pde->size = PAGE_SIZE;
        pde->proc_fops = &page_map_fops;