Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ---
- drivers/video/uvesafb.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
- diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
- index 260cca7..26e83d7 100644
- --- a/drivers/video/uvesafb.c
- +++ b/drivers/video/uvesafb.c
- @@ -815,8 +815,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 (__supported_pte_mask & _PAGE_NX) {
- + par->pmi_setpal = par->ypan = 0;
- + printk(KERN_WARNING "uvesafb: NX protection is active."
- + "Please do not use the PMI.\n");
- + } else {
- + uvesafb_vbe_getpmi(task, par);
- + }
- + }
- #else
- /* The protected mode interface is not available on non-x86. */
- par->pmi_setpal = par->ypan = 0;
- --
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement