lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 3 Jul 2017 14:03:50 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Jens Axboe <axboe@...nel.dk> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Max Gurtovoy <maxg@...lanox.com>, Christoph Hellwig <hch@....de> Subject: Re: 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@...b.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
Powered by blists - more mailing lists