summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:06:15 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:06:15 -0700
commita38133298fc678335a0229e97b6161a7ac6fec84 (patch)
tree2500f23fd230e67a8eba96b380245ecb43c3fd4c /include/asm-ia64
parent97d26b8042a6f14cc4a19e84e911a953363e3d69 (diff)
parent70aa488cff83c965c9e1850f48d82b000d0d6c1c (diff)
downloadop-kernel-dev-a38133298fc678335a0229e97b6161a7ac6fec84.zip
op-kernel-dev-a38133298fc678335a0229e97b6161a7ac6fec84.tar.gz
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/pgtable.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h
index ea121a0..fcc9c33 100644
--- a/include/asm-ia64/pgtable.h
+++ b/include/asm-ia64/pgtable.h
@@ -8,7 +8,7 @@
* This hopefully works with any (fixed) IA-64 page-size, as defined
* in <asm/page.h>.
*
- * Copyright (C) 1998-2004 Hewlett-Packard Co
+ * Copyright (C) 1998-2005 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -551,7 +551,11 @@ do { \
/* These tell get_user_pages() that the first gate page is accessible from user-level. */
#define FIXADDR_USER_START GATE_ADDR
-#define FIXADDR_USER_END (GATE_ADDR + 2*PERCPU_PAGE_SIZE)
+#ifdef HAVE_BUGGY_SEGREL
+# define FIXADDR_USER_END (GATE_ADDR + 2*PAGE_SIZE)
+#else
+# define FIXADDR_USER_END (GATE_ADDR + 2*PERCPU_PAGE_SIZE)
+#endif
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
OpenPOWER on IntegriCloud