Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / powerpc / kernel / proc_ppc64.c

diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index dd7001cacf75cfc09040b05961c39bb7c0471cfd..f78dfce1b771241256d4242c328286cbc3c92a8a 100644 (file)
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -33,7 +33,7 @@ static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes
                              loff_t *ppos);
 static int     page_map_mmap( struct file *file, struct vm_area_struct *vma );
 
-static struct file_operations page_map_fops = {
+static const struct file_operations page_map_fops = {
        .llseek = page_map_seek,
        .read   = page_map_read,
        .mmap   = page_map_mmap
@@ -71,7 +71,6 @@ static int __init proc_ppc64_init(void)
        pde = create_proc_entry("ppc64/systemcfg", S_IFREG|S_IRUGO, NULL);
        if (!pde)
                return 1;
-       pde->nlink = 1;
        pde->data = vdso_data;
        pde->size = PAGE_SIZE;
        pde->proc_fops = &page_map_fops;