direct-io.hg

changeset 7437:471e8ca6bc1f

Merged.
author emellor@leeni.uk.xensource.com
date Wed Oct 19 16:25:39 2005 +0100 (2005-10-19)
parents 18eb059ae471 f7552b93adeb
children fb265175f47c
files
line diff
     1.1 --- a/tools/pygrub/setup.py	Wed Oct 19 16:24:54 2005 +0100
     1.2 +++ b/tools/pygrub/setup.py	Wed Oct 19 16:25:39 2005 +0100
     1.3 @@ -12,11 +12,14 @@ if os.path.exists("/usr/include/ext2fs/e
     1.4      ext2defines = []
     1.5      cc = new_compiler()
     1.6      cc.add_library("ext2fs")
     1.7 -    if cc.has_function("ext2fs_open2"):
     1.8 -        ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
     1.9 -    else:
    1.10 -        sys.stderr.write("WARNING: older version of e2fsprogs installed, not building full\n")
    1.11 -        sys.stderr.write("         disk support for ext2.\n")
    1.12 +    try:
    1.13 +        if cc.has_function("ext2fs_open2"):
    1.14 +            ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
    1.15 +        else:
    1.16 +            sys.stderr.write("WARNING: older version of e2fsprogs installed, not building full\n")
    1.17 +            sys.stderr.write("         disk support for ext2.\n")
    1.18 +    except AttributeError:
    1.19 +        pass
    1.20          
    1.21      ext2 = Extension("grub.fsys.ext2._pyext2",
    1.22                       extra_compile_args = extra_compile_args,
     2.1 --- a/xen/arch/x86/setup.c	Wed Oct 19 16:24:54 2005 +0100
     2.2 +++ b/xen/arch/x86/setup.c	Wed Oct 19 16:25:39 2005 +0100
     2.3 @@ -78,7 +78,6 @@ extern void arch_init_memory(void);
     2.4  extern void init_IRQ(void);
     2.5  extern void trap_init(void);
     2.6  extern void early_time_init(void);
     2.7 -extern void ac_timer_init(void);
     2.8  extern void initialize_keytable(void);
     2.9  extern void early_cpu_init(void);
    2.10  
     3.1 --- a/xen/include/xen/ac_timer.h	Wed Oct 19 16:24:54 2005 +0100
     3.2 +++ b/xen/include/xen/ac_timer.h	Wed Oct 19 16:25:39 2005 +0100
     3.3 @@ -63,6 +63,11 @@ extern void set_ac_timer(struct ac_timer
     3.4   */
     3.5  extern void rem_ac_timer(struct ac_timer *timer);
     3.6  
     3.7 +/*
     3.8 + * Initialisation. Must be called before any other ac_timer function.
     3.9 + */
    3.10 +extern void ac_timer_init(void);
    3.11 +
    3.12  #endif /* _AC_TIMER_H_ */
    3.13  
    3.14  /*