summaryrefslogtreecommitdiffstats
path: root/arch/um/include/shared/mem.h
diff options
context:
space:
mode:
authorIngo Molnar2008-10-24 12:48:46 +0200
committerIngo Molnar2008-10-24 12:48:46 +0200
commit8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch)
treed535f46a917e14e90deccb29ad00aac016ad18dd /arch/um/include/shared/mem.h
parentsched: add CONFIG_SMP consistency (diff)
parentLinux 2.6.28-rc1 (diff)
downloadkernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz
kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.xz
kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'arch/um/include/shared/mem.h')
-rw-r--r--arch/um/include/shared/mem.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/um/include/shared/mem.h b/arch/um/include/shared/mem.h
new file mode 100644
index 000000000000..5cd40e99e8d5
--- /dev/null
+++ b/arch/um/include/shared/mem.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
+#ifndef __MEM_H__
+#define __MEM_H__
+
+extern int phys_mapping(unsigned long phys, unsigned long long *offset_out);
+
+extern unsigned long uml_physmem;
+static inline unsigned long to_phys(void *virt)
+{
+ return(((unsigned long) virt) - uml_physmem);
+}
+
+static inline void *to_virt(unsigned long phys)
+{
+ return((void *) uml_physmem + phys);
+}
+
+#endif