bitkeeper revision 1.774 (404f2922lDs3mYMJSQMNXaghfGVTFA)

config.h, hypervisor-if.h, Makefile:
  Cleanups.
hypervisor-if.h:
  Rename: xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if-arch.h -> xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h
  Rename: xen/include/hypervisor-ifs/arch-i386/hypervisor-if-arch.h -> xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h
hypervisor-if-arch.h:
  mvdir

9 files changed, 42 insertions, 72 deletions

diff --git a/.rootkeys b/.rootkeys
index 05d05306f7..f077bc4255 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -470,13 +470,13 @@
 404f1bc4tWkB9Qr8RkKtZGW5eMQzhw xen/include/asm-x86_64/uaccess.h
 404f1bc5idyWKKROGo_hvHVx58Gmkw xen/include/asm-x86_64/unaligned.h
 400304fcmRQmDdFYEzDh0wcBba9alg xen/include/hypervisor-ifs/COPYING
+404f1bc68SXxmv0zQpXBWGrCzSyp8w xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h
+404f1bc7IwU-qnH8mJeVu0YsNGMrcw xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h
 3ddb79c2YTaZwOqWin9-QNgHge5RVw xen/include/hypervisor-ifs/block.h
 3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h
 3e6377eaioRoNm0m_HSDEAd4Vqrq_w xen/include/hypervisor-ifs/dom_mem_ops.h
 403cd194j2pyLqXD8FJ-ukvZzkPenw xen/include/hypervisor-ifs/event_channel.h
 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h
-404f1bc68SXxmv0zQpXBWGrCzSyp8w xen/include/hypervisor-ifs/if-i386/hypervisor-if-arch.h
-404f1bc7IwU-qnH8mJeVu0YsNGMrcw xen/include/hypervisor-ifs/if-x86_64/hypervisor-if-arch.h
 3ead095dE_VF-QA88rl_5cWYRWtRVQ xen/include/hypervisor-ifs/kbd.h
 3ddb79c2oRPrzClk3zbTkRHlpumzKA xen/include/hypervisor-ifs/network.h
 3f0d22cbroqp_BkoDPwkfRJhaw1LiQ xen/include/hypervisor-ifs/vbd.h
diff --git a/Makefile b/Makefile
index f132263100..bd7895a958 100644
--- a/Makefile
+++ b/Makefile
@@ -25,5 +25,3 @@ dist: all
 clean:
 	$(MAKE) -C xen clean
 	$(MAKE) -C tools clean
-
-	ln -sf if-$(ARCH) include/hypervisor-ifs/if-arch
diff --git a/xen/Makefile b/xen/Makefile
index fc4bc7f961..10399a6311 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -45,10 +45,10 @@ $(TARGET): delete-unfresh-files make-links $(GENERATED_FILES)
 make-links: delete-links
 	ln -sf xeno include/linux
 	ln -sf asm-$(ARCH) include/asm
-	ln -sf if-$(ARCH) include/hypervisor-ifs/if-arch
+	ln -sf arch-$(ARCH) include/hypervisor-ifs/arch
 
 delete-links:
-	rm -f include/linux include/asm include/hypervisor-ifs/if-arch
+	rm -f include/linux include/asm include/hypervisor-ifs/arch
 
 # Blow away kernel.o because build info is stored statically within it.
 delete-unfresh-files:
diff --git a/xen/include/asm-i386/config.h b/xen/include/asm-i386/config.h
index 436459cb45..3dd2986492 100644
--- a/xen/include/asm-i386/config.h
+++ b/xen/include/asm-i386/config.h
@@ -118,16 +118,6 @@
   SYMBOL_NAME_LABEL(name)
 #endif
 
-/* syslog levels ==> nothing! */
-#define KERN_NOTICE  ""
-#define KERN_WARNING ""
-#define KERN_DEBUG   ""
-#define KERN_INFO    ""
-#define KERN_ERR     ""
-#define KERN_CRIT    ""
-#define KERN_EMERG   ""
-#define KERN_ALERT   ""
-
 #define barrier() __asm__ __volatile__("": : :"memory")
 
 #define __HYPERVISOR_CS 0x0808
@@ -135,36 +125,15 @@
 
 #define NR_syscalls 256
 
-#define offsetof(_p,_f) ((unsigned long)&(((_p *)0)->_f))
-#define struct_cpy(_x,_y) (memcpy((_x),(_y),sizeof(*(_x))))
-
-#define dev_probe_lock() ((void)0)
-#define dev_probe_unlock() ((void)0)
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
-#define capable(_c) 0
-
 #ifndef NDEBUG
-#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
-                           __FILE__ , __LINE__ , ## _a )
 #define MEMORY_GUARD
 #define TRACE_BUFFER
-#else
-#define DPRINTK(_f, _a...) ((void)0)
 #endif
 
 #ifndef __ASSEMBLY__
-
-#include <xeno/compiler.h>
-
 extern unsigned long _end; /* standard ELF symbol */
 extern void __out_of_line_bug(int line) __attribute__((noreturn));
 #define out_of_line_bug() __out_of_line_bug(__LINE__)
-
-extern unsigned int opt_ser_baud;
-#define SERIAL_ENABLED (opt_ser_baud != 0)
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __XENO_I386_CONFIG_H__ */
diff --git a/xen/include/asm-x86_64/config.h b/xen/include/asm-x86_64/config.h
index fe622e88a5..2fed6b7959 100644
--- a/xen/include/asm-x86_64/config.h
+++ b/xen/include/asm-x86_64/config.h
@@ -127,16 +127,6 @@
   SYMBOL_NAME_LABEL(name)
 #endif
 
-/* syslog levels ==> nothing! */
-#define KERN_NOTICE  ""
-#define KERN_WARNING ""
-#define KERN_DEBUG   ""
-#define KERN_INFO    ""
-#define KERN_ERR     ""
-#define KERN_CRIT    ""
-#define KERN_EMERG   ""
-#define KERN_ALERT   ""
-
 #define barrier() __asm__ __volatile__("": : :"memory")
 
 /*
@@ -148,36 +138,15 @@
 
 #define NR_syscalls 256
 
-#define offsetof(_p,_f) ((unsigned long)&(((_p *)0)->_f))
-#define struct_cpy(_x,_y) (memcpy((_x),(_y),sizeof(*(_x))))
-
-#define dev_probe_lock() ((void)0)
-#define dev_probe_unlock() ((void)0)
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
-#define capable(_c) 0
-
 #ifndef NDEBUG
-#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
-                           __FILE__ , __LINE__ , ## _a )
 #define MEMORY_GUARD
 #define TRACE_BUFFER
-#else
-#define DPRINTK(_f, _a...) ((void)0)
 #endif
 
 #ifndef __ASSEMBLY__
-
-#include <xeno/compiler.h>
-
 extern unsigned long _end; /* standard ELF symbol */
 extern void __out_of_line_bug(int line) __attribute__((noreturn));
 #define out_of_line_bug() __out_of_line_bug(__LINE__)
-
-extern unsigned int opt_ser_baud;
-#define SERIAL_ENABLED (opt_ser_baud != 0)
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __XENO_X86_64_CONFIG_H__ */
diff --git a/xen/include/hypervisor-ifs/if-i386/hypervisor-if-arch.h b/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h
index e0e6594f8c..fefc24a633 100644
--- a/xen/include/hypervisor-ifs/if-i386/hypervisor-if-arch.h
+++ b/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h
@@ -1,7 +1,7 @@
 /******************************************************************************
- * hypervisor-if-i386.h
+ * arch-i386/hypervisor-if.h
  * 
- * i386 32-bit Interface to Xeno hypervisor.
+ * Interface to x86 32-bit Xeno hypervisor.
  */
 
 #ifndef __HYPERVISOR_IF_I386_H__
diff --git a/xen/include/hypervisor-ifs/if-x86_64/hypervisor-if-arch.h b/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h
index 7aa676d5d4..53354f9ddf 100644
--- a/xen/include/hypervisor-ifs/if-x86_64/hypervisor-if-arch.h
+++ b/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * hypervisor-if.h
+ * arch-x86_64/hypervisor-if.h
  * 
  * Interface to AMD x86-64 bit Xeno hypervisor.
  */
diff --git a/xen/include/hypervisor-ifs/hypervisor-if.h b/xen/include/hypervisor-ifs/hypervisor-if.h
index bf61d7c932..2d708a5a4f 100644
--- a/xen/include/hypervisor-ifs/hypervisor-if.h
+++ b/xen/include/hypervisor-ifs/hypervisor-if.h
@@ -7,7 +7,7 @@
 #ifndef __HYPERVISOR_IF_H__
 #define __HYPERVISOR_IF_H__
 
-#include "if-arch/hypervisor-if-arch.h"
+#include "arch/hypervisor-if.h"
 
 /*
  * HYPERVISOR "SYSTEM CALLS"
diff --git a/xen/include/xeno/config.h b/xen/include/xeno/config.h
index 88a1186f25..2fd3b19d20 100644
--- a/xen/include/xeno/config.h
+++ b/xen/include/xeno/config.h
@@ -6,6 +6,40 @@
 
 #ifndef __XENO_CONFIG_H__
 #define __XENO_CONFIG_H__
+
 #include <asm/config.h>
 
+/* syslog levels ==> nothing! */
+#define KERN_NOTICE  ""
+#define KERN_WARNING ""
+#define KERN_DEBUG   ""
+#define KERN_INFO    ""
+#define KERN_ERR     ""
+#define KERN_CRIT    ""
+#define KERN_EMERG   ""
+#define KERN_ALERT   ""
+
+#define offsetof(_p,_f) ((unsigned long)&(((_p *)0)->_f))
+#define struct_cpy(_x,_y) (memcpy((_x),(_y),sizeof(*(_x))))
+
+#define dev_probe_lock() ((void)0)
+#define dev_probe_unlock() ((void)0)
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+#define capable(_c) 0
+
+#ifndef NDEBUG
+#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
+                           __FILE__ , __LINE__ , ## _a )
+#else
+#define DPRINTK(_f, _a...) ((void)0)
+#endif
+
+#ifndef __ASSEMBLY__
+#include <xeno/compiler.h>
+extern unsigned int opt_ser_baud;
+#define SERIAL_ENABLED (opt_ser_baud != 0)
+#endif
+
 #endif /* __XENO_CONFIG_H__ */