diff options
author | gallatin <gallatin@FreeBSD.org> | 2000-05-21 01:16:47 +0000 |
---|---|---|
committer | gallatin <gallatin@FreeBSD.org> | 2000-05-21 01:16:47 +0000 |
commit | 893df8773a6bc0705cb2676e3c34cbf57615d573 (patch) | |
tree | 911ec2ccdf163be7293609f53b0797236a5fa171 /sys/dev | |
parent | cf6c24f27fe8bcec29b7313b320687b9ecdb74ed (diff) | |
download | FreeBSD-src-893df8773a6bc0705cb2676e3c34cbf57615d573.zip FreeBSD-src-893df8773a6bc0705cb2676e3c34cbf57615d573.tar.gz |
Prevent vidcontrol -i from crashing alphas
Reported by: Christian Weisgerber <naddy@mips.inka.de>
Approved by: yokota@FreeBSD.ORG
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/fb/fb.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index b95003e..86ce59b 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -719,7 +719,11 @@ 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__ = vtophys(adp->va_window); +#else + = adp->va_window; +#endif ((video_adapter_info_t *)arg)->va_window_size = adp->va_window_size; ((video_adapter_info_t *)arg)->va_window_gran @@ -727,7 +731,11 @@ 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; +#else + = adp->va_buffer; +#endif ((video_adapter_info_t *)arg)->va_buffer_size = adp->va_buffer_size; ((video_adapter_info_t *)arg)->va_mode = adp->va_mode; |