[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 471e8ca6bc1f23afc702877cd72fde1e64d44482
# Parent  18eb059ae47159b8c89eae880ed939245934c751
# Parent  f7552b93adebb6628c9a2c49873c0d790c2b4fd9
Merged.

diff -r 18eb059ae471 -r 471e8ca6bc1f tools/pygrub/setup.py
--- a/tools/pygrub/setup.py     Wed Oct 19 15:24:54 2005
+++ b/tools/pygrub/setup.py     Wed Oct 19 15:25:39 2005
@@ -12,11 +12,14 @@
     ext2defines = []
     cc = new_compiler()
     cc.add_library("ext2fs")
-    if cc.has_function("ext2fs_open2"):
-        ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
-    else:
-        sys.stderr.write("WARNING: older version of e2fsprogs installed, not 
building full\n")
-        sys.stderr.write("         disk support for ext2.\n")
+    try:
+        if cc.has_function("ext2fs_open2"):
+            ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
+        else:
+            sys.stderr.write("WARNING: older version of e2fsprogs installed, 
not building full\n")
+            sys.stderr.write("         disk support for ext2.\n")
+    except AttributeError:
+        pass
         
     ext2 = Extension("grub.fsys.ext2._pyext2",
                      extra_compile_args = extra_compile_args,
diff -r 18eb059ae471 -r 471e8ca6bc1f xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Wed Oct 19 15:24:54 2005
+++ b/xen/arch/x86/setup.c      Wed Oct 19 15:25:39 2005
@@ -78,7 +78,6 @@
 extern void init_IRQ(void);
 extern void trap_init(void);
 extern void early_time_init(void);
-extern void ac_timer_init(void);
 extern void initialize_keytable(void);
 extern void early_cpu_init(void);
 
diff -r 18eb059ae471 -r 471e8ca6bc1f xen/include/xen/ac_timer.h
--- a/xen/include/xen/ac_timer.h        Wed Oct 19 15:24:54 2005
+++ b/xen/include/xen/ac_timer.h        Wed Oct 19 15:25:39 2005
@@ -63,6 +63,11 @@
  */
 extern void rem_ac_timer(struct ac_timer *timer);
 
+/*
+ * Initialisation. Must be called before any other ac_timer function.
+ */
+extern void ac_timer_init(void);
+
 #endif /* _AC_TIMER_H_ */
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog