Re: [2.5 patch] SECURITY_ROOTPLUG must depend on USB

[Chris Wright]

* Greg KH ([e-mail]) wrote:
> On Sun, Jun 01, 2003 at 08:44:36PM +0200, Adrian Bunk wrote:
> > The following patch lets SECURITY_ROOTPLUG depend on USB (otherwise
> > there are link errors since Root Plug Support needs
> > usb_bus_list{,_lock}):
> 
> Applied, thanks.

While we're at it, here's a tiny cleanup for a compile warning from John
Cherry's build stats[1].  You may have a cleaner way you'd rather handle
this.

  CC [M]  security/root_plug.o
security/root_plug.c:57:1: warning: "dbg" redefined
In file included from security/root_plug.c:30:
include/linux/usb.h:979:1: warning: this is the location of the previous definition

thanks,
-chris

[1] http://www.osdl.org/archive/cherry/stability/linux-2.5.69.results/2.5.69.allmodconfig.modules.txt
-- 
Linux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net

===== security/root_plug.c 1.2 vs edited =====
--- 1.2/security/root_plug.c	Wed Dec 18 15:09:26 2002
+++ edited/security/root_plug.c	Mon Jun  2 11:42:21 2003
@@ -54,6 +54,9 @@
 #define MY_NAME "root_plug"
 #endif
 
+#ifdef dbg
+#undef dbg
+#endif
 #define dbg(fmt, arg...)					\
 	do {							\
 		if (debug)					\