arm64: avoid prototype warnings for syscalls

[linux.git] / include / linux / dynamic_debug.h

diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 41682278d2e825b61feb1f632aa370500799a6c4..061dd84d09f30625ae41d21720783e03f51bfaef 100644 (file)
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -128,17 +128,16 @@ struct ddebug_class_param {
        const struct ddebug_class_map *map;
 };
 
        const struct ddebug_class_map *map;
 };
 

-#if defined(CONFIG_DYNAMIC_DEBUG_CORE)
-
-int ddebug_add_module(struct _ddebug_info *dyndbg, const char *modname);
+/*
+ * pr_debug() and friends are globally enabled or modules have selectively
+ * enabled them.
+ */
+#if defined(CONFIG_DYNAMIC_DEBUG) || \
+       (defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))

 
 

-extern int ddebug_remove_module(const char *mod_name);

 extern __printf(2, 3)
 void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
 
 extern __printf(2, 3)
 void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
 

-extern int ddebug_dyndbg_module_param_cb(char *param, char *val,
-                                       const char *modname);
-

 struct device;
 
 extern __printf(3, 4)
 struct device;
 
 extern __printf(3, 4)


@@ -287,10 +286,6 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
                                   KERN_DEBUG, prefix_str, prefix_type, \
                                   rowsize, groupsize, buf, len, ascii)
 
                                   KERN_DEBUG, prefix_str, prefix_type, \
                                   rowsize, groupsize, buf, len, ascii)
 

-struct kernel_param;
-int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp);
-int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp);
-

 /* for test only, generally expect drm.debug style macro wrappers */
 #define __pr_debug_cls(cls, fmt, ...) do {                     \
        BUILD_BUG_ON_MSG(!__builtin_constant_p(cls),            \
 /* for test only, generally expect drm.debug style macro wrappers */
 #define __pr_debug_cls(cls, fmt, ...) do {                     \
        BUILD_BUG_ON_MSG(!__builtin_constant_p(cls),            \


@@ -298,21 +293,38 @@ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp);
        dynamic_pr_debug_cls(cls, fmt, ##__VA_ARGS__);          \
        } while (0)
 
        dynamic_pr_debug_cls(cls, fmt, ##__VA_ARGS__);          \
        } while (0)
 

-#else /* !CONFIG_DYNAMIC_DEBUG_CORE */
+#else /* !(CONFIG_DYNAMIC_DEBUG || (CONFIG_DYNAMIC_DEBUG_CORE && DYNAMIC_DEBUG_MODULE)) */

 
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 
 
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 

-static inline int ddebug_add_module(struct _ddebug_info *dinfo, const char *modname)
-{
-       return 0;
-}
+#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)
+#define DYNAMIC_DEBUG_BRANCH(descriptor) false

 
 

-static inline int ddebug_remove_module(const char *mod)
-{
-       return 0;
-}
+#define dynamic_pr_debug(fmt, ...)                                     \
+       do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
+#define dynamic_dev_dbg(dev, fmt, ...)                                 \
+       do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
+#define dynamic_hex_dump(prefix_str, prefix_type, rowsize,             \
+                        groupsize, buf, len, ascii)                    \
+       do { if (0)                                                     \
+               print_hex_dump(KERN_DEBUG, prefix_str, prefix_type,     \
+                               rowsize, groupsize, buf, len, ascii);   \
+       } while (0)
+
+#endif /* CONFIG_DYNAMIC_DEBUG || (CONFIG_DYNAMIC_DEBUG_CORE && DYNAMIC_DEBUG_MODULE) */
+
+
+#ifdef CONFIG_DYNAMIC_DEBUG_CORE
+
+extern int ddebug_dyndbg_module_param_cb(char *param, char *val,
+                                       const char *modname);
+struct kernel_param;
+int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp);
+int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp);
+
+#else

 
 static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
                                                const char *modname)
 
 static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
                                                const char *modname)


@@ -326,25 +338,15 @@ static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
        return -EINVAL;
 }
 
        return -EINVAL;
 }
 

-#define dynamic_pr_debug(fmt, ...)                                     \
-       do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
-#define dynamic_dev_dbg(dev, fmt, ...)                                 \
-       do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
-#define dynamic_hex_dump(prefix_str, prefix_type, rowsize,             \
-                        groupsize, buf, len, ascii)                    \
-       do { if (0)                                                     \
-               print_hex_dump(KERN_DEBUG, prefix_str, prefix_type,     \
-                               rowsize, groupsize, buf, len, ascii);   \
-       } while (0)
-

 struct kernel_param;
 static inline int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp)
 { return 0; }
 static inline int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp)
 { return 0; }
 
 struct kernel_param;
 static inline int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp)
 { return 0; }
 static inline int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp)
 { return 0; }
 

-#endif /* !CONFIG_DYNAMIC_DEBUG_CORE */
+#endif
+

 
 extern const struct kernel_param_ops param_ops_dyndbg_classes;
 
 
 extern const struct kernel_param_ops param_ops_dyndbg_classes;
 

-#endif
+#endif /* _DYNAMIC_DEBUG_H */