Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e623fbf1 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/cell: Fix compilation with CONFIG_COREDUMP=n 



Commit 046d662f "coredump: make core dump functionality optional"
made the coredump optional, but didn't update the spufs code that
depends on it. That leads to build errors such as:

  arch/powerpc/platforms/built-in.o: In function `.spufs_arch_write_note':
  coredump.c:(.text+0x22cd4): undefined reference to `.dump_emit'
  coredump.c:(.text+0x22cf4): undefined reference to `.dump_emit'
  coredump.c:(.text+0x22d0c): undefined reference to `.dump_align'
  coredump.c:(.text+0x22d48): undefined reference to `.dump_emit'
  coredump.c:(.text+0x22e7c): undefined reference to `.dump_skip'

Fix it by adding some ifdefs in the cell code.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6663a4fa

arch/powerpc/platforms/cell/spu_syscalls.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus) 
	return ret;

}



#ifdef CONFIG_COREDUMP

int elf_coredump_extra_notes_size(void)

{

	struct spufs_calls *calls;
@@ -142,6 +143,7 @@ int elf_coredump_extra_notes_write(struct coredump_params *cprm) 


	return ret;

}

#endif



void notify_spus_active(void)

{

arch/powerpc/platforms/cell/spufs/Makefile

+2 −1
Original line number Diff line number Diff line 


obj-$(CONFIG_SPU_FS) += spufs.o

spufs-y += inode.o file.o context.o syscalls.o coredump.o

spufs-y += inode.o file.o context.o syscalls.o

spufs-y += sched.o backing_ops.o hw_ops.o run.o gang.o

spufs-y += switch.o fault.o lscsa_alloc.o

spufs-$(CONFIG_COREDUMP) += coredump.o



# magic for the trace events

CFLAGS_sched.o := -I$(src)

arch/powerpc/platforms/cell/spufs/syscalls.c

+4 −2
Original line number Diff line number Diff line
@@ -79,8 +79,10 @@ static long do_spu_create(const char __user *pathname, unsigned int flags, 
struct spufs_calls spufs_calls = {

	.create_thread = do_spu_create,

	.spu_run = do_spu_run,

	.coredump_extra_notes_size = spufs_coredump_extra_notes_size,

	.coredump_extra_notes_write = spufs_coredump_extra_notes_write,

	.notify_spus_active = do_notify_spus_active,

	.owner = THIS_MODULE,

#ifdef CONFIG_COREDUMP

	.coredump_extra_notes_size = spufs_coredump_extra_notes_size,

	.coredump_extra_notes_write = spufs_coredump_extra_notes_write,

#endif

};