From de7bdf13e5b1c688aaf52e83e1812c4013fad0f5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 18 Jul 2020 21:34:29 +0200 Subject: 64bit: fix build * device/ds_routines.c (ds_device_intr_register, ds_device_intr_ack) [__x86_64__]: Disable. * x86_64/Makefrag.am (libkernel_a_SOURCES): Add i386/i386/irq.c and i386/i386/irq.h. --- device/ds_routines.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'device/ds_routines.c') diff --git a/device/ds_routines.c b/device/ds_routines.c index 826005f2..8900c97f 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -325,9 +325,9 @@ io_return_t ds_device_intr_register (device_t dev, int id, int flags, ipc_port_t receive_port) { -#ifdef MACH_XEN +#if defined(MACH_XEN) || defined(__x86_64__) return D_INVALID_OPERATION; -#else /* MACH_XEN */ +#else /* MACH_XEN || __x86_64__ */ kern_return_t err; mach_device_t mdev = dev->emul_data; @@ -358,15 +358,15 @@ ds_device_intr_register (device_t dev, int id, ip_reference (receive_port); } return err; -#endif /* MACH_XEN */ +#endif /* MACH_XEN || __x86_64__ */ } kern_return_t ds_device_intr_ack (device_t dev, ipc_port_t receive_port) { -#ifdef MACH_XEN +#if defined(MACH_XEN) || defined(__x86_64__) return D_INVALID_OPERATION; -#else /* MACH_XEN */ +#else /* MACH_XEN || __x86_64__ */ mach_device_t mdev = dev->emul_data; /* Refuse if device is dead or not completely open. */ @@ -378,7 +378,7 @@ ds_device_intr_ack (device_t dev, ipc_port_t receive_port) return D_INVALID_OPERATION; return irq_acknowledge(receive_port); -#endif /* MACH_XEN */ +#endif /* MACH_XEN || __x86_64__ */ } boolean_t -- cgit v1.2.3