ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead of UDMA6

[cascardo/linux.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 098bdb7..1c755b2 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -15,12 +15,13 @@
 #include <linux/stringify.h>
 #include <linux/kobject.h>
 #include <linux/moduleparam.h>
-#include <linux/marker.h>
 #include <linux/tracepoint.h>
-#include <asm/local.h>
 
+#include <asm/local.h>
 #include <asm/module.h>
 
+#include <trace/events/module.h>
+
 /* Not Yet Implemented */
 #define MODULE_SUPPORTED_DEVICE(name)
 
@@ -325,10 +326,6 @@ struct module
        /* The command line arguments (may be mangled).  People like
           keeping pointers to this stuff */
        char *args;
-#ifdef CONFIG_MARKERS
-       struct marker *markers;
-       unsigned int num_markers;
-#endif
 #ifdef CONFIG_TRACEPOINTS
        struct tracepoint *tracepoints;
        unsigned int num_tracepoints;
@@ -462,7 +459,10 @@ static inline local_t *__module_ref_addr(struct module *mod, int cpu)
 static inline void __module_get(struct module *module)
 {
        if (module) {
-               local_inc(__module_ref_addr(module, get_cpu()));
+               unsigned int cpu = get_cpu();
+               local_inc(__module_ref_addr(module, cpu));
+               trace_module_get(module, _THIS_IP_,
+                                local_read(__module_ref_addr(module, cpu)));
                put_cpu();
        }
 }
@@ -473,8 +473,11 @@ static inline int try_module_get(struct module *module)
 
        if (module) {
                unsigned int cpu = get_cpu();
-               if (likely(module_is_live(module)))
+               if (likely(module_is_live(module))) {
                        local_inc(__module_ref_addr(module, cpu));
+                       trace_module_get(module, _THIS_IP_,
+                               local_read(__module_ref_addr(module, cpu)));
+               }
                else
                        ret = 0;
                put_cpu();
@@ -527,8 +530,6 @@ int unregister_module_notifier(struct notifier_block * nb);
 
 extern void print_modules(void);
 
-extern void module_update_markers(void);
-
 extern void module_update_tracepoints(void);
 extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);
 
@@ -643,10 +644,6 @@ static inline void print_modules(void)
 {
 }
 
-static inline void module_update_markers(void)
-{
-}
-
 static inline void module_update_tracepoints(void)
 {
 }