uvesafb: Correct/simplify warning message
PATCH 1/1 uvesafb: Correct/simplify warning message
From: Borislav Petkov <[email protected]>
Streamline it a bit. No functional change.
Signed-off-by Borislav Petkov <[email protected]>
Cc Wang YanQing <[email protected]>
Cc Michal Januszewski <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
--- drivers/video/uvesafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/uvesafb.c +2 -2
@@ -819,8 +819,8 @@ static int uvesafb_vbe_init(struct fb_info *info)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 actively." -"We have better not to use the PMI.\n" ); +printk (KERN_WARNING "uvesafb: NX protection is active, " +"better not use the PMI.\n" ); }else {uvesafb_vbe_getpmi (task, par); }
Signature · 1 line
1.8.2.135.g7b592fa
Quoted 30 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Streamline it a bit. No functional change.
Signed-off-by Borislav Petkov <[email protected]>Cc Wang YanQing <[email protected]>Cc Michal Januszewski <[email protected]>Cc Florian Tobias Schandinat <[email protected]>--- drivers/video/uvesafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/uvesafb.c +2
-2@@ -819,8 +819,8 @@ static int uvesafb_vbe_init(struct fb_info *info)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 actively." -"We have better not to use the PMI.\n" ); +printk (KERN_WARNING "uvesafb: NX protection is active, " +"better not use the PMI.\n" ); }else {uvesafb_vbe_getpmi (task, par); }Signature · 1 line
1.8.2.135.g7b592fa
Acked-by Wang YanQing <[email protected]>
Thanks.
Quoted 30 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Streamline it a bit. No functional change.
Signed-off-by Borislav Petkov <[email protected]>Cc Wang YanQing <[email protected]>Cc Michal Januszewski <[email protected]>Cc Florian Tobias Schandinat <[email protected]>--- drivers/video/uvesafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/uvesafb.c +2
-2@@ -819,8 +819,8 @@ static int uvesafb_vbe_init(struct fb_info *info)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 actively." -"We have better not to use the PMI.\n" ); +printk (KERN_WARNING "uvesafb: NX protection is active, " +"better not use the PMI.\n" ); }else {uvesafb_vbe_getpmi (task, par); }Signature · 1 line
1.8.2.135.g7b592fa
Quoted 19 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Streamline it a bit. No functional change.
Signed-off-by Borislav Petkov <[email protected]>Cc Wang YanQing <[email protected]>Cc Michal Januszewski <[email protected]>Cc Florian Tobias Schandinat <[email protected]>--- drivers/video/uvesafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/uvesafb.c +0
-0
drivers/video/uvesafb.c static int uvesafb_vbe_init(struct fb_info *info) · line 826
Quoted 10 lines
drivers/video/uvesafb.c +2
-2@@ -819,8 +819,8 @@ static int uvesafb_vbe_init(struct fb_info *info)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 actively." -"We have better not to use the PMI.\n" ); +printk (KERN_WARNING "uvesafb: NX protection is active, " +"better not use the PMI.\n" ); }else {uvesafb_vbe_getpmi (task, par); }
I've added this to my fbdev-3.11 branch.
Tomi