Skip to contentSkip to conversation

uvesafb: Correct/simplify warning message

PATCH In review Borislav Petkov 3 participants 4 messages Apr 19, 2013 – Jun 26, 2013 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uvesafb: Correct/simplify warning message

From: Borislav Petkov <[email protected]>

Streamline it a bit. No functional change.

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
index d4284458377e..a309f9fabe8b 100644
@@ -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 on v1 1/1
#1 lore raw
Quoted 30 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Streamline it a bit. No functional change.

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
index d4284458377e..a309f9fabe8b 100644
@@ -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

Thanks.

#2 lore raw
In reply to Borislav Petkov
Quoted 30 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Streamline it a bit. No functional change.

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
index d4284458377e..a309f9fabe8b 100644
@@ -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
#3 lore raw
In reply to Borislav Petkov
Quoted 19 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Streamline it a bit. No functional change.

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
index d4284458377e..a309f9fabe8b 100644

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