Repair conflict between 2.6.18 and preempt-rt's sysctl(2) addition.
Signed-off-by: Joe Korty <[email protected]>
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 */
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
