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

Geoffrey Lee (glee@gnupilgrims.org)
Tue, 11 Feb 2003 17:42:28 +0800


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-23305-1044957266-0001-2
Content-Type: text/plain; charset=big5
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi all,

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

-- G.

-- 
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";

--=_courier-23305-1044957266-0001-2 Content-Type: text/plain; charset=big5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sis_accel.c.patch"

--- linux-2.4.20/drivers/video/sis/sis_accel.c.orig 2002-11-29 00:53:15.000000000 +0100 +++ linux-2.4.20/drivers/video/sis/sis_accel.c 2003-02-11 10:55:41.000000000 +0100 @@ -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)

--=_courier-23305-1044957266-0001-2 Content-Type: text/plain; charset=big5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sis_main.c.patch"

--- linux-2.4.20/drivers/video/sis/sis_main.c.orig 2003-02-11 10:56:48.000000000 +0100 +++ linux-2.4.20/drivers/video/sis/sis_main.c 2003-02-11 10:55:24.000000000 +0100 @@ -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>

--=_courier-23305-1044957266-0001-2--