Module Name: src Committed By: jakllsch Date: Fri Sep 27 15:12:45 UTC 2024
Modified Files: src/sys/arch/aarch64/aarch64: cpu.c Log Message: refine previous To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/arch/aarch64/aarch64/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/aarch64/aarch64/cpu.c diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.79 src/sys/arch/aarch64/aarch64/cpu.c:1.80 --- src/sys/arch/aarch64/aarch64/cpu.c:1.79 Fri Sep 27 15:07:16 2024 +++ src/sys/arch/aarch64/aarch64/cpu.c Fri Sep 27 15:12:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.79 2024/09/27 15:07:16 jakllsch Exp $ */ +/* $NetBSD: cpu.c,v 1.80 2024/09/27 15:12:45 jakllsch Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.79 2024/09/27 15:07:16 jakllsch Exp $"); +__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.80 2024/09/27 15:12:45 jakllsch Exp $"); #include "locators.h" #include "opt_arm_debug.h" @@ -239,8 +239,8 @@ const struct cpuidtab cpuids[] = { { CPU_ID_THUNDERX2RX, "ThunderX2", "Marvell", "v8.1-A" }, { CPU_ID_APPLE_M1_ICESTORM & CPU_PARTMASK, "M1 Icestorm", "Apple", "Apple Silicon" }, { CPU_ID_APPLE_M1_FIRESTORM & CPU_PARTMASK, "M1 Firestorm", "Apple", "Apple Silicon" }, - { CPU_ID_AMPERE1, "Ampere-1", "Ampere", "v8.6-A+" }, - { CPU_ID_AMPERE1A, "Ampere-1A", "Ampere", "v8.6-A+" }, + { CPU_ID_AMPERE1 & CPU_PARTMASK, "Ampere-1", "Ampere", "v8.6-A+" }, + { CPU_ID_AMPERE1A & CPU_PARTMASK, "Ampere-1A", "Ampere", "v8.6-A+" }, }; static void