diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 19:54:35 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 19:54:35 +0000 |
| commit | bef01829ee37e6a246d59901aa6c75445d5236b6 (patch) | |
| tree | 4f05d241b9036f2c80cdeb94a816ab735f4f9d3f | |
| parent | b5290d3405646879575efe051dc479e7117729a1 (diff) | |
| parent | c5494ce30489835d68fb8c8df99f9d21aa97eb5d (diff) | |
| download | xen-bef01829ee37e6a246d59901aa6c75445d5236b6.tar.gz xen-bef01829ee37e6a246d59901aa6c75445d5236b6.tar.bz2 xen-bef01829ee37e6a246d59901aa6c75445d5236b6.zip | |
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
| -rw-r--r-- | xen/arch/x86/x86_32/usercopy.c | 3 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/usercopy.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xen/arch/x86/x86_32/usercopy.c b/xen/arch/x86/x86_32/usercopy.c index f26d916bab..c05ffd429d 100644 --- a/xen/arch/x86/x86_32/usercopy.c +++ b/xen/arch/x86/x86_32/usercopy.c @@ -5,8 +5,9 @@ * Copyright 1997 Andi Kleen <ak@muc.de> * Copyright 1997 Linus Torvalds */ + #include <xen/config.h> -#include <xen/mm.h> +#include <xen/lib.h> #include <asm/uaccess.h> static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n) diff --git a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c index e96eb94d4d..685cd7b1a3 100644 --- a/xen/arch/x86/x86_64/usercopy.c +++ b/xen/arch/x86/x86_64/usercopy.c @@ -6,7 +6,8 @@ * Copyright 2002 Andi Kleen <ak@suse.de> */ -#include <xen/string.h> +#include <xen/config.h> +#include <xen/lib.h> #include <asm/uaccess.h> /* |