git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ia64
/
page.h
diff --git
a/include/asm-ia64/page.h
b/include/asm-ia64/page.h
index
6b34251
..
67bcaa6
100644
(file)
--- a/
include/asm-ia64/page.h
+++ b/
include/asm-ia64/page.h
@@
-101,7
+101,7
@@
do { \
#ifdef CONFIG_VIRTUAL_MEM_MAP
extern int ia64_pfn_valid (unsigned long pfn);
#ifdef CONFIG_VIRTUAL_MEM_MAP
extern int ia64_pfn_valid (unsigned long pfn);
-#el
if defined(CONFIG_FLATMEM)
+#el
se
# define ia64_pfn_valid(pfn) 1
#endif
# define ia64_pfn_valid(pfn) 1
#endif
@@
-110,12
+110,11
@@
extern struct page *vmem_map;
#ifdef CONFIG_DISCONTIGMEM
# define page_to_pfn(page) ((unsigned long) (page - vmem_map))
# define pfn_to_page(pfn) (vmem_map + (pfn))
#ifdef CONFIG_DISCONTIGMEM
# define page_to_pfn(page) ((unsigned long) (page - vmem_map))
# define pfn_to_page(pfn) (vmem_map + (pfn))
+#else
+# include <asm-generic/memory_model.h>
#endif
#endif
-#endif
-
-#if defined(CONFIG_FLATMEM) || defined(CONFIG_SPARSEMEM)
-/* FLATMEM always configures mem_map (mem_map = vmem_map if necessary) */
-#include <asm-generic/memory_model.h>
+#else
+# include <asm-generic/memory_model.h>
#endif
#ifdef CONFIG_FLATMEM
#endif
#ifdef CONFIG_FLATMEM
@@
-229,6
+228,7
@@
get_order (unsigned long size)
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
+#define devmem_is_allowed(x) 1
#ifndef __ASSEMBLY__
#ifdef CONFIG_XEN
#ifndef __ASSEMBLY__
#ifdef CONFIG_XEN
@@
-277,6
+277,5
@@
extern struct address_space xen_ia64_foreign_dummy_mapping;
#endif /* CONFIG_XEN */
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_XEN */
#endif /* __ASSEMBLY__ */
-#define devmem_is_allowed(x) 1
-# endif /* __KERNEL__ */
+#endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */
#endif /* _ASM_IA64_PAGE_H */