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

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

Ike Panhc
Bug: #336549

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 compile
wont fail when "CONFIG_HECI=y".

This bug appears in the HECI version 3.2.0.24 but has been fixed in the
next version (5.0.0.30). But there are a lot of modification between
these two version.

Recommend for Intrepid, Jaunty and Karmic, and drop off if we update
the module to next verion or later.

Signed-off-by: Ike Panhc <[hidden email]>
---
 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 */
--
1.5.6.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team