projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtc: rtc-sh: alarm support.
[powerpc.git]
/
include
/
asm-ia64
/
page.h
diff --git
a/include/asm-ia64/page.h
b/include/asm-ia64/page.h
index
f5a949e
..
485759b
100644
(file)
--- a/
include/asm-ia64/page.h
+++ b/
include/asm-ia64/page.h
@@
-7,6
+7,7
@@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
+# ifdef __KERNEL__
#include <asm/intrinsics.h>
#include <asm/types.h>
#include <asm/intrinsics.h>
#include <asm/types.h>
@@
-64,7
+65,6
@@
# define __pa(x) ((x) - PAGE_OFFSET)
# define __va(x) ((x) + PAGE_OFFSET)
#else /* !__ASSEMBLY */
# define __pa(x) ((x) - PAGE_OFFSET)
# define __va(x) ((x) + PAGE_OFFSET)
#else /* !__ASSEMBLY */
-# ifdef __KERNEL__
# define STRICT_MM_TYPECHECKS
extern void clear_page (void *page);
# define STRICT_MM_TYPECHECKS
extern void clear_page (void *page);
@@
-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
@@
-174,7
+173,6
@@
get_order (unsigned long size)
return order;
}
return order;
}
-# endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */
#ifdef STRICT_MM_TYPECHECKS
#endif /* !__ASSEMBLY__ */
#ifdef STRICT_MM_TYPECHECKS
@@
-228,4
+226,5
@@
get_order (unsigned long size)
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
+# endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */
#endif /* _ASM_IA64_PAGE_H */