Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c42bd8 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Linus Torvalds
Browse files

i386: cpu/transmeta.c: fix definition of USER686 



The definition of USER686 is supposed to be a mask of feature bits,
not an OR of feature numbers!  It happened to work anyway on the only
processor affected, simply by pure coincidence.  Fix.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b479c91

arch/i386/kernel/cpu/transmeta.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -77,7 +77,9 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) 
	set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability);

	set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability);

	

	

	/* If we can run i686 user-space code, call us an i686 */

	/* If we can run i686 user-space code, call us an i686 */

#define USER686 (X86_FEATURE_TSC|X86_FEATURE_CX8|X86_FEATURE_CMOV)

#define USER686 ((1 << X86_FEATURE_TSC)|\

		 (1 << X86_FEATURE_CX8)|\

		 (1 << X86_FEATURE_CMOV))

        if (c->x86 == 5 && (c->x86_capability[0] & USER686) == USER686)

        if (c->x86 == 5 && (c->x86_capability[0] & USER686) == USER686)

		c->x86 = 6;

		c->x86 = 6;