| Message ID | 20140305161611.GA32461@udknight (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/03/14 18:16, Wang YanQing wrote: > Because _PAGE_NX check will always false when we don't define > CONFIG_X86_PAE for CONFIG_X86_32, so use CONFIG_X86_PAE surround > the check code. > > Although I believe "smart" compile will optimize out and generate > the same code, but use CONFIG_X86_PAE surround check code will > clear it and prohibit warning from static source code analyze tool. > > [ This patch fix warning report by fengguang.wu@intel.com > "drivers/video/fbdev/uvesafb.c:816 uvesafb_vbe_init() > warn: bitwise AND condition is false here" ] > > Signed-off-by: Wang YanQing <udknight@gmail.com> > --- > drivers/video/fbdev/uvesafb.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c > index 509d452..102858c 100644 > --- a/drivers/video/fbdev/uvesafb.c > +++ b/drivers/video/fbdev/uvesafb.c > @@ -813,6 +813,7 @@ static int uvesafb_vbe_init(struct fb_info *info) > par->ypan = ypan; > > if (par->pmi_setpal || par->ypan) { > +#ifdef CONFIG_X86_PAE > if (__supported_pte_mask & _PAGE_NX) { > par->pmi_setpal = par->ypan = 0; > printk(KERN_WARNING "uvesafb: NX protection is active, " > @@ -820,6 +821,9 @@ static int uvesafb_vbe_init(struct fb_info *info) > } else { > uvesafb_vbe_getpmi(task, par); > } > +#else > + uvesafb_vbe_getpmi(task, par); > +#endif > } I don't like this, I think this makes the code more messy, just to avoid that warning. And it might even be buggy. For your patch to work correctly, you need to know the internals of _PAGE_NX, i.e. that when CONFIG_X86_PAE is not defined, _PAGE_NX is 0. But the driver should not depend on things like that. If _PAGE_NX is changed later, the driver will not work correctly. Tomi
On Thu, Mar 06, 2014 at 11:56:37AM +0200, Tomi Valkeinen wrote: > I don't like this, I think this makes the code more messy, just to avoid > that warning. > > And it might even be buggy. For your patch to work correctly, you need > to know the internals of _PAGE_NX, i.e. that when CONFIG_X86_PAE is not > defined, _PAGE_NX is 0. But the driver should not depend on things like > that. If _PAGE_NX is changed later, the driver will not work correctly. > Very right! Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 509d452..102858c 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -813,6 +813,7 @@ static int uvesafb_vbe_init(struct fb_info *info) par->ypan = ypan; if (par->pmi_setpal || par->ypan) { +#ifdef CONFIG_X86_PAE if (__supported_pte_mask & _PAGE_NX) { par->pmi_setpal = par->ypan = 0; printk(KERN_WARNING "uvesafb: NX protection is active, " @@ -820,6 +821,9 @@ static int uvesafb_vbe_init(struct fb_info *info) } else { uvesafb_vbe_getpmi(task, par); } +#else + uvesafb_vbe_getpmi(task, par); +#endif } #else /* The protected mode interface is not available on non-x86. */
Because _PAGE_NX check will always false when we don't define CONFIG_X86_PAE for CONFIG_X86_32, so use CONFIG_X86_PAE surround the check code. Although I believe "smart" compile will optimize out and generate the same code, but use CONFIG_X86_PAE surround check code will clear it and prohibit warning from static source code analyze tool. [ This patch fix warning report by fengguang.wu@intel.com "drivers/video/fbdev/uvesafb.c:816 uvesafb_vbe_init() warn: bitwise AND condition is false here" ] Signed-off-by: Wang YanQing <udknight@gmail.com> --- drivers/video/fbdev/uvesafb.c | 4 ++++ 1 file changed, 4 insertions(+)