xenbus is not optional, so don't pretend it is

diff --git a/platform/xen/xen/Makefile b/platform/xen/xen/Makefile
index 0999883de280d2d83cfbb7c7c6ed78cd99e0e87c..fdbd1d88cee6434dcf137a44a016493986b0a500 100644 (file)
--- a/platform/xen/xen/Makefile
+++ b/platform/xen/xen/Makefile
@@ -18,12 +18,9 @@ include $(MINIOS_CONFIG)
 endif
 
 # Configuration defaults
-CONFIG_XENBUS ?= y
-
 CONFIG_PCI ?= y
 
 # Export config items as compiler directives
-flags-$(CONFIG_XENBUS) += -DCONFIG_XENBUS
 flags-$(CONFIG_PCI) += -DCONFIG_PCI
 
 DEF_CFLAGS += $(flags-y)
@@ -61,7 +58,7 @@ src-y += kernel.c
 src-y += mm.c
 src-y += netfront.c
 src-$(CONFIG_PCI) += pcifront.c
-src-$(CONFIG_XENBUS) += xenbus/xenbus.c
+src-y += xenbus/xenbus.c
 src-y += console/console.c
 src-y += console/xencons_ring.c
 src-y += console/xenbus.c

diff --git a/platform/xen/xen/include/mini-os/xenbus.h b/platform/xen/xen/include/mini-os/xenbus.h
index edced306cc730d002d8f3ecbc516bf1279a69e22..135942f5b263ec8cc17088c79ba307a05b187a50 100644 (file)
--- a/platform/xen/xen/include/mini-os/xenbus.h
+++ b/platform/xen/xen/include/mini-os/xenbus.h
@@ -9,14 +9,8 @@
 typedef unsigned long xenbus_transaction_t;
 #define XBT_NIL ((xenbus_transaction_t)0)
 
-#ifdef CONFIG_XENBUS
 /* Initialize the XenBus system. */
 void init_xenbus(void);
-#else
-static inline void init_xenbus(void)
-{
-}
-#endif
 
 /* Read the value associated with a path.  Returns a malloc'd error
    string on failure and sets *value to NULL.  On success, *value is
@@ -203,13 +197,7 @@ void xenbus_free(void*);
  * it must use this rather than free() when freeing data received
  * from xenbus. */
 
-#ifdef CONFIG_XENBUS
 /* Reset the XenBus system. */
 void fini_xenbus(void);
-#else
-static inline void fini_xenbus(void)
-{
-}
-#endif
 
 #endif /* MINIOS_XENBUS_H__ */