lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the block tree
Hi all,

On Mon, 3 Jul 2017 13:56:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2017-07-03 06:04    [W:0.027 / U:3.476 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site