diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 |
| commit | f77d26a9fc525286bcef3d4f98b52e17482cf49c (patch) | |
| tree | 6b179c9aa84787773cb601a14a64255e2912154b /arch/mips/lib/r3k_dump_tlb.c | |
| parent | EDAC/amd64: Add AMD family 17h model 60h PCI IDs (diff) | |
| parent | x86/entry: Unbreak __irqentry_text_start/end magic (diff) | |
| download | wireguard-linux-f77d26a9fc525286bcef3d4f98b52e17482cf49c.tar.xz wireguard-linux-f77d26a9fc525286bcef3d4f98b52e17482cf49c.zip | |
Merge branch 'x86/entry' into ras/core
to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
Diffstat (limited to 'arch/mips/lib/r3k_dump_tlb.c')
| -rw-r--r-- | arch/mips/lib/r3k_dump_tlb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c index b97d9c5d8323..10b4bf7f70a3 100644 --- a/arch/mips/lib/r3k_dump_tlb.c +++ b/arch/mips/lib/r3k_dump_tlb.c @@ -12,7 +12,6 @@ #include <asm/mipsregs.h> #include <asm/mmu_context.h> #include <asm/page.h> -#include <asm/pgtable.h> #include <asm/tlbdebug.h> extern int r3k_have_wired_reg; |