LSM: change BUS_ISA to CTL_BUS_ISA to prevent namespace collision with the input...

This is needed due to the next header file changes.

diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index c9b9526d22c4487d1a9f9b636680e0cc9e76e314..685c3e591a7e1e449abe01cf920b9337940ecba4 100644 (file)
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -38,7 +38,7 @@ static ctl_table ctl_isa_vars[4] = {
 
 static struct ctl_table_header *isa_sysctl_header;
 
-static ctl_table ctl_isa[2] = {{BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},
+static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},
                               {0}};
 static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa},
                               {0}};

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index da8115ec58f6bb5df067becbb1a2003d13f0e5f8..01f1208ca44944ac390c8d88a71582ec30ddb21d 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -72,7 +72,7 @@ enum
 /* CTL_BUS names: */
 enum
 {
-       BUS_ISA=1               /* ISA */
+       CTL_BUS_ISA=1           /* ISA */
 };
 
 /* CTL_KERN names: */