| author | Henry Zhao <Henry.Zhao@Sun.COM> |
| Mon, 07 May 2007 17:53:20 -0700 | |
| changeset 154 | ae2bd8710ae2 |
| parent 117 | 6e0026f9f7f2 |
| permissions | -rw-r--r-- |
|
117
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
commit 5680efc0d2baf0a9451e82e490e3690fc23dda0f |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
Author: Alan Coopersmith <[email protected]> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
Date: Tue Feb 27 09:55:48 2007 -0800 |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
|
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
|
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
7 |
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
been useless to Xorg for a long time (it only declared a couple of kernel |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
variables) |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
|
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
index 97f8723..27f766d 100644 |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
--- a/hw/xfree86/os-support/xf86_OSlib.h |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
+++ b/hw/xfree86/os-support/xf86_OSlib.h |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
16 |
@@ -130,8 +130,8 @@ # endif |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
17 |
# include <errno.h> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
18 |
|
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
19 |
# if defined(_NEED_SYSI86) |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
20 |
-# include <sys/immu.h> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
21 |
# if !(defined (sun) && defined (SVR4)) |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
+# include <sys/immu.h> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
# include <sys/region.h> |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
# endif |
|
6e0026f9f7f2
6529003 Xorg should not be including <sys/immu.h>
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
# include <sys/proc.h> |