Subject: Re: Please pull powerpc.git merge branch

From: Geoff Levand <[email-masked]>
Date: Fri, 28 Dec 2007 13:53:04 -0800

Paul Mackerras wrote:
> Linus,
> 
> Please do
> 
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

This broke Cell builds.

arch/powerpc/platforms/cell/spufs/sched.c:200: multiple definition of `.notify_spus_active'
arch/powerpc/platforms/cell/spu_syscalls.c:149: first defined here

commit aed3a8c9bb1a8623a618232087c5ff62718e3b9a
Author: Bob Nelson <[email-masked]>
Date:   Sat Dec 15 01:27:30 2007 +1100

    [POWERPC] Oprofile: Remove dependency on spufs module

Looking at the code, it seems just when CONFIG_SPU_FS=y, not when =m.

I'll try to make a fix.

-Geoff