0020-fix-a-merge-typo.patch 802 B

123456789101112131415161718192021222324
  1. From 3378dfe00fa17aece8de221f2f3b51d06e576752 Mon Sep 17 00:00:00 2001
  2. From: "max.ma" <max.ma@starfivetech.com>
  3. Date: Tue, 6 Dec 2022 19:34:57 -0800
  4. Subject: [PATCH 20/20] fix a merge typo
  5. ---
  6. include/opcode/riscv-opc.h | 1 -
  7. 1 file changed, 1 deletion(-)
  8. diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h
  9. index b130357392..20a541e503 100644
  10. --- a/include/opcode/riscv-opc.h
  11. +++ b/include/opcode/riscv-opc.h
  12. @@ -2869,7 +2869,6 @@ DECLARE_INSN(cbo_clean, MATCH_CBO_CLEAN, MASK_CBO_CLEAN);
  13. DECLARE_INSN(cbo_flush, MATCH_CBO_FLUSH, MASK_CBO_FLUSH);
  14. DECLARE_INSN(cbo_inval, MATCH_CBO_INVAL, MASK_CBO_INVAL);
  15. DECLARE_INSN(cbo_zero, MATCH_CBO_ZERO, MASK_CBO_ZERO);
  16. -DECLARE_INSN(cbo_zero, MATCH_CBO_ZERO, MASK_CBO_ZERO);
  17. #endif /* DECLARE_INSN */
  18. #ifdef DECLARE_CSR
  19. --
  20. 2.25.1