diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-05 18:56:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-05 18:56:51 +0200 |
| commit | 98586bd6dce3690d8ae8d8561383d9ecc715e3c2 (patch) | |
| tree | 4cb85c771a1ef8e424c0290c9fcaf606b029921a /arch | |
| parent | Merge tag 'printk-for-5.20-sane' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | microblaze: Fix some typos in comment (diff) | |
| download | linux-98586bd6dce3690d8ae8d8561383d9ecc715e3c2.tar.xz linux-98586bd6dce3690d8ae8d8561383d9ecc715e3c2.zip | |
Merge tag 'microblaze-v5.20' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Trivial comment fix
- Remove HANDLE_DOMAIN_IRQ selection
* tag 'microblaze-v5.20' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix some typos in comment
arch: microblaze: Remove unused "select HANDLE_DOMAIN_IRQ"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/Kconfig | 1 | ||||
| -rw-r--r-- | arch/microblaze/kernel/entry.S | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 8cf429ad1c84..ed9ce6117263 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -45,7 +45,6 @@ config MICROBLAZE select ZONE_DMA select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER - select HANDLE_DOMAIN_IRQ # Endianness selection choice diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index b179f8f6d287..d875a0c01032 100644 --- a/arch/microblaze/kernel/entry.S +++ b/arch/microblaze/kernel/entry.S @@ -456,7 +456,7 @@ TRAP_return: /* Make global symbol for debugging */ /* This the initial entry point for a new child thread, with an appropriate - stack in place that makes it look the the child is in the middle of an + stack in place that makes it look like the child is in the middle of a syscall. This function is actually `returned to' from switch_thread (copy_thread makes ret_from_fork the return address in each new thread's saved context). */ |