projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
proc_ppc64.c
diff --git
a/arch/powerpc/kernel/proc_ppc64.c
b/arch/powerpc/kernel/proc_ppc64.c
index
7ba42a4
..
f598cb5
100644
(file)
--- a/
arch/powerpc/kernel/proc_ppc64.c
+++ b/
arch/powerpc/kernel/proc_ppc64.c
@@
-16,13
+16,13
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* 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>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/kernel.h>
+#include <asm/machdep.h>
#include <asm/vdso_datapage.h>
#include <asm/rtas.h>
#include <asm/uaccess.h>
#include <asm/vdso_datapage.h>
#include <asm/rtas.h>
#include <asm/uaccess.h>
@@
-51,7
+51,7
@@
static int __init proc_ppc64_create(void)
if (!root)
return 1;
if (!root)
return 1;
- if (!
(platform_is_pseries() || _machine == PLATFORM_CELL
))
+ if (!
of_find_node_by_path("/rtas"
))
return 0;
if (!proc_mkdir("rtas", root))
return 0;
if (!proc_mkdir("rtas", root))
@@
-114,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);
{
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;
if ((vma->vm_end - vma->vm_start) > dp->size)
return -EINVAL;