Hi all,

On Mon, 3 Jul 2017 13:56:16 +1000 Stephen Rothwell <[email protected]> 
wrote:
>
>  +            if (cpu < nr_queues) {
> -                     map[cpu] = cpu_to_queue_index(nr_queues, cpu, 
> online_mask);
> ++                    map[cpu] = cpu_to_queue_index(nr_queues, cpu)
>  +            } else {
>  +                    first_sibling = get_first_sibling(cpu);
>  +                    if (first_sibling == cpu)
> -                             map[cpu] = cpu_to_queue_index(nr_queues, cpu, 
> online_mask);
> ++                            map[cpu] = cpu_to_queue_index(nr_queues, cpu)

Clearly, I dropped a couple of semicolons here ... I added them to the
merge resolution.

-- 
Cheers,
Stephen Rothwell

Reply via email to