Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index e31dd97e611434fa207bc3e013e081c30aea5e34..cbb57194687e393a16e9e0e74381bfcb2569b720 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3262,14 +3262,14 @@ static int fault_around_bytes_set(void *data, u64 val)
                fault_around_bytes = PAGE_SIZE; /* rounddown_pow_of_two(0) is undefined */
        return 0;
 }
-DEFINE_SIMPLE_ATTRIBUTE(fault_around_bytes_fops,
+DEFINE_DEBUGFS_ATTRIBUTE(fault_around_bytes_fops,
                fault_around_bytes_get, fault_around_bytes_set, "%llu\n");
 
 static int __init fault_around_debugfs(void)
 {
        void *ret;
 
-       ret = debugfs_create_file("fault_around_bytes", 0644, NULL, NULL,
+       ret = debugfs_create_file_unsafe("fault_around_bytes", 0644, NULL, NULL,
                        &fault_around_bytes_fops);
        if (!ret)
                pr_warn("Failed to create fault_around_bytes in debugfs");