diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:06:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:06:01 -0400 |
| commit | f50e5ea14baa321c5f0ff71707a83b02bf5b9398 (patch) | |
| tree | 2019c5bc11d99a353f3274853e913f489ed103ce /include/asm-ia64/page.h | |
| parent | ecf7f354e228ac9e80d2d25a0a0cbc8c876e9ab4 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-ia64/page.h')
| -rw-r--r-- | include/asm-ia64/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index f5a949ec6e1..947cb72b520 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -7,6 +7,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ +# ifdef __KERNEL__ #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 */ -# ifdef __KERNEL__ # define STRICT_MM_TYPECHECKS extern void clear_page (void *page); @@ -174,7 +174,6 @@ get_order (unsigned long size) return order; } -# endif /* __KERNEL__ */ #endif /* !__ASSEMBLY__ */ #ifdef STRICT_MM_TYPECHECKS @@ -228,4 +227,5 @@ get_order (unsigned long size) (((current->personality & READ_IMPLIES_EXEC) != 0) \ ? VM_EXEC : 0)) +# endif /* __KERNEL__ */ #endif /* _ASM_IA64_PAGE_H */ |