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
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
include
/
linux
/
module.h
diff --git
a/include/linux/module.h
b/include/linux/module.h
index
d4486cc
..
d1d00ce
100644
(file)
--- a/
include/linux/module.h
+++ b/
include/linux/module.h
@@
-232,17
+232,17
@@
enum module_state
};
/* Similar stuff for section attributes. */
};
/* Similar stuff for section attributes. */
-#define MODULE_SECT_NAME_LEN 32
struct module_sect_attr
{
struct module_attribute mattr;
struct module_sect_attr
{
struct module_attribute mattr;
- char
name[MODULE_SECT_NAME_LEN]
;
+ char
*name
;
unsigned long address;
};
struct module_sect_attrs
{
struct attribute_group grp;
unsigned long address;
};
struct module_sect_attrs
{
struct attribute_group grp;
+ int nsections;
struct module_sect_attr attrs[0];
};
struct module_sect_attr attrs[0];
};
@@
-317,8
+317,7
@@
struct module
/* Am I unsafe to unload? */
int unsafe;
/* Am I unsafe to unload? */
int unsafe;
- /* Am I GPL-compatible */
- int license_gplok;
+ unsigned int taints; /* same bits as kernel:tainted */
#ifdef CONFIG_MODULE_UNLOAD
/* Reference counts */
#ifdef CONFIG_MODULE_UNLOAD
/* Reference counts */