git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
param: Fix duplicate module prefixes
[pandora-kernel.git]
/
include
/
linux
/
module.h
diff --git
a/include/linux/module.h
b/include/linux/module.h
index
68e0955
..
3bfed01
100644
(file)
--- a/
include/linux/module.h
+++ b/
include/linux/module.h
@@
-16,6
+16,7
@@
#include <linux/kobject.h>
#include <linux/moduleparam.h>
#include <linux/marker.h>
#include <linux/kobject.h>
#include <linux/moduleparam.h>
#include <linux/marker.h>
+#include <linux/tracepoint.h>
#include <asm/local.h>
#include <asm/module.h>
#include <asm/local.h>
#include <asm/module.h>
@@
-28,7
+29,7
@@
#define MODULE_SYMBOL_PREFIX ""
#endif
#define MODULE_SYMBOL_PREFIX ""
#endif
-#define MODULE_NAME_LEN
(64 - sizeof(unsigned long))
+#define MODULE_NAME_LEN
MAX_PARAM_PREFIX_LEN
struct kernel_symbol
{
struct kernel_symbol
{
@@
-59,6
+60,7
@@
struct module_kobject
struct kobject kobj;
struct module *mod;
struct kobject *drivers_dir;
struct kobject kobj;
struct module *mod;
struct kobject *drivers_dir;
+ struct module_param_attrs *mp;
};
/* These are either module local, or the kernel's dummy ones. */
};
/* These are either module local, or the kernel's dummy ones. */
@@
-241,7
+243,6
@@
struct module
/* Sysfs stuff. */
struct module_kobject mkobj;
/* Sysfs stuff. */
struct module_kobject mkobj;
- struct module_param_attrs *param_attrs;
struct module_attribute *modinfo_attrs;
const char *version;
const char *srcversion;
struct module_attribute *modinfo_attrs;
const char *version;
const char *srcversion;
@@
-276,7
+277,7
@@
struct module
/* Exception table */
unsigned int num_exentries;
/* Exception table */
unsigned int num_exentries;
-
const
struct exception_table_entry *extable;
+ struct exception_table_entry *extable;
/* Startup function. */
int (*init)(void);
/* Startup function. */
int (*init)(void);
@@
-331,6
+332,10
@@
struct module
struct marker *markers;
unsigned int num_markers;
#endif
struct marker *markers;
unsigned int num_markers;
#endif
+#ifdef CONFIG_TRACEPOINTS
+ struct tracepoint *tracepoints;
+ unsigned int num_tracepoints;
+#endif
#ifdef CONFIG_MODULE_UNLOAD
/* What modules depend on me? */
#ifdef CONFIG_MODULE_UNLOAD
/* What modules depend on me? */
@@
-345,7
+350,6
@@
struct module
/* Reference counts */
struct module_ref ref[NR_CPUS];
#endif
/* Reference counts */
struct module_ref ref[NR_CPUS];
#endif
-
};
#ifndef MODULE_ARCH_INIT
#define MODULE_ARCH_INIT {}
};
#ifndef MODULE_ARCH_INIT
#define MODULE_ARCH_INIT {}
@@
-454,6
+458,9
@@
extern void print_modules(void);
extern void module_update_markers(void);
extern void module_update_markers(void);
+extern void module_update_tracepoints(void);
+extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);
+
#else /* !CONFIG_MODULES... */
#define EXPORT_SYMBOL(sym)
#define EXPORT_SYMBOL_GPL(sym)
#else /* !CONFIG_MODULES... */
#define EXPORT_SYMBOL(sym)
#define EXPORT_SYMBOL_GPL(sym)
@@
-558,6
+565,15
@@
static inline void module_update_markers(void)
{
}
{
}
+static inline void module_update_tracepoints(void)
+{
+}
+
+static inline int module_get_iter_tracepoints(struct tracepoint_iter *iter)
+{
+ return 0;
+}
+
#endif /* CONFIG_MODULES */
struct device_driver;
#endif /* CONFIG_MODULES */
struct device_driver;