diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
commit | ad112b3a759cefc245695f7e612f17e6f38d2cc1 (patch) | |
tree | d5fa837d0f996dbf15e4fd89a7f89b9b660f5796 /arch/arc/kernel/entry.S | |
parent | 854dd99b5ddc9d90e31e5f112462a5994dd31810 (diff) | |
parent | e67572cd2204894179d89bd7b984072f19313b03 (diff) | |
download | linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.tar.gz linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.tar.bz2 linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.zip |
Merge tag 'v6.9-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/kernel/entry.S')
-rw-r--r-- | arch/arc/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S index 089f6680518f..3c7e74aba679 100644 --- a/arch/arc/kernel/entry.S +++ b/arch/arc/kernel/entry.S @@ -95,7 +95,7 @@ ENTRY(EV_MachineCheck) lr r0, [efa] mov r1, sp - ; MC excpetions disable MMU + ; MC exceptions disable MMU ARC_MMU_REENABLE r3 lsr r3, r10, 8 @@ -209,7 +209,7 @@ trap_with_param: ; --------------------------------------------- ; syscall TRAP -; ABI: (r0-r7) upto 8 args, (r8) syscall number +; ABI: (r0-r7) up to 8 args, (r8) syscall number ; --------------------------------------------- ENTRY(EV_Trap) |