diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 07:56:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 07:56:24 +0300 |
| commit | 77eebf346dfe87587ee8a54c76349a996e80c24f (patch) | |
| tree | d8b7685cbc7dbc993ec39d3028e6f0246924bf40 /include | |
| parent | 2641dfd981e4a3eebf387f21cf10685af06e1641 (diff) | |
| parent | d2b176ed878d4d5fcc0bd35656dfd373f3702af9 (diff) | |
| download | linux-77eebf346dfe87587ee8a54c76349a996e80c24f.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sn/arch.h | 3 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h index 91c31be87b13..16adc93d7a72 100644 --- a/include/asm-ia64/sn/arch.h +++ b/include/asm-ia64/sn/arch.h @@ -31,7 +31,8 @@ * to ACPI3.0, this limit will be removed. The notion of "compact nodes" * should be deleted and TIOs should be included in MAX_NUMNODES. */ -#define MAX_COMPACT_NODES 512 +#define MAX_TIO_NODES MAX_NUMNODES +#define MAX_COMPACT_NODES (MAX_NUMNODES + MAX_TIO_NODES) /* * Maximum number of nodes in all partitions and in all coherency domains. 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 */ }; |