Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 3538a1b0aeac85865d9abbef1bd9a23c7b835da6..bca023bdd6b2a8b4525d10145795408dee4fa01b 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -823,8 +823,8 @@ static const struct cpu_dev amd_cpu_dev = {
        .c_vendor       = "AMD",
        .c_ident        = { "AuthenticAMD" },
 #ifdef CONFIG_X86_32
-       .c_models = {
-               { .vendor = X86_VENDOR_AMD, .family = 4, .model_names =
+       .legacy_models = {
+               { .family = 4, .model_names =
                  {
                          [3] = "486 DX/2",
                          [7] = "486 DX/2-WB",
@@ -835,7 +835,7 @@ static const struct cpu_dev amd_cpu_dev = {
                  }
                },
        },
-       .c_size_cache   = amd_size_cache,
+       .legacy_cache_size = amd_size_cache,
 #endif
        .c_early_init   = early_init_amd,
        .c_detect_tlb   = cpu_detect_tlb_amd,