From 893df8773a6bc0705cb2676e3c34cbf57615d573 Mon Sep 17 00:00:00 2001 From: gallatin Date: Sun, 21 May 2000 01:16:47 +0000 Subject: Prevent vidcontrol -i from crashing alphas Reported by: Christian Weisgerber Approved by: yokota@FreeBSD.ORG --- sys/dev/fb/fb.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sys/dev/fb') 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; -- cgit v1.1