Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285808
b: refs/heads/master
c: 53999bf
h: refs/heads/master
v: v3
  • Loading branch information
Kevin Winchester authored and Linus Torvalds committed Jan 16, 2012
1 parent 43ed53d commit f54363c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 122804ecb59493fbb4d31b3ba9ac59faaf45276f
refs/heads/master: 53999bf34d55981328f8ba9def558d3e104d6e36
40 changes: 20 additions & 20 deletions trunk/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -842,26 +842,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
return ret;
}

static size_t module_flags_taint(struct module *mod, char *buf)
{
size_t l = 0;

if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
buf[l++] = 'P';
if (mod->taints & (1 << TAINT_OOT_MODULE))
buf[l++] = 'O';
if (mod->taints & (1 << TAINT_FORCED_MODULE))
buf[l++] = 'F';
if (mod->taints & (1 << TAINT_CRAP))
buf[l++] = 'C';
/*
* TAINT_FORCED_RMMOD: could be added.
* TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
* apply to modules.
*/
return l;
}

static inline void print_unload_info(struct seq_file *m, struct module *mod)
{
struct module_use *use;
Expand Down Expand Up @@ -962,6 +942,26 @@ static inline int module_unload_init(struct module *mod)
}
#endif /* CONFIG_MODULE_UNLOAD */

static size_t module_flags_taint(struct module *mod, char *buf)
{
size_t l = 0;

if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
buf[l++] = 'P';
if (mod->taints & (1 << TAINT_OOT_MODULE))
buf[l++] = 'O';
if (mod->taints & (1 << TAINT_FORCED_MODULE))
buf[l++] = 'F';
if (mod->taints & (1 << TAINT_CRAP))
buf[l++] = 'C';
/*
* TAINT_FORCED_RMMOD: could be added.
* TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
* apply to modules.
*/
return l;
}

static ssize_t show_initstate(struct module_attribute *mattr,
struct module_kobject *mk, char *buffer)
{
Expand Down

0 comments on commit f54363c

Please sign in to comment.