diff options
| author | Linus Torvalds | 2007-11-26 19:41:28 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2007-11-26 19:41:28 -0800 |
| commit | ff1ea52fa317a5658b6415b25169c5e531f54876 (patch) | |
| tree | 88fd243ddb02de7e3b2b0f55aba91796785b5a63 /include/linux | |
| parent | b5faa4b89e4d83203b1f44f143a351b518f7cda2 (diff) | |
| parent | f44d9efd3510776216938fef84adc99cc0e12412 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix APIC related bootup crash on Athlon XP CPUs
time: add ADJ_OFFSET_SS_READ
x86: export the symbol empty_zero_page on the 32-bit x86 architecture
x86: fix kprobes_64.c inlining borkage
pci: use pci=bfsort for HP DL385 G2, DL585 G2
x86: correctly set UTS_MACHINE for "make ARCH=x86"
lockdep: annotate do_debug() trap handler
x86: turn off iommu merge by default
x86: fix ACPI compile for LOCAL_APIC=n
x86: printk kernel version in WARN_ON and other dump_stack users
ACPI: Set max_cstate to 1 for early Opterons.
x86: fix NMI watchdog & 'stopped time' problem
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index 37ac3ff90faf..24c6a2b59511 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -137,6 +137,7 @@ struct timex { #define ADJ_TIMECONST 0x0020 /* pll time constant */ #define ADJ_TICK 0x4000 /* tick value */ #define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ +#define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ /* xntp 3.4 compatibility names */ #define MOD_OFFSET ADJ_OFFSET |