[LinuxBIOS] Merge complete....

[Eric W. Biederman]

YhLu <YhLu at tyan.com> writes:

>         if(is_cpu_d0()) {
>                 /* Erratum 110 ...*/
>                 msr = rdmsr_amd(CPU_ID_HYPER_EXT_FEATURES);
>                 msr.hi |=1;
>                 wrmsr_amd(CPU_ID_HYPER_EXT_FEATURES, msr);
>         }
>
>         if (is_cpu_pre_e0()) {
>                 /* Erratum 110 ... */
>                 msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR);
>                 msr.hi |=1;
>                 wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr);
>         }
>
> also in model_fxx_init.c you miss sth
> should be 
>
>         if(is_cpu_d0()) {
>                 /* Erratum 110 ...*/
>                 msr = rdmsr_amd(CPU_ID_HYPER_EXT_FEATURES);
>                 msr.hi |=1;
>                 wrmsr_amd(CPU_ID_HYPER_EXT_FEATURES, msr);
>         }
>
>         if (!is_cpu_pre_e0()) {  ------------------------------don't forget
> !
>                 /* Erratum 110 ... */
>                 msr = rdmsr_amd(CPU_ID_EXT_FEATURES_MSR);
>                 msr.hi |=1;
>                 wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr);
>         }

Good catch.  That was a recent case where I had to merge by hand I guess I was
tired when I did that one.

Eric