diff options
| author | jkim <jkim@FreeBSD.org> | 2010-02-23 01:00:19 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-02-23 01:00:19 +0000 |
| commit | a2e74371fc9914403efb07954f62376b8b97006d (patch) | |
| tree | e1eb44186fb7a98c519d5dc6fcb8442b419d8d29 | |
| parent | 7881322c02f867a619a3564a0d2b86ac955c3ee5 (diff) | |
| download | FreeBSD-src-a2e74371fc9914403efb07954f62376b8b97006d.zip FreeBSD-src-a2e74371fc9914403efb07954f62376b8b97006d.tar.gz | |
Fix FBIO_ADPINFO ioctl on amd64.
| -rw-r--r-- | sys/dev/fb/fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 09fcebc..b201d29 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -653,7 +653,7 @@ fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) ((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_long cmd, caddr_t arg) ((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 |
