From nobody Mon Jun 27 20:57:45 2022 X-Original-To: dev-commits-src-main@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 7D1BE87CED0; Mon, 27 Jun 2022 20:57:45 +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 4LX0RY2bzCz4VgG; Mon, 27 Jun 2022 20:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656363465; 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=K87ajePqbOkjPw/cuxBlQPrlzbEFCOoWZo6mlNLnjB8=; b=XMRJc/JEsDTfHBaZt+4HI6G6bN9JBiufvszXGW0CMeH935UIrqkR3BALOov/FD7G6UlTMA og/I7tcXDYHMkGyWx7MjbevTITtxaohU7AFdzr4weG70BW/zXp9o33V3hlFqpVmlSxcXyU tykvft7DdsubmfvkAqYacXdbhOZXsuxaaZ/3fnSU/tY2ihcZr8EG4liIKiYNE82TaOCsz4 zCFc1lKr5r+B9VhkLjyguvcu0qtUMySj/ISLawIY4Aks3kFQIJdwnfv14gaAyshaKlyrPJ aHhUTj7ZQa4+dJzMKfZBTgENTl5lGSTxUkZC+2piNJLfN1i0bpyLMi2R4xh5RQ== 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 28C0A78BF; Mon, 27 Jun 2022 20:57:45 +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 25RKvj8j029181; Mon, 27 Jun 2022 20:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RKvj4d029180; Mon, 27 Jun 2022 20:57:45 GMT (envelope-from git) Date: Mon, 27 Jun 2022 20:57:45 GMT Message-Id: <202206272057.25RKvj4d029180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 43ad112b936c - main - kboot: use SYS_kexec_load insteaed of __NR_kexec_load List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 43ad112b936c5516e0a9b968930a6d3387e7d86b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656363465; 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=K87ajePqbOkjPw/cuxBlQPrlzbEFCOoWZo6mlNLnjB8=; b=dt+jUj5GVkRl3cM6IDYxJEjKRERog75hJ8I6m2o8Ly9oQKHBOoUl5Pp2qvZE4BTpWdM7tc jKzm4DAPFWP/GotLV8e3pq8lPh4AGhk2j4ancIObXhiCkRvpEHQ9gcV0iD4RY/u6eLgNz3 DzwuFO2Uz3rKNDVTMU9JFTY/BKxnMbohLjaKVOF0db7qino17cR0gQTfOz4H0sUMRyEJgF KdR5oqBOBfKxWM0lJgdxG8/DqCmjHA6WhNuGoszF44ZP4lO4VW+R3Ha14HgqvRnZ88+171 C4vh8P48A47Qa1iebYcAWEK+os5rdXSKs7c0c33I4r8yetD8eNb7zDu5MCLcAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656363465; a=rsa-sha256; cv=none; b=IMHj32prU/YaqJ1rQG5pTDsFO4uiPOP15IP+xejrHm8KAZi+LIDQe+RsgPUJ/f0yiRloTG ZFljGAnuY8XBLXZZwsUH1iEW5zf4P9kPaVc6LgAQyV2ulsjjrCZsC/MVQWgNYdDItNApg1 FPN7osC5TQy/enQNuTmVwPyDa5T8Ivp55xZgWegp4+6hVaoILWeDS/uXrGzkl5Ws25t1RH adWx4Oo/DjS8aLaDL+butXGLnUZtAmICAU7oEvd5HLi6a3luCFjr5rwblC7Tf+6xIlrHTJ IZFQeLuCKgI30Io3PgOMtUQiVDltm7Iip9lEz2PBjaB+n3xtf56gio6y4I6pWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43ad112b936c5516e0a9b968930a6d3387e7d86b commit 43ad112b936c5516e0a9b968930a6d3387e7d86b Author: Warner Losh AuthorDate: 2022-06-13 17:33:24 +0000 Commit: Warner Losh CommitDate: 2022-06-27 20:54:45 +0000 kboot: use SYS_kexec_load insteaed of __NR_kexec_load Make this regular with the rest of the system calls. Sponsored by: Netflix --- 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