From nobody Tue Jan 24 22:10:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h4B02cxz3bf8P; Tue, 24 Jan 2023 22:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h496fRpz4KkX; Tue, 24 Jan 2023 22:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnpkLwp1yLyyPEV3+w6uDMkjHHej5DurTbYz42pYOwU=; b=fWg7CwCVV08jqz3OF9VVJHi/OUuecO7cRiIJ7nfmkc3prnuIixXatuXj2Mq+Pj4jcqoC7D Vp87yXINhNpUuU+Y7vZY0pqeh1jlKDFYR47h7AlDzzO14lqGvhIDsGGIyfDLfL39QEXoei QzEvU+DKI0um2QRY72iKbPw2wkwAEsYInQ3P7NNu5Cwyi5UJfP9n2uF3od5uHnTbasL+Gx g4Ng7WErEkkAgyB4qrZrrEWWClfBqAqsY8SsmAscs94OTMoILf16OGCrlsZQ//2zCXxqQk wDcpRqhZwqoQwCkekc+ss3M7IDJOL6Qg99QBbdAbeH04NaEFbW5VlM9u9GwNuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnpkLwp1yLyyPEV3+w6uDMkjHHej5DurTbYz42pYOwU=; b=SwSo1XR1v59oReANj3cThXG8l6qWSuCzPfnROl/kjSkDj7IGyPAlivtPUNvAqnQcZZ2hZE OP82PAD2tsArSvecsekHklOiy1gu0astDyLPWd19vEWUBdNEGW/hq7GJP9hMZCgZ0R74+s wrS17EkZSADuqmbfE3eCdBkuwwcbBCxKeSu7gg51hAXTBHRy/yRgby5JIX2BJDmJwcnI1j mU7chtqU6h5ebpydgdZHfd+j8rxqrBO3k9X85+08HZKq9FgtHZMxu9CzuA6jKvbiex7KPb 2N0/ZGIk8IUNHdaxwZjRa6BTp8n1pwNY5lilnNGwPc47tT392yKZsRSkMgcfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598233; a=rsa-sha256; cv=none; b=ZJD134tBYuyblwAKztJAZ3wu10unJX86BynCgsPm5ps5+5owhJr1fmq8+KCwEVJ0TdIqwf qYcMYvEGcB1J1oJkqFbfiWTgZyuWA4dSYZrH/FUSBZiEK1orwtfKd6QEX2u5+8+CeN9NIy VfET7/kMCTjHHDEdL2dyQ3gyI9GopxYC39gmft45yA0gg9a/XzFSjrx+mRMjfaU4SYg9xM JFk1GRSb8Zo2pZEFmn//SFc423vpJBWobn9Lgz8Ax38ldUAsonqv+QSi9cLzJYNlyd5xEC CwWq5xwysU3njwFQUcm+uZOomHbLC2V3PTC+l3I5DSGyplSHhVLZl6F7Cy3i3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h495j0CzQR2; Tue, 24 Jan 2023 22:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAXLG080217; Tue, 24 Jan 2023 22:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAXLl080216; Tue, 24 Jan 2023 22:10:33 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:33 GMT Message-Id: <202301242210.30OMAXLl080216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 12e5d8d97754 - stable/13 - kboot: use SYS_kexec_load insteaed of __NR_kexec_load List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 12e5d8d97754b5697e10af772f503c21d5f68bf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=12e5d8d97754b5697e10af772f503c21d5f68bf3 commit 12e5d8d97754b5697e10af772f503c21d5f68bf3 Author: Warner Losh AuthorDate: 2022-06-13 17:33:24 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:21 +0000 kboot: use SYS_kexec_load insteaed of __NR_kexec_load Make this regular with the rest of the system calls. Sponsored by: Netflix (cherry picked from commit 43ad112b936c5516e0a9b968930a6d3387e7d86b) --- stand/kboot/arch/amd64/syscall_nr.h | 2 +- stand/kboot/arch/powerpc64/syscall_nr.h | 2 +- stand/kboot/host_syscalls.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/kboot/arch/amd64/syscall_nr.h b/stand/kboot/arch/amd64/syscall_nr.h index 412fed5001b9..9c4fb1024319 100644 --- a/stand/kboot/arch/amd64/syscall_nr.h +++ b/stand/kboot/arch/amd64/syscall_nr.h @@ -2,6 +2,7 @@ #define SYS_getdents 78 #define SYS_gettimeofday 96 #define SYS_lseek 8 +#define SYS_kexec_load 246 #define SYS_mmap 9 #define SYS_open 2 #define SYS_read 0 @@ -9,7 +10,6 @@ #define SYS_select 23 #define SYS_uname 63 #define SYS_write 1 -#define __NR_kexec_load 246 #define KEXEC_ARCH_X86_64 62 #define KEXEC_ARCH KEXEC_ARCH_X86_64 diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/arch/powerpc64/syscall_nr.h index 1b24ec6165f7..187c434a13d7 100644 --- a/stand/kboot/arch/powerpc64/syscall_nr.h +++ b/stand/kboot/arch/powerpc64/syscall_nr.h @@ -1,6 +1,7 @@ #define SYS_close 6 #define SYS_getdents 141 #define SYS_gettimeofday 78 +#define SYS_kexec_load 268 #define SYS_llseek 140 #define SYS_mmap 90 #define SYS_open 5 @@ -9,7 +10,6 @@ #define SYS_select 142 #define SYS_uname 120 #define SYS_write 4 -#define __NR_kexec_load 268 #define KEXEC_ARCH_PPC64 21 #define KEXEC_ARCH KEXEC_ARCH_PPC64 diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index 53be0c166374..fd14095d7d68 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -70,7 +70,7 @@ host_select(int nfds, long *readfds, long *writefds, long *exceptfds, int kexec_load(uint32_t start, int nsegs, uint32_t segs) { - return host_syscall(__NR_kexec_load, start, nsegs, segs, KEXEC_ARCH << 16); + return host_syscall(SYS_kexec_load, start, nsegs, segs, KEXEC_ARCH << 16); } int