Patchwork [1/2] UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not bool

login
register
mail settings
Submitter Andy Whitcroft
Date May 19, 2011, 1:54 p.m.
Message ID <1305813255-8076-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/96380/
State New
Headers show

Comments

Andy Whitcroft - May 19, 2011, 1:54 p.m.
From: Thomas Schlichter <thomas.schlichter@web.de>

BugLink: http://bugs.launchpad.net/bugs/778043

As noted by the reporter the mtrr kernel command line option is actually a
positive numeric not a boolean, move the module parameter we add to match.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/video/vesafb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Leann Ogasawara - May 19, 2011, 2:03 p.m.
On Thu, 2011-05-19 at 14:54 +0100, Andy Whitcroft wrote:
> From: Thomas Schlichter <thomas.schlichter@web.de>
> 
> BugLink: http://bugs.launchpad.net/bugs/778043
> 
> As noted by the reporter the mtrr kernel command line option is actually a
> positive numeric not a boolean, move the module parameter we add to match.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
>  drivers/video/vesafb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index 2a60213..d0db4bb 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -74,7 +74,7 @@ module_param_named(vgapal, pmi_setpal, invbool, 0);
>  MODULE_PARM_DESC(vgapal, "Use VGA for setting palette (default)");
>  module_param_named(pmipal, pmi_setpal, bool, 0);
>  MODULE_PARM_DESC(pmipal, "Use PMI for setting palette");
> -module_param(mtrr, bool, 0);
> +module_param(mtrr, uint, 0);
>  MODULE_PARM_DESC(mtrr, "Enable MTRR support (default)");
>  module_param_named(nomtrr, mtrr, invbool, 0);
>  MODULE_PARM_DESC(nomtrr, "Disable MTRR support");
> -- 
> 1.7.4.1
> 
>
Brad Figg - May 19, 2011, 2:20 p.m.
On 05/19/2011 06:54 AM, Andy Whitcroft wrote:
> From: Thomas Schlichter<thomas.schlichter@web.de>
>
> BugLink: http://bugs.launchpad.net/bugs/778043
>
> As noted by the reporter the mtrr kernel command line option is actually a
> positive numeric not a boolean, move the module parameter we add to match.
>
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   drivers/video/vesafb.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index 2a60213..d0db4bb 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -74,7 +74,7 @@ module_param_named(vgapal, pmi_setpal, invbool, 0);
>   MODULE_PARM_DESC(vgapal, "Use VGA for setting palette (default)");
>   module_param_named(pmipal, pmi_setpal, bool, 0);
>   MODULE_PARM_DESC(pmipal, "Use PMI for setting palette");
> -module_param(mtrr, bool, 0);
> +module_param(mtrr, uint, 0);
>   MODULE_PARM_DESC(mtrr, "Enable MTRR support (default)");
>   module_param_named(nomtrr, mtrr, invbool, 0);
>   MODULE_PARM_DESC(nomtrr, "Disable MTRR support");

Acked-by: Brad Figg <brad.figg@canonical.com>

Andy,

Don't forget to add the SRU justification text.

Brad
Steve Conklin - May 24, 2011, 4:31 p.m.
Applied

On Thu, 2011-05-19 at 14:54 +0100, Andy Whitcroft wrote:
> From: Thomas Schlichter <thomas.schlichter@web.de>
> 
> BugLink: http://bugs.launchpad.net/bugs/778043
> 
> As noted by the reporter the mtrr kernel command line option is actually a
> positive numeric not a boolean, move the module parameter we add to match.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  drivers/video/vesafb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
> index 2a60213..d0db4bb 100644
> --- a/drivers/video/vesafb.c
> +++ b/drivers/video/vesafb.c
> @@ -74,7 +74,7 @@ module_param_named(vgapal, pmi_setpal, invbool, 0);
>  MODULE_PARM_DESC(vgapal, "Use VGA for setting palette (default)");
>  module_param_named(pmipal, pmi_setpal, bool, 0);
>  MODULE_PARM_DESC(pmipal, "Use PMI for setting palette");
> -module_param(mtrr, bool, 0);
> +module_param(mtrr, uint, 0);
>  MODULE_PARM_DESC(mtrr, "Enable MTRR support (default)");
>  module_param_named(nomtrr, mtrr, invbool, 0);
>  MODULE_PARM_DESC(nomtrr, "Disable MTRR support");
> -- 
> 1.7.4.1
> 
>

Patch

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 2a60213..d0db4bb 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -74,7 +74,7 @@  module_param_named(vgapal, pmi_setpal, invbool, 0);
 MODULE_PARM_DESC(vgapal, "Use VGA for setting palette (default)");
 module_param_named(pmipal, pmi_setpal, bool, 0);
 MODULE_PARM_DESC(pmipal, "Use PMI for setting palette");
-module_param(mtrr, bool, 0);
+module_param(mtrr, uint, 0);
 MODULE_PARM_DESC(mtrr, "Enable MTRR support (default)");
 module_param_named(nomtrr, mtrr, invbool, 0);
 MODULE_PARM_DESC(nomtrr, "Disable MTRR support");