diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /kernel/module.c | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'kernel/module.c')
-rw-r--r-- | kernel/module.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/module.c b/kernel/module.c index c9332c90d5a..e8b51d41dd7 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -743,8 +743,8 @@ static void wait_for_zero_refcount(struct module *mod) mutex_lock(&module_mutex); } -asmlinkage long -sys_delete_module(const char __user *name_user, unsigned int flags) +SYSCALL_DEFINE2(delete_module, const char __user *, name_user, + unsigned int, flags) { struct module *mod; char name[MODULE_NAME_LEN]; @@ -2296,10 +2296,8 @@ static noinline struct module *load_module(void __user *umod, } /* This is where the real work happens */ -asmlinkage long -sys_init_module(void __user *umod, - unsigned long len, - const char __user *uargs) +SYSCALL_DEFINE3(init_module, void __user *, umod, + unsigned long, len, const char __user *, uargs) { struct module *mod; int ret = 0; |