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/asm | |
| parent | 6a4d4b3253c1341843ba473429cf76a0e54f053d (diff) | |
| parent | 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c (diff) | |
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/asm')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index b30d73ca29d0..7adb4e6b658a 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 : { |