diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-07-05 10:58:46 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-07-05 10:58:46 +0000 |
| commit | 569abc5c6f0d599bb9dbb7f868d3052240468b67 (patch) | |
| tree | 802060e0220e4e0bffaa552631b1128070b27da8 | |
| parent | 0a8ba65c6f15e2020ec7e1edbfd6b0319fa37f69 (diff) | |
Revert "nvmectl(8): Ensure A divides S before aligned_alloc(A, S)."
C17 lifted this restriction.
| -rw-r--r-- | sbin/nvmectl/firmware.c | 5 | ||||
| -rw-r--r-- | sbin/nvmectl/wdc.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sbin/nvmectl/firmware.c b/sbin/nvmectl/firmware.c index f2433d01e8d..2392c4179f8 100644 --- a/sbin/nvmectl/firmware.c +++ b/sbin/nvmectl/firmware.c @@ -1,4 +1,4 @@ -/* $NetBSD: firmware.c,v 1.5 2023/07/04 20:40:43 riastradh Exp $ */ +/* $NetBSD: firmware.c,v 1.6 2023/07/05 10:58:46 riastradh Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD @@ -33,7 +33,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: firmware.c,v 1.5 2023/07/04 20:40:43 riastradh Exp $"); +__RCSID("$NetBSD: firmware.c,v 1.6 2023/07/05 10:58:46 riastradh Exp $"); #if 0 __FBSDID("$FreeBSD: head/sbin/nvmecontrol/firmware.c 329824 2018-02-22 13:32:31Z wma $"); #endif @@ -123,7 +123,6 @@ update_firmware(int fd, uint8_t *payload, int32_t payload_size) off = 0; resid = payload_size; - __CTASSERT((NVME_MAX_XFER_SIZE % PAGE_SIZE) == 0); if ((chunk = aligned_alloc(PAGE_SIZE, NVME_MAX_XFER_SIZE)) == NULL) errx(1, "unable to malloc %d bytes", NVME_MAX_XFER_SIZE); diff --git a/sbin/nvmectl/wdc.c b/sbin/nvmectl/wdc.c index 5581f697cb4..a2e032e4cd1 100644 --- a/sbin/nvmectl/wdc.c +++ b/sbin/nvmectl/wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: wdc.c,v 1.5 2023/07/04 20:40:43 riastradh Exp $ */ +/* $NetBSD: wdc.c,v 1.6 2023/07/05 10:58:46 riastradh Exp $ */ /*- * Copyright (c) 2017 Netflix, Inc @@ -28,7 +28,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: wdc.c,v 1.5 2023/07/04 20:40:43 riastradh Exp $"); +__RCSID("$NetBSD: wdc.c,v 1.6 2023/07/05 10:58:46 riastradh Exp $"); #if 0 __FBSDID("$FreeBSD: head/sbin/nvmecontrol/wdc.c 329824 2018-02-22 13:32:31Z wma $"); #endif @@ -125,7 +125,7 @@ wdc_do_dump(int fd, char *tmpl, const char *suffix, uint32_t opcode, fd2 = open(tmpl, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (fd2 < 0) err(1, "open %s", tmpl); - buf = aligned_alloc(page_size, roundup(NVME_MAX_XFER_SIZE, page_size)); + buf = aligned_alloc(page_size, NVME_MAX_XFER_SIZE); if (buf == NULL) errx(1, "Can't get buffer to read dump"); offset = 0; |
