diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-17 13:48:37 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 01:55:19 -0400 |
commit | 8569c9140bd41089f9b6be8837ca421102714a90 (patch) | |
tree | cd289b322b215fe2ca2530aa320febfd99388d7f /arch/um/include/mem.h | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) |
x86, um: take arch/um/include/* out of the way
We can't just plop asm/* into it - userland helpers are built with it
in search path and seeing asm/* show up there suddenly would be a bad
idea.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/include/mem.h')
-rw-r--r-- | arch/um/include/mem.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/um/include/mem.h b/arch/um/include/mem.h deleted file mode 100644 index 5cd40e99e8d5..000000000000 --- a/arch/um/include/mem.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __MEM_H__ | ||
7 | #define __MEM_H__ | ||
8 | |||
9 | extern int phys_mapping(unsigned long phys, unsigned long long *offset_out); | ||
10 | |||
11 | extern unsigned long uml_physmem; | ||
12 | static inline unsigned long to_phys(void *virt) | ||
13 | { | ||
14 | return(((unsigned long) virt) - uml_physmem); | ||
15 | } | ||
16 | |||
17 | static inline void *to_virt(unsigned long phys) | ||
18 | { | ||
19 | return((void *) uml_physmem + phys); | ||
20 | } | ||
21 | |||
22 | #endif | ||