aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2024-03-27 19:18:26 +0300
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2024-03-27 19:37:59 +0100
commitf6a107020203225ec217a3752846dbf13f533413 (patch)
treec5b6c35b8ca14993099d46510e98521c1a4e6996
parent7e0b085a11cb666e955d4ecf5de8e4341629c706 (diff)
downloadgnumach-f6a107020203225ec217a3752846dbf13f533413.tar.gz
gnumach-f6a107020203225ec217a3752846dbf13f533413.tar.bz2
gnumach-f6a107020203225ec217a3752846dbf13f533413.zip
Disable host_kernel_version() everywhere but on i386
It's not only x86_64, none of new architectures are going to have it. Message-ID: <20240327161841.95685-3-bugaevc@gmail.com>
-rw-r--r--include/mach/mach_host.defs6
-rw-r--r--kern/host.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mach/mach_host.defs b/include/mach/mach_host.defs
index a8c40af6..8fd9d6b3 100644
--- a/include/mach/mach_host.defs
+++ b/include/mach/mach_host.defs
@@ -161,9 +161,7 @@ routine task_get_assignment(
task : task_t;
out assigned_set : processor_set_name_t);
-#if defined(__x86_64__) && !defined(USER32)
-skip;
-#else
+#if defined(__i386__) || (defined(__x86_64__) && defined(USER32))
/*
* Get string describing current kernel version.
* Deprecated, use host_get_kernel_version.
@@ -171,6 +169,8 @@ skip;
routine host_kernel_version(
host : host_t;
out kernel_version : kernel_version_t);
+#else
+skip;
#endif
/*
diff --git a/kern/host.c b/kern/host.c
index 69394374..53f8bdbd 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -219,8 +219,8 @@ kern_return_t host_get_kernel_version(
return KERN_SUCCESS;
}
-#if !defined(__x86_64__) || defined(USER32)
-/* Same as above, but does not exist for x86_64. */
+#if defined(__i386__) || (defined(__x86_64__) && defined(USER32))
+/* Same as above, but only exists on i386. */
kern_return_t host_kernel_version(
const host_t host,
kernel_version_t out_version)