Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f3ea4e2..007a3de 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -318,7 +318,7 @@ int __register_ftrace_function(struct ftrace_ops *ops)
        if (!ftrace_enabled && (ops->flags & FTRACE_OPS_FL_PERMANENT))
                return -EBUSY;
 
-       if (!core_kernel_data((unsigned long)ops))
+       if (!is_kernel_core_data((unsigned long)ops))
                ops->flags |= FTRACE_OPS_FL_DYNAMIC;
 
        add_ftrace_ops(&ftrace_ops_list, ops);