Skip to contentSkip to conversation

make vesafb build without CONFIG_MTRR

PATCH In review Jan Beulich 2 participants 3 messages Nov 7, 2005 – Nov 10, 2005 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 make vesafb build without CONFIG_MTRR

vesafb did not build without CONFIG_MTRR.

From: Jan Beulich <[email protected]>

(actual patch attached)

vesafb did not build without CONFIG_MTRR.

From: Jan Beulich <[email protected]>

drivers/video/vesafb.c renamed from home/jbeulich/tmp/linux-2.6.14/drivers/video/vesafb.c +2 -0
@@ -419,6 +419,7 @@ static int __init vesafb_probe(struct de
 	 * region already (FIXME) */
 	request_region(0x3c0, 32, "vesafb");
 
+#ifdef CONFIG_MTRR
 	if (mtrr) {
 		unsigned int temp_size = size_total;
 		unsigned int type = 0;
@@ -456,6 +457,7 @@ static int __init vesafb_probe(struct de
 			} while (temp_size >= PAGE_SIZE && rc == -EINVAL);
 		}
 	}
+#endif
 	
 	info->fbops = &vesafb_ops;
 	info->var = vesafb_defined;
#1 lore raw
Quoted 2 lines · Jan Beulich

vesafb did not build without CONFIG_MTRR.
...

I wasn't able to reproduce your problem.

Please send the error message and the a complete .config for reproducing it.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw
Quoted 9 lines
Quoted 1 line
Quoted 1 line

Adrian Bunk <[email protected]> 09.11.05 22:59:35 >>>

Quoted 2 lines · Jan Beulich

vesafb did not build without CONFIG_MTRR.
...

I wasn't able to reproduce your problem.

Please send the error message and the a complete .config for

reproducing

Quoted 1 line

it.

Hmm, yes. The change came from the Xen kernel, which for some reason has CONFIG_MTRR but doesn't compile the respective source file on x86-64. When I ran into that, I didn't realize that include/asm/mtrr.h has wrappers for the !CONFIG_MTRR case.

But anyway, the code now framed by the conditionals is dead code without CONFIG_MTRR anyway. So if the number of #ifdef-s is important I'm OK with withrawing that patch, but then I'd like to see the same happen in all the other frame buffer drivers (after all it was the fact that the conditionals were there everywhere else I checked that made me not look at include/asm/mtrr.h)...

Jan