From: Richard Henderson <rth@twiddle.net>
Date: Fri, 26 Mar 2010 17:41:22 +0000 (-0700)
Subject: alpha: Don't include asm/page.h in sys/user.h.
X-Git-Tag: glibc-2.16-ports-merge^2~498
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6546e0c4997c8af8075cb6b36b8bab7de492537d;p=platform%2Fupstream%2Fglibc.git

alpha: Don't include asm/page.h in sys/user.h.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 84945a8..739efce 100644
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,5 +1,10 @@
 2010-03-26  Richard Henderson  <rth@redhat.com>
 
+	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Don't include asm/page.h.
+	(PAGE_SHIFT, PAGE_SIZE, PAGE_MASK): Define.
+
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETOWN_EX,
 	F_GETOWN_EX, F_OWNER_TID, F_OWNER_PID, F_OWNER_PGRP,
 	F_OWNER_GID, struct f_owner_ex): Define.
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/user.h b/sysdeps/unix/sysv/linux/alpha/sys/user.h
index 4cd29d2..193085d 100644
--- a/sysdeps/unix/sysv/linux/alpha/sys/user.h
+++ b/sysdeps/unix/sysv/linux/alpha/sys/user.h
@@ -23,7 +23,6 @@
    only. Don't read too much into it. Don't use it for anything other
    than gdb/strace unless you know what you are doing. */
 
-#include <asm/page.h>
 #include <asm/reg.h>
 
 struct user
@@ -41,6 +40,9 @@ struct user
   char u_comm[32];				/* user command name */
 };
 
+#define PAGE_SHIFT		13
+#define PAGE_SIZE		(1UL << PAGE_SHIFT)
+#define PAGE_MASK		(~(PAGE_SIZE-1))
 #define NBPG			PAGE_SIZE
 #define UPAGES			1
 #define HOST_TEXT_START_ADDR	(u.start_code)