aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/mini-os/Makefile6
-rw-r--r--extras/mini-os/include/events.h2
-rw-r--r--extras/mini-os/include/x86/x86_64/hypercall-x86_64.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 9bc4eb37f9..a389bc5d03 100644
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -122,6 +122,7 @@ clean:
rm -f *.o *~ core $(TARGET).elf $(TARGET).raw $(TARGET) $(TARGET).gz
rm -f libminios.a
find . -type l | xargs rm -f
+ rm -f tags TAGS
%.o: %.c $(HDRS) Makefile
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@@ -137,4 +138,7 @@ endef
cscope:
$(all_sources) > cscope.files
cscope -k -b -q
-
+
+.PHONY: tags
+tags:
+ $(all_sources) | xargs ctags
diff --git a/extras/mini-os/include/events.h b/extras/mini-os/include/events.h
index 9adaf29711..45b47c1549 100644
--- a/extras/mini-os/include/events.h
+++ b/extras/mini-os/include/events.h
@@ -20,7 +20,7 @@
#define _EVENTS_H_
#include<traps.h>
-#include <xen/event_channel.h>
+#include<xen/event_channel.h>
typedef void (*evtchn_handler_t)(evtchn_port_t, struct pt_regs *, void *);
diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
index 6a68a10b02..159149f48b 100644
--- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
+++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
@@ -235,9 +235,9 @@ HYPERVISOR_update_va_mapping(
static inline int
HYPERVISOR_event_channel_op(
- void *op)
+ int cmd, void *op)
{
- return _hypercall1(int, event_channel_op, op);
+ return _hypercall2(int, event_channel_op, cmd, op);
}
static inline int