[src/pgoyette-compat]: src/sys/arch/x86/x86 Track changes from HEAD

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e1219d274b85
branches:  pgoyette-compat
changeset: 321116:e1219d274b85
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Mar 28 22:10:15 2018 +0000

description:
Track changes from HEAD

diffstat:

 sys/arch/x86/x86/cpu_ucode.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 7dc3e323b114 -r e1219d274b85 sys/arch/x86/x86/cpu_ucode.c
--- a/sys/arch/x86/x86/cpu_ucode.c      Wed Mar 28 07:51:09 2018 +0000
+++ b/sys/arch/x86/x86/cpu_ucode.c      Wed Mar 28 22:10:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode.c,v 1.5.16.5 2018/03/22 01:44:47 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode.c,v 1.5.16.6 2018/03/28 22:10:15 pgoyette Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,v 1.5.16.5 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,v 1.5.16.6 2018/03/28 22:10:15 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_cpu_ucode.h"
@@ -69,9 +69,13 @@
 
        switch (cpu_vendor) {
        case CPUVENDOR_AMD:
-               error = cpu_ucode_amd_get_version(data, &v, l = sizeof(v.a));
+               l = sizeof(v.a);
+               error = cpu_ucode_amd_get_version(data, &v, l);
+               break;
        case CPUVENDOR_INTEL:
-               error = cpu_ucode_intel_get_version(data, &v, l = sizeof(v.i));
+               l = sizeof(v.i);
+               error = cpu_ucode_intel_get_version(data, &v, l);
+               break;
        default:
                return EOPNOTSUPP;
        }