[PATCH 1/1] [Intrepid, Jaunty] Fixing symbol name in HECI module

[Stefan Bader]

ikepanhc wrote:
> Bug: LP#336549

This should read "Bug: #336549". Not LP in front.

> The HECI module define a switch of debug message, which symbol name
> conflicts with another symbol in "arch/x86/kernel/entry_32.S".
> Change the symbol name from debug to heci_debug so that the make wont
> fail if "CONFIG_HECI=y".
> 
> Signed-off-by: ikepanhc <ike.pan at canonical.com>
> ---
>  ubuntu/heci/heci_data_structures.h |    4 ++--
>  ubuntu/heci/heci_main.c            |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/ubuntu/heci/heci_data_structures.h b/ubuntu/heci/heci_data_structures.h
> index 4ffd3e1..25a6c40 100644
> --- a/ubuntu/heci/heci_data_structures.h
> +++ b/ubuntu/heci/heci_data_structures.h
> @@ -125,9 +125,9 @@
>  	MODULE_PARM_DESC(name, desc);	\
>  	module_param(name, type, perm)
>  
> -extern int debug;
> +extern int heci_debug;
>  
> -#define DBG(format, arg...) do {if (debug) \
> +#define DBG(format, arg...) do {if (heci_debug) \
>  printk(KERN_ERR "%s: " format , __func__ , ## arg); \
>  } while (0)
>  
> diff --git a/ubuntu/heci/heci_main.c b/ubuntu/heci/heci_main.c
> index f267d0d..3d2dc5e 100644
> --- a/ubuntu/heci/heci_main.c
> +++ b/ubuntu/heci/heci_main.c
> @@ -77,9 +77,9 @@ char heci_copyright[] = "Copyright (c) 2003 - 2007 Intel Corporation.";
>  
>  
>  #ifdef HECI_DEBUG
> -DEF_PARM(int, debug, 1, 0644, "Debug enabled or not");
> +DEF_PARM(int, heci_debug, 1, 0644, "Debug enabled or not");
>  #else
> -DEF_PARM(int, debug, 0, 0644, "Debug enabled or not");
> +DEF_PARM(int, heci_debug, 0, 0644, "Debug enabled or not");
>  #endif
>  
>  /* heci char device for registration */

NAK, for this version (mainly formatting). First the Bug: keyword. Then The 
subject line. As this should reflect how you will check in the patch and will 
get the commit message.
If this is nothing from upstream, then this should include UBUNTU

[PATCH] UBUNTU: Fixing symbol name in HECI module

For Jaunty, but it is ok to use the same with Intrepid, it should even be 
marked with SAUCE, since it is something to carry on, or at least review when 
moving forward. SAUCE is used whenever something is not upstream. So:

[PATCH] UBUNTU: SAUCE: Fixing symbol name in HECI module

To experiment with the various possible ways of getting a patch included, could 
you do this with a git request-pull after reworking the subject and the bug 
reference.

Stefan
-- 

When all other means of communication fail, try words!