# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.660 -> 1.661 # include/linux/sysctl.h 1.18 -> 1.19 # arch/arm/kernel/isa.c 1.1 -> 1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/07/19 gregat_private 1.661 # LSM: change BUS_ISA to CTL_BUS_ISA to prevent namespace collision with the input subsystem. # # This is needed due to the next header file changes. # -------------------------------------------- # diff -Nru a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c --- a/arch/arm/kernel/isa.c Fri Jul 19 16:03:52 2002 +++ b/arch/arm/kernel/isa.c Fri Jul 19 16:03:52 2002 @@ -38,7 +38,7 @@ 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 -Nru a/include/linux/sysctl.h b/include/linux/sysctl.h --- a/include/linux/sysctl.h Fri Jul 19 16:03:52 2002 +++ b/include/linux/sysctl.h Fri Jul 19 16:03:52 2002 @@ -72,7 +72,7 @@ /* CTL_BUS names: */ enum { - BUS_ISA=1 /* ISA */ + CTL_BUS_ISA=1 /* ISA */ }; /* CTL_KERN names: */ _______________________________________________ linux-security-module mailing list linux-security-moduleat_private http://mail.wirex.com/mailman/listinfo/linux-security-module
This archive was generated by hypermail 2b30 : Fri Jul 19 2002 - 16:13:09 PDT