summaryrefslogtreecommitdiff
path: root/include/linux/sysctl.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-03 12:16:03 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-03 12:16:03 -0500
commit801c63c38ae52e8bfb3f6518de00a0be22c55f9a (patch)
treebb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d /include/linux/sysctl.h
parent1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (diff)
parent348edc59a8f9b9a66700781d972c24a46a79ae86 (diff)
Merge branch 'upstream'
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r--include/linux/sysctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 0e92bf7ec28e..bac61db26456 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -147,6 +147,7 @@ enum
KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
KERN_SPIN_RETRY=70, /* int: number of spinlock retries */
KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
+ KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
};