diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-31 15:46:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-31 15:46:16 -0700 |
commit | 9bb9d4fdce9e6b351b7b905f150745a0fccccc06 (patch) | |
tree | 75a9caf075e1979ab2e302076c1b0d5478df992d /arch/um/kernel/irq.c | |
parent | adb6b2b2b59f7872322f255206583b4c3ce661a3 (diff) | |
parent | 917e2fd2c53eb3c4162f5397555cbd394390d4bc (diff) | |
download | linux-0-day-9bb9d4fdce9e6b351b7b905f150745a0fccccc06.tar.gz linux-0-day-9bb9d4fdce9e6b351b7b905f150745a0fccccc06.tar.xz |
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/irq.c')
-rw-r--r-- | arch/um/kernel/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 6b7f3827d6e4a..8360fa3f676df 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); } } |