This commit is contained in:
wiz 2023-09-13 06:53:23 +00:00
parent 5b6a5d06ab
commit 4b9e46d064
2 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $ */
/* $NetBSD: i386.c,v 1.141 2023/09/13 06:53:23 wiz Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $");
__RCSID("$NetBSD: i386.c,v 1.141 2023/09/13 06:53:23 wiz Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -2584,8 +2584,8 @@ ucodeupdate_check(int fd, struct cpu_ucode *uc)
switch (loader_version) {
case CPU_UCODE_LOADER_AMD:
if (uc->cpu_nr != -1) {
warnx("ucode updates on AMD can only be done on all CPUs at once");
if (uc->cpu_nr != -1) {
warnx("ucode updates on AMD can only be done on all CPUs at once");
return -1;
}
uc->cpu_nr = CPU_UCODE_ALL_CPUS;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $ */
/* $NetBSD: cpuctl.c,v 1.35 2023/09/13 06:53:23 wiz Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#ifndef lint
#include <sys/cdefs.h>
__RCSID("$NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $");
__RCSID("$NetBSD: cpuctl.c,v 1.35 2023/09/13 06:53:23 wiz Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -247,8 +247,8 @@ cpu_ucode(char **argv)
cpuset_destroy(cpuset);
}
error = ioctl(fd, IOC_CPU_UCODE_APPLY, &uc);
if (error < 0 && (verbose || errno != EEXIST)) {
warnx("please also check dmesg(8) output for additional error information");
if (error < 0 && (verbose || errno != EEXIST)) {
warnx("please also check dmesg(8) output for additional error information");
if (uc.fwname[0])
err(EXIT_FAILURE, "%s", uc.fwname);
else