Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-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 3c2cf66..f598cb5 100644 (file)
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
@@ -52,7 +51,7 @@ static int __init proc_ppc64_create(void)
        if (!root)
                return 1;
 
-       if (!machine_is(pseries) && !machine_is(cell))
+       if (!of_find_node_by_path("/rtas"))
                return 0;
 
        if (!proc_mkdir("rtas", root))
@@ -115,8 +114,6 @@ static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
 {
        struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
 
-       vma->vm_flags |= VM_SHM | VM_LOCKED;
-
        if ((vma->vm_end - vma->vm_start) > dp->size)
                return -EINVAL;