From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, linux-security-module@wirex.com
Subject: Re: [BK PATCH] LSM task control for 2.5.26
Date: Fri, 19 Jul 2002 16:10:01 -0700 [thread overview]
Message-ID: <20020719231000.GB24044@kroah.com> (raw)
In-Reply-To: <20020719230936.GA24044@kroah.com>
# 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 greg@kroah.com 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: */
next prev parent reply other threads:[~2002-07-19 23:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-07-19 23:09 [BK PATCH] LSM task control for 2.5.26 Greg KH
2002-07-19 23:10 ` Greg KH [this message]
2002-07-19 23:10 ` Greg KH
2002-07-19 23:10 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020719231000.GB24044@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@wirex.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox