lkml.org 
[lkml]   [2017]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/5] x86/kernel: Skip TSC test and error messages if already unstable
From
Date


On 10/12/2017 8:22 AM, Thomas Gleixner wrote:
> On Thu, 12 Oct 2017, Mike Travis wrote:
>> On 10/12/2017 4:17 AM, Thomas Gleixner wrote:
>>> On Thu, 5 Oct 2017, mike.travis@hpe.com wrote:
>>>> @@ -89,6 +93,10 @@ bool tsc_store_and_check_tsc_adjust(bool
>>>> if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST))
>>>> return false;
>>>> + /* Skip unnecessary error messages if TSC already unstable */
>>>> + if (check_tsc_unstable())
>>>> + return false;
>>>> +
>>>> rdmsrl(MSR_IA32_TSC_ADJUST, bootval);
>>>> cur->bootval = bootval;
>>>> cur->adjusted = bootval;
>>>
>>> This hunk rejects and I really can't figure out against which tree that
>>> would apply.
>>
>> My current merge tree happens to be 4.13.0-rc1 which was the latest when I
>> started this patch submission. I can update my merge tree and reapply if need
>> be?
>
> Please send patches always against top of tree and not some random ancient
> version of it.
>

I pulled in 4.14.0-rc4 and reapplied the patches and they went in
without conflict. Hopefully it will be the same for you.

(And dealt with your question about applying the same change to
the !CONFIG_SMP case.)

Thanks,
Mike

\
 
 \ /
  Last update: 2017-10-12 18:35    [W:0.228 / U:0.136 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site