aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-11 01:33:05 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-11 01:33:05 +0200
commitcc748b106a8d96a778ce86cb222087e1de7b5e77 (patch)
treedcc48fa5d1122dbf279ce2a36b3352a8dff6b1f0
parent8bb41c1aead535acac6b8d8c13f7f5d5a0e170f6 (diff)
downloadgnumach-cc748b106a8d96a778ce86cb222087e1de7b5e77.tar.gz
gnumach-cc748b106a8d96a778ce86cb222087e1de7b5e77.tar.bz2
gnumach-cc748b106a8d96a778ce86cb222087e1de7b5e77.zip
Keep host_get_kernel_version for USER32-on-x86_64 case
-rw-r--r--include/mach/mach_host.defs2
-rw-r--r--kern/host.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mach/mach_host.defs b/include/mach/mach_host.defs
index 07383a57..a8c40af6 100644
--- a/include/mach/mach_host.defs
+++ b/include/mach/mach_host.defs
@@ -161,7 +161,7 @@ routine task_get_assignment(
task : task_t;
out assigned_set : processor_set_name_t);
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(USER32)
skip;
#else
/*
diff --git a/kern/host.c b/kern/host.c
index 2db09154..69394374 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -219,7 +219,7 @@ kern_return_t host_get_kernel_version(
return KERN_SUCCESS;
}
-#ifndef __x86_64__
+#if !defined(__x86_64__) || defined(USER32)
/* Same as above, but does not exist for x86_64. */
kern_return_t host_kernel_version(
const host_t host,