ia64/xen-unstable

changeset 5281:71124f0ea5d4

bitkeeper revision 1.1645 (429f63fb6JW1K1LYjnjnswN1KOd0Jg)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
author cl349@firebug.cl.cam.ac.uk
date Thu Jun 02 19:54:35 2005 +0000 (2005-06-02)
parents ac04979dce3a fbb832f71d22
children 209e087e9ba2
files xen/arch/x86/x86_32/usercopy.c xen/arch/x86/x86_64/usercopy.c
line diff
     1.1 --- a/xen/arch/x86/x86_32/usercopy.c	Thu Jun 02 19:19:24 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_32/usercopy.c	Thu Jun 02 19:54:35 2005 +0000
     1.3 @@ -5,8 +5,9 @@
     1.4   * Copyright 1997 Andi Kleen <ak@muc.de>
     1.5   * Copyright 1997 Linus Torvalds
     1.6   */
     1.7 +
     1.8  #include <xen/config.h>
     1.9 -#include <xen/mm.h>
    1.10 +#include <xen/lib.h>
    1.11  #include <asm/uaccess.h>
    1.12  
    1.13  static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
     2.1 --- a/xen/arch/x86/x86_64/usercopy.c	Thu Jun 02 19:19:24 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_64/usercopy.c	Thu Jun 02 19:54:35 2005 +0000
     2.3 @@ -6,7 +6,8 @@
     2.4   * Copyright 2002 Andi Kleen <ak@suse.de>
     2.5   */
     2.6  
     2.7 -#include <xen/string.h>
     2.8 +#include <xen/config.h>
     2.9 +#include <xen/lib.h>
    2.10  #include <asm/uaccess.h>
    2.11  
    2.12  /*