lkml.org 
[lkml]   [2017]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Commit-ID:  bbcf9574bc6fb85d22f2718d48da7f98830a7870
    Gitweb: http://git.kernel.org/tip/bbcf9574bc6fb85d22f2718d48da7f98830a7870
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 20 Jun 2017 01:37:41 +0200
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Thu, 22 Jun 2017 18:21:21 +0200

    x86/uv: Use default_cpu_mask_to_apicid_and()

    Same functionality except the extra bits ored on the apicid.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Marc Zyngier <marc.zyngier@arm.com>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Keith Busch <keith.busch@intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Christoph Hellwig <hch@lst.de>
    Link: http://lkml.kernel.org/r/20170619235446.482841015@linutronix.de

    ---
    arch/x86/kernel/apic/x2apic_uv_x.c | 19 ++++---------------
    1 file changed, 4 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
    index b487b3a..fd5bb20 100644
    --- a/arch/x86/kernel/apic/x2apic_uv_x.c
    +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
    @@ -530,23 +530,12 @@ uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
    const struct cpumask *andmask,
    unsigned int *apicid)
    {
    - int unsigned cpu;
    + int ret = default_cpu_mask_to_apicid_and(cpumask, andmask, apicid);

    - /*
    - * We're using fixed IRQ delivery, can only return one phys APIC ID.
    - * May as well be the first.
    - */
    - for_each_cpu_and(cpu, cpumask, andmask) {
    - if (cpumask_test_cpu(cpu, cpu_online_mask))
    - break;
    - }
    -
    - if (likely(cpu < nr_cpu_ids)) {
    - *apicid = per_cpu(x86_cpu_to_apicid, cpu) | uv_apicid_hibits;
    - return 0;
    - }
    + if (!ret)
    + *apicid |= uv_apicid_hibits;

    - return -EINVAL;
    + return ret;
    }

    static unsigned int x2apic_get_apic_id(unsigned long x)
    \
     
     \ /
      Last update: 2017-06-22 20:05    [W:4.090 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site