From: Joe Korty <joe.korty@ccur.com>
To: mingo@elte.hu
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] 2.6.18-rt6 sysctl conflict
Date: Wed, 18 Oct 2006 09:25:30 -0400 [thread overview]
Message-ID: <20061018132530.GA30767@tsunami.ccur.com> (raw)
Repair conflict between 2.6.18 and preempt-rt's sysctl(2) addition.
Signed-off-by: Joe Korty <joe.korty@ccur.com>
Index: new/include/linux/sysctl.h
===================================================================
--- new.orig/include/linux/sysctl.h 2006-10-18 09:18:34.000000000 -0400
+++ new/include/linux/sysctl.h 2006-10-18 09:20:03.000000000 -0400
@@ -150,7 +150,7 @@
KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
KERN_COMPAT_LOG=73, /* int: print compat layer messages */
KERN_MAX_LOCK_DEPTH=74,
- KERN_TIMEOUT_GRANULARITY=73, /* int: timeout granularity in jiffies */
+ KERN_TIMEOUT_GRANULARITY=75, /* int: timeout granularity in jiffies */
};
next reply other threads:[~2006-10-18 13:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-18 13:25 Joe Korty [this message]
2006-10-18 15:43 ` [PATCH] 2.6.18-rt6 sysctl conflict Ingo Molnar
2006-10-18 16:22 ` Andi Kleen
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=20061018132530.GA30767@tsunami.ccur.com \
--to=joe.korty@ccur.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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