diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
| commit | 3dae49abef945c55c10fa7c479cfd8fd13af55db (patch) | |
| tree | 487c47c6d23cc28a259b913396aeaff0b792d32d /kernel/module.c | |
| parent | 6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff) | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 08864d257eb0..9db11911e04b 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -1799,7 +1799,7 @@ static void *module_alloc_update_bounds(unsigned long size) | |||
| 1799 | 1799 | ||
| 1800 | /* Allocate and load the module: note that size of section 0 is always | 1800 | /* Allocate and load the module: note that size of section 0 is always |
| 1801 | zero, and we rely on this for optional sections. */ | 1801 | zero, and we rely on this for optional sections. */ |
| 1802 | static struct module *load_module(void __user *umod, | 1802 | static noinline struct module *load_module(void __user *umod, |
| 1803 | unsigned long len, | 1803 | unsigned long len, |
| 1804 | const char __user *uargs) | 1804 | const char __user *uargs) |
| 1805 | { | 1805 | { |