diff options
| author | Linus Torvalds | 2018-10-31 23:46:16 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-10-31 23:46:16 +0100 |
| commit | 9bb9d4fdce9e6b351b7b905f150745a0fccccc06 (patch) | |
| tree | 75a9caf075e1979ab2e302076c1b0d5478df992d /arch/um/kernel | |
| parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
| parent | um: Make line/tty semantics use true write IRQ (diff) | |
| download | kernel-qcow2-linux-9bb9d4fdce9e6b351b7b905f150745a0fccccc06.tar.gz kernel-qcow2-linux-9bb9d4fdce9e6b351b7b905f150745a0fccccc06.tar.xz kernel-qcow2-linux-9bb9d4fdce9e6b351b7b905f150745a0fccccc06.zip | |
Merge branch 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- removal of old and dead code
- a bug fix for our tty driver
- other minor cleanups across the code base
* 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Make line/tty semantics use true write IRQ
um: trap: fix spelling mistake, EACCESS -> EACCES
um: Don't hardcode path as it is architecture dependent
um: NULL check before kfree is not needed
um: remove unused AIO code
um: Give start_idle_thread() a return code
um: Remove update_debugregs()
um: Drop own definition of PTRACE_SYSEMU/_SINGLESTEP
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/irq.c | 3 | ||||
| -rw-r--r-- | arch/um/kernel/trap.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 6b7f3827d6e4..8360fa3f676d 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -244,8 +244,7 @@ static void garbage_collect_irq_entries(void) to_free = NULL; } walk = walk->next; - if (to_free != NULL) - kfree(to_free); + kfree(to_free); } } diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index cced82946042..0e8b6158f224 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -19,7 +19,7 @@ #include <skas.h> /* - * Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by + * Note this is constrained to return 0, -EFAULT, -EACCES, -ENOMEM by * segv(). */ int handle_page_fault(unsigned long address, unsigned long ip, |