Commit 50e75344 authored May 16, 2011 by Borislav Petkov Committed by H. Peter Anvin May 16, 2011

x86, AMD, cacheinfo: Fix fallout caused by max3 conversion

732eacc0 converted code around the
kernel using nested max() macros to use the new max3 macro but forgot to
remove the old line in intel_cacheinfo.c. Fix it.

Cc: Hagen Paul Pfeifer <hagen@jauu.net>
Cc: Frank Arnold <farnold@amd64.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1305553188-21061-2-git-send-email-bp@amd64.org

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent d8d9766c

arch/x86/kernel/cpu/intel_cacheinfo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,6 @@ static void __cpuinit amd_calc_l3_indices(struct amd_l3_cache *l3)
		l3->subcaches[2] = sc2 = !(val & BIT(8)) + !(val & BIT(9));
		l3->subcaches[3] = sc3 = !(val & BIT(12)) + !(val & BIT(13));

		l3->indices = (max(max(max(sc0, sc1), sc2), sc3) << 10) - 1;
		l3->indices = (max(max3(sc0, sc1, sc2), sc3) << 10) - 1;
		}