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

This reverts commit ec0d22e4.

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: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent dc7e57fa
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <video/uvesafb.h> #include <video/uvesafb.h>
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#include <video/vga.h> #include <video/vga.h>
#include <linux/pci.h>
#endif #endif
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
#include <asm/mtrr.h> #include <asm/mtrr.h>
...@@ -816,15 +815,8 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info) ...@@ -816,15 +815,8 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
par->pmi_setpal = pmi_setpal; par->pmi_setpal = pmi_setpal;
par->ypan = ypan; par->ypan = ypan;
if (par->pmi_setpal || par->ypan) { if (par->pmi_setpal || par->ypan)
if (pcibios_enabled) {
uvesafb_vbe_getpmi(task, par); 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");
}
}
#else #else
/* The protected mode interface is not available on non-x86. */ /* The protected mode interface is not available on non-x86. */
par->pmi_setpal = par->ypan = 0; par->pmi_setpal = par->ypan = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment