From 0af6f5ecb99586e373d3a4eb98beb79cde18a57a Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 1 Aug 2005 21:11:44 -0700 Subject: [PATCH] --- yaml --- r: 5582 b: refs/heads/master c: 39bbb07d7c0cf3e374831d1474e2246d9cabd931 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/transmeta.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 89c05a72d833..8fb00c4989a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba17101b41977f124948e0a7797fdcbb59e19f3e +refs/heads/master: 39bbb07d7c0cf3e374831d1474e2246d9cabd931 diff --git a/trunk/arch/i386/kernel/cpu/transmeta.c b/trunk/arch/i386/kernel/cpu/transmeta.c index d8e59e198675..fc426380366b 100644 --- a/trunk/arch/i386/kernel/cpu/transmeta.c +++ b/trunk/arch/i386/kernel/cpu/transmeta.c @@ -77,9 +77,11 @@ static void __init init_transmeta(struct cpuinfo_x86 *c) if ( c->x86 == 5 && (c->x86_capability[0] & USER686) == USER686 ) c->x86 = 6; +#ifdef CONFIG_SYSCTL /* randomize_va_space slows us down enormously; it probably triggers retranslation of x86->native bytecode */ randomize_va_space = 0; +#endif } static void transmeta_identify(struct cpuinfo_x86 * c)