From d34c0d59227b35329cc47a03f764611233d526bc Mon Sep 17 00:00:00 2001
From: Wang YanQing <udknight@gmail.com>
Date: Fri, 2 Mar 2012 08:48:50 +0800
Subject: [PATCH] --- yaml --- r: 294219 b: refs/heads/master c:
 ec0d22e4d563e7cce9f6678e2000900755c2989d h: refs/heads/master i:   294217:
 9a40e42fb020965626e6a9c6991655a6fd4c3762   294215:
 5d7122fc5ad11987356d95e83a135cc22d0095f5 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/video/uvesafb.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 504ea796f7db..93e2691c7387 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e71ff6f265c80b6f04f1d16470b5afa58f0b4648
+refs/heads/master: ec0d22e4d563e7cce9f6678e2000900755c2989d
diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c
index e7f69ef572dc..f9a670d338d2 100644
--- a/trunk/drivers/video/uvesafb.c
+++ b/trunk/drivers/video/uvesafb.c
@@ -23,6 +23,7 @@
 #include <video/uvesafb.h>
 #ifdef CONFIG_X86
 #include <video/vga.h>
+#include <linux/pci.h>
 #endif
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
@@ -815,8 +816,15 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
 	par->pmi_setpal = pmi_setpal;
 	par->ypan = ypan;
 
-	if (par->pmi_setpal || par->ypan)
-		uvesafb_vbe_getpmi(task, par);
+	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");
+		}
+	}
 #else
 	/* The protected mode interface is not available on non-x86. */
 	par->pmi_setpal = par->ypan = 0;