[Linuxconsole-commit]CVS: ruby/linux/drivers/video fbmem.c,1.54,1.55

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv10704/drivers/video

Modified Files:
	fbmem.c 
Log Message:
Made enable_mtrr local to each framebuffer device.

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- fbmem.c	2001/11/13 02:09:18	1.54
+++ fbmem.c	2001/11/14 16:29:12	1.55
@@ -760,9 +760,6 @@
 };
 
 #ifdef CONFIG_MTRR
-/* Enable MTRR support by default */
-static int enable_mtrr = 1;
-
 /**
  * 	fb_disable_mtrrs - disable MTRR usage for frame buffer device
  * 	@fb_info: frame buffer info structure
@@ -774,9 +771,9 @@
  *
  */
 void
-fb_disable_mtrrs(void)
+fb_disable_mtrrs(struct fb_info *info)
 {
-	enable_mtrr = 0;
+	info->enable_mtrr = 0;
 }
 #endif
 
@@ -883,7 +880,7 @@
 	/*
 	 * Enable MTRR support if desired.
 	 */
-	if (enable_mtrr) {
+	if (fb_info->enable_mtrr) {
 		fb_info->mtrr_handle = mtrr_add(fb_info->fix.smem_start,
 						fb_info->fix.smem_len,
 						MTRR_TYPE_WRCOMB, 1);
@@ -919,7 +916,7 @@
 	/*
 	 * Disable MTRR support if it's enabled.
 	 */
-	if (enable_mtrr) {
+	if (fb_info->enable_mtrr) {
 		mtrr_del(fb_info->mtrr_handle, fb_info->fix.smem_start, 
 			 fb_info->fix.smem_len);
 		printk("%s: MTRR turned off\n", fb_info->fix.id);