[PATCH] 2.6.18-rt6 sysctl conflict

[PATCH] 2.6.18-rt6 sysctl conflict

[Joe Korty]

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 */
 };
 
 

Re: [PATCH] 2.6.18-rt6 sysctl conflict

[Ingo Molnar]

* Joe Korty <joe.korty@ccur.com> wrote:

> Repair conflict between 2.6.18 and preempt-rt's sysctl(2) addition.

thanks - the -rt tree just got rebased to latest -hrt-dynticks, which 
doesnt have the sysctl anymore. (but we might reintroduce it in the 
future, i'll pick up your fix in that case.)

	Ingo

Re: [PATCH] 2.6.18-rt6 sysctl conflict

[Andi Kleen]

Joe Korty <joe.korty@ccur.com> writes:

> Repair conflict between 2.6.18 and preempt-rt's sysctl(2) addition.

In general new sysctl shouldn't get any numbers at all. Just use 0
or so or 999. Distributions and other patches have mangled the 
numerical name so excessively that it is fairly useless for
any newer numbers. I would suggest to just drop them.

-Andi