diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:53:36 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:53:36 -0500 |
commit | 6929039761a3414e5c71448eb3dcc1d82fc1891d (patch) | |
tree | 49b349170dd93821c2d515fee3931a4023da35da /kernel/module-internal.h | |
parent | e0fd18ce1169595df929373cad2ae9b00b2289c2 (diff) | |
parent | 6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d (diff) |
Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64
Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/module-internal.h')
-rw-r--r-- | kernel/module-internal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module-internal.h b/kernel/module-internal.h index 6114a13419bd..24f9247b7d02 100644 --- a/kernel/module-internal.h +++ b/kernel/module-internal.h | |||
@@ -11,5 +11,4 @@ | |||
11 | 11 | ||
12 | extern struct key *modsign_keyring; | 12 | extern struct key *modsign_keyring; |
13 | 13 | ||
14 | extern int mod_verify_sig(const void *mod, unsigned long modlen, | 14 | extern int mod_verify_sig(const void *mod, unsigned long *_modlen); |
15 | const void *sig, unsigned long siglen); | ||