Messages in this thread Patch in this message | | | Date | Mon, 15 Jul 2013 19:28:18 +0200 | Subject | Re: [uclinux-dist-devel] [GIT PULL] Blackfin updates for 3.11 | From | Geert Uytterhoeven <> |
| |
Hi Steven,
On Tue, Jul 9, 2013 at 11:15 AM, Steven Miao <realmz6@kernel.org> wrote: > Steven Miao (2): > smp: refine bf561 smpboot code
Unfortunately this landed too late in -next to notice:
arch/blackfin/mach-common/smp.c:150:2: error: conversion to non-scalar type requested arch/blackfin/mach-common/smp.c:185:23: error: incompatible types when assigning to type 'atomic_t' from type 'int' arch/blackfin/mach-common/smp.c:186:24: error: incompatible types when assigning to type 'atomic_t' from type 'int' make[2]: *** [arch/blackfin/mach-common/smp.o] Error 1
http://kisskb.ellerman.id.au/kisskb/buildresult/9115952/
It's a bit embarrassing to break your own core code (with a patch that was submitted for public review in August 2012?).
The last two can be trivially-fixed with the following (whitespace-damaged gmail) patch:
--- a/arch/blackfin/mach-common/smp.c +++ b/arch/blackfin/mach-common/smp.c @@ -182,8 +182,8 @@ static void bfin_ipi_init(void) struct ipi_data *bfin_ipi_data; for_each_possible_cpu(cpu) { bfin_ipi_data = &per_cpu(bfin_ipi, cpu); - bfin_ipi_data->bits = 0; - bfin_ipi_data->count = 0; + atomic_set(&bfin_ipi_data->bits, 0); + atomic_set(&bfin_ipi_data->count, 0); } }
but the first one is non-trivial: using xchg() on atomic_t is a bit gross... Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |