From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Wed, 21 Mar 2012 13:22:01 +0000 (+0000)
Subject: Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6bff98b455cf3e666fd0e3d0d908eba874de0eee;p=mv-sheeva.git

Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"

This reverts commit ec0d22e4d563e7cce9f6678e2000900755c2989d.

This patch requires exporting 'pcibios_enabled' to avoid breaking
modular uvesafb builds. As this gets some opposition by Alan Cox it
needs more discussion, revert the patch for now.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---

diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 1f882ed6ba0..9db3de3a841 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -23,7 +23,6 @@
 #include <video/uvesafb.h>
 #ifdef CONFIG_X86
 #include <video/vga.h>
-#include <linux/pci.h>
 #endif
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
@@ -816,15 +815,8 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
 	par->pmi_setpal = pmi_setpal;
 	par->ypan = ypan;
 
-	if (par->pmi_setpal || par->ypan) {
-		if (pcibios_enabled) {
-			uvesafb_vbe_getpmi(task, par);
-		} else {
-			par->pmi_setpal = par->ypan = 0;
-			printk(KERN_WARNING "uvesafb: PCI BIOS area is NX."
-				"Can't use protected mode interface\n");
-		}
-	}
+	if (par->pmi_setpal || par->ypan)
+		uvesafb_vbe_getpmi(task, par);
 #else
 	/* The protected mode interface is not available on non-x86. */
 	par->pmi_setpal = par->ypan = 0;