Author: jkim
Date: Mon Mar 15 18:22:19 2010
New Revision: 205180
URL: http://svn.freebsd.org/changeset/base/205180
Log:
MFC: r204235
Fix FBIO_ADPINFO ioctl on amd64.
Modified:
stable/8/sys/dev/fb/fb.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/fb/fb.c
==============================================================================
--- stable/8/sys/dev/fb/fb.c Mon Mar 15 18:20:51 2010 (r205179)
+++ stable/8/sys/dev/fb/fb.c Mon Mar 15 18:22:19 2010 (r205180)
@@ -653,7 +653,7 @@ fb_commonioctl(video_adapter_t *adp, u_l
((video_adapter_info_t *)arg)->va_mem_base = adp->va_mem_base;
((video_adapter_info_t *)arg)->va_mem_size = adp->va_mem_size;
((video_adapter_info_t *)arg)->va_window
-#ifdef __i386__
+#if defined(__amd64__) || defined(__i386__)
= vtophys(adp->va_window);
#else
= adp->va_window;
@@ -665,8 +665,8 @@ fb_commonioctl(video_adapter_t *adp, u_l
((video_adapter_info_t *)arg)->va_window_orig
= adp->va_window_orig;
((video_adapter_info_t *)arg)->va_unused0
-#ifdef __i386__
- = (adp->va_buffer) ? vtophys(adp->va_buffer) : 0;
+#if defined(__amd64__) || defined(__i386__)
+ = adp->va_buffer != 0 ? vtophys(adp->va_buffer) : 0;
#else
= adp->va_buffer;
#endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
