memcg, slab: do not destroy children caches if parent has aliases

[karo-tx-linux.git] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index e6141be2fad576ccb261d270a7d6bdace5d7a239..9212b017bc7236cfc63afe5c268cc741995a1af4 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -299,7 +299,7 @@ extern void
 unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops);
 extern void unregister_ftrace_function_probe_all(char *glob);
 
-extern int ftrace_text_reserved(void *start, void *end);
+extern int ftrace_text_reserved(const void *start, const void *end);
 
 extern int ftrace_nr_registered_ops(void);
 
@@ -330,12 +330,9 @@ enum {
 #define FTRACE_REF_MAX         ((1UL << 29) - 1)
 
 struct dyn_ftrace {
-       union {
-               unsigned long           ip; /* address of mcount call-site */
-               struct dyn_ftrace       *freelist;
-       };
+       unsigned long           ip; /* address of mcount call-site */
        unsigned long           flags;
-       struct dyn_arch_ftrace          arch;
+       struct dyn_arch_ftrace  arch;
 };
 
 int ftrace_force_update(void);
@@ -423,7 +420,7 @@ ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable);
 
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
-extern int ftrace_dyn_arch_init(void *data);
+extern int ftrace_dyn_arch_init(void);
 extern void ftrace_replace_code(int enable);
 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
@@ -555,7 +552,7 @@ static inline __init int unregister_ftrace_command(char *cmd_name)
 {
        return -EINVAL;
 }
-static inline int ftrace_text_reserved(void *start, void *end)
+static inline int ftrace_text_reserved(const void *start, const void *end)
 {
        return 0;
 }