diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
| commit | 8d1e5133bf260aabdf2cc6facd4a8e696414d16a (patch) | |
| tree | 0e152a07b3892546879f55028b26b1701f7de8e6 /arch/um/include | |
| parent | 6a4d4b3253c1341843ba473429cf76a0e54f053d (diff) | |
| parent | 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c (diff) | |
| download | op-kernel-dev-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.zip op-kernel-dev-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.tar.gz | |
Merge branch 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull uml updates from Richard Weinberger:
"Minor updates for UML:
- fixes for our new vector network driver by Anton
- initcall cleanup by Alexander
- We have a new mailinglist, sourceforge.net sucks"
* 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix raw interface options
um: Fix initialization of vector queues
um: remove uml initcalls
um: Update mailing list address
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 6 | ||||
| -rw-r--r-- | arch/um/include/shared/init.h | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index b30d73c..7adb4e6 100644 --- a/arch/um/include/asm/common.lds.S +++ b/arch/um/include/asm/common.lds.S @@ -53,12 +53,6 @@ CON_INITCALL } - .uml.initcall.init : { - __uml_initcall_start = .; - *(.uml.initcall.init) - __uml_initcall_end = .; - } - SECURITY_INIT .exitcall : { diff --git a/arch/um/include/shared/init.h b/arch/um/include/shared/init.h index b3f5865..c66de43 100644 --- a/arch/um/include/shared/init.h +++ b/arch/um/include/shared/init.h @@ -64,14 +64,10 @@ struct uml_param { int (*setup_func)(char *, int *); }; -extern initcall_t __uml_initcall_start, __uml_initcall_end; extern initcall_t __uml_postsetup_start, __uml_postsetup_end; extern const char *__uml_help_start, *__uml_help_end; #endif -#define __uml_initcall(fn) \ - static initcall_t __uml_initcall_##fn __uml_init_call = fn - #define __uml_exitcall(fn) \ static exitcall_t __uml_exitcall_##fn __uml_exit_call = fn @@ -108,7 +104,6 @@ extern struct uml_param __uml_setup_start, __uml_setup_end; */ #define __uml_init_setup __used __section(.uml.setup.init) #define __uml_setup_help __used __section(.uml.help.init) -#define __uml_init_call __used __section(.uml.initcall.init) #define __uml_postsetup_call __used __section(.uml.postsetup.init) #define __uml_exit_call __used __section(.uml.exitcall.exit) |
