Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…
Browse files Browse the repository at this point in the history
…or-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  module: add MODULE_STATE_GOING notifier call
  module: Enhance verify_export_symbols
  module: set unused_gpl_crcs instead of overwriting unused_crcs
  module: neaten __find_symbol, rename to find_symbol
  module: reduce module image and resident size
  module: make module_sect_attrs private to kernel/module.c
  • Loading branch information
Linus Torvalds committed May 1, 2008
2 parents a0be752 + df4b565 commit 03fc922
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 166 deletions.
19 changes: 1 addition & 18 deletions include/linux/module.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void *__symbol_get_gpl(const char *symbol);
extern typeof(sym) sym; \
__CRC_SYMBOL(sym, sec) \
static const char __kstrtab_##sym[] \
__attribute__((section("__ksymtab_strings"))) \
__attribute__((section("__ksymtab_strings"), aligned(1))) \
= MODULE_SYMBOL_PREFIX #sym; \
static const struct kernel_symbol __ksymtab_##sym \
__used \
Expand Down Expand Up @@ -229,23 +229,6 @@ enum module_state
MODULE_STATE_GOING,
};

/* Similar stuff for section attributes. */
struct module_sect_attr
{
struct module_attribute mattr;
char *name;
unsigned long address;
};

struct module_sect_attrs
{
struct attribute_group grp;
int nsections;
struct module_sect_attr attrs[0];
};

struct module_param_attrs;

struct module
{
enum module_state state;
Expand Down
Loading

0 comments on commit 03fc922

Please sign in to comment.