diff --git a/src/add-ons/kernel/cpu/x86/amd.cpp b/src/add-ons/kernel/cpu/x86/amd.cpp index 3481afa306..5a5ec656d9 100644 --- a/src/add-ons/kernel/cpu/x86/amd.cpp +++ b/src/add-ons/kernel/cpu/x86/amd.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2005, Haiku, Inc. + * Copyright 2005-2006, Haiku, Inc. * Distributed under the terms of the MIT License. * * Authors: @@ -30,6 +30,11 @@ amd_init(void) if ((info.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_AMD_x86) return B_ERROR; + // The K6-2 doesn't seem to support write-combining (before model 9), + // so we ignore anything before that one. + if (info.cpu_type <= B_CPU_AMD_K6_2) + return B_ERROR; + generic_mtrr_compute_physical_mask(); generic_dump_mtrrs(generic_count_mtrrs());