Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / arch / ia64 / kernel / perfmon.c

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index dc063fe6646a38f88a4eec1a09c32ddc5c0dfa5b..5f4243f0acfa47be82766b2ccb9f8bbe13bcd55e 100644 (file)
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2145,22 +2145,12 @@ doit:
        return 0;
 }
 
-static int
-pfm_no_open(struct inode *irrelevant, struct file *dontcare)
-{
-       DPRINT(("pfm_no_open called\n"));
-       return -ENXIO;
-}
-
-
-
 static const struct file_operations pfm_file_ops = {
        .llseek         = no_llseek,
        .read           = pfm_read,
        .write          = pfm_write,
        .poll           = pfm_poll,
        .unlocked_ioctl = pfm_ioctl,
-       .open           = pfm_no_open,  /* special open code to disallow open via /proc */
        .fasync         = pfm_fasync,
        .release        = pfm_close,
        .flush          = pfm_flush