Author: andrew Date: Thu Sep 7 16:43:12 2017 New Revision: 323274 URL: https://svnweb.freebsd.org/changeset/base/323274
Log: Fix a mismerge, make sure PRINT_ID_AA64_MMFR2 has a unique value. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/identcpu.c Modified: head/sys/arm64/arm64/identcpu.c ============================================================================== --- head/sys/arm64/arm64/identcpu.c Thu Sep 7 16:12:56 2017 (r323273) +++ head/sys/arm64/arm64/identcpu.c Thu Sep 7 16:43:12 2017 (r323274) @@ -95,7 +95,7 @@ static u_int cpu_print_regs; #define PRINT_ID_AA64_ISAR1 0x00000200 #define PRINT_ID_AA64_MMFR0 0x00001000 #define PRINT_ID_AA64_MMFR1 0x00002000 -#define PRINT_ID_AA64_MMFR2 0x00000100 +#define PRINT_ID_AA64_MMFR2 0x00004000 #define PRINT_ID_AA64_PFR0 0x00010000 #define PRINT_ID_AA64_PFR1 0x00020000 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
