diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:06:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:06:15 -0700 |
| commit | a38133298fc678335a0229e97b6161a7ac6fec84 (patch) | |
| tree | 2500f23fd230e67a8eba96b380245ecb43c3fd4c /arch/ia64/kernel/setup.c | |
| parent | 97d26b8042a6f14cc4a19e84e911a953363e3d69 (diff) | |
| parent | 70aa488cff83c965c9e1850f48d82b000d0d6c1c (diff) | |
| download | lwn-a38133298fc678335a0229e97b6161a7ac6fec84.tar.gz lwn-a38133298fc678335a0229e97b6161a7ac6fec84.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index b7e6b4cb374b..d14692e0920a 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -720,7 +720,8 @@ cpu_init (void) ia64_set_kr(IA64_KR_PT_BASE, __pa(ia64_imva(empty_zero_page))); /* - * Initialize default control register to defer all speculative faults. The + * Initialize default control register to defer speculative faults except + * for those arising from TLB misses, which are not deferred. The * kernel MUST NOT depend on a particular setting of these bits (in other words, * the kernel must have recovery code for all speculative accesses). Turn on * dcr.lc as per recommendation by the architecture team. Most IA-32 apps |