summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-21 13:22:01 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-21 13:28:31 +0000
commit6bff98b455cf3e666fd0e3d0d908eba874de0eee (patch)
tree022ecc6ff78ca838c4ac2e02d39b0cd1f6da353c
parentdc7e57fa80ec5231e33ee2f51f6211c9fb84b9e3 (diff)
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>
-rw-r--r--drivers/video/uvesafb.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 1f882ed6ba04..9db3de3a8418 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;