Skip to contentSkip to conversation

wrap around asm/mtrr.h in #ifdef ... #endif

PATCH New Geoffrey Lee 1 participant 1 message Feb 11, 2003 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wrap around asm/mtrr.h in #ifdef ... #endif

Hi all,

The following two patches wrap around asm/mtrr.h with CONFIG_MTRR #ifdef for the sis video driver.

	-- G.
Signature · 3 lines
char p[] = "\xeb\x1f\x5e\x89\x76\x08\x31\xc0\x88\x46\x07\x89\x46\x0c\xb0\x0b"
  "\x89\xf3\x8d\x4e\x08\x8d\x56\x0c\xcd\x80\x31\xdb\x89\xd8\x40\xcd"
  "\x80\xe8\xdc\xff\xff\xff/bin/sh";
drivers/video/sis/sis_accel.c renamed from drivers/video/sis/sis_accel.c.orig +2 -0
@@ -40,7 +40,9 @@
 #include <linux/sisfb.h>
 
 #include <asm/io.h>
+#ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
+#endif
 
 #include <video/fbcon.h>
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)
drivers/video/sis/sis_main.c renamed from drivers/video/sis/sis_main.c.orig +2 -0
@@ -52,7 +52,9 @@
 #include <linux/sisfb.h>
 
 #include <asm/io.h>
+#ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
+#endif
 
 #include <video/fbcon.h>
 #include <video/fbcon-cfb8.h>