diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-08-19 18:09:18 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-19 18:09:18 -0700 |
commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
tree | d72e809d28ff7a1cb02f648c858d106de1be859d /arch/powerpc/kernel/head_book3s_32.S | |
parent | 9e5f10fe577be7974c721c0c2050fa6c967d4565 (diff) | |
parent | f87d64319e6f980c82acfc9b95ed523d053fb7ac (diff) | |
download | linux-f444fea7896dbc267249d27f604082a51b8efca2.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/powerpc/kernel/head_book3s_32.S')
-rw-r--r-- | arch/powerpc/kernel/head_book3s_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 764edd860ed4..68e5c0a7e99d 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -300,7 +300,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_HPTE_TABLE) EXCEPTION_PROLOG_1 EXCEPTION_PROLOG_2 INTERRUPT_DATA_STORAGE DataAccess handle_dar_dsisr=1 prepare_transfer_to_handler - lwz r5, _DSISR(r11) + lwz r5, _DSISR(r1) andis. r0, r5, DSISR_DABRMATCH@h bne- 1f bl do_page_fault |