From 2a942d2dc00d9214482d1833ea4c288734ef0ae9 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Wed, 8 Jun 2005 12:12:48 -0700 Subject: [PATCH] --- yaml --- r: 1899 b: refs/heads/master c: 86ebacd360767f6a5cf9c8810977593dccf3f3da h: refs/heads/master i: 1897: e3e022151ba6d477593b9dd1f18082ae4b74d4d7 1895: fb05e8479bdde70158874fa0a6283d1138e6b349 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/setup.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d3fe0f0f58ae..91ab9298dd45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 866ba633a81c1e179038f7527809d9513160a6f7 +refs/heads/master: 86ebacd360767f6a5cf9c8810977593dccf3f3da diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c index b7e6b4cb374b..d14692e0920a 100644 --- a/trunk/arch/ia64/kernel/setup.c +++ b/trunk/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