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

Commit aed3a8c9 authored by Bob Nelson's avatar Bob Nelson Committed by Paul Mackerras
Browse files

[POWERPC] Oprofile: Remove dependency on spufs module 



This removes an OProfile dependency on the spufs module.  This
dependency was causing a problem for multiplatform systems that are
built with support for Oprofile on Cell but try to load the oprofile
module on a non-Cell system.

Signed-off-by: default avatarBob Nelson <rrnelson@us.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c68cb23d

arch/powerpc/platforms/cell/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -88,3 +88,8 @@ config CBE_CPUFREQ_PMI 
	  but also at lower core voltage.



endmenu



config OPROFILE_CELL

	def_bool y

	depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)

arch/powerpc/platforms/cell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ spu-manage-$(CONFIG_PPC_CELLEB) += spu_manage.o 
spu-manage-$(CONFIG_PPC_CELL_NATIVE)	+= spu_manage.o



obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \

					   spu_notify.o \

					   spu_syscalls.o \

					   $(spu-priv1-y) \

					   $(spu-manage-y) \

arch/powerpc/platforms/cell/spu_notify.c

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Move OProfile dependencies from spufs module to the kernel so it

 * can run on non-cell PPC.

 *

 * Copyright (C) IBM 2005

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2, or (at your option)

 * any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#undef DEBUG



#include <linux/module.h>

#include <asm/spu.h>

#include "spufs/spufs.h"



static BLOCKING_NOTIFIER_HEAD(spu_switch_notifier);



void spu_switch_notify(struct spu *spu, struct spu_context *ctx)

{

	blocking_notifier_call_chain(&spu_switch_notifier,

				     ctx ? ctx->object_id : 0, spu);

}

EXPORT_SYMBOL_GPL(spu_switch_notify);



int spu_switch_event_register(struct notifier_block *n)

{

	int ret;

	ret = blocking_notifier_chain_register(&spu_switch_notifier, n);

	if (!ret)

		notify_spus_active();

	return ret;

}

EXPORT_SYMBOL_GPL(spu_switch_event_register);



int spu_switch_event_unregister(struct notifier_block *n)

{

	return blocking_notifier_chain_unregister(&spu_switch_notifier, n);

}

EXPORT_SYMBOL_GPL(spu_switch_event_unregister);



void spu_set_profile_private_kref(struct spu_context *ctx,

				  struct kref *prof_info_kref,

				  void (* prof_info_release) (struct kref *kref))

{

	ctx->prof_priv_kref = prof_info_kref;

	ctx->prof_priv_release = prof_info_release;

}

EXPORT_SYMBOL_GPL(spu_set_profile_private_kref);



void *spu_get_profile_private_kref(struct spu_context *ctx)

{

	return ctx->prof_priv_kref;

}

EXPORT_SYMBOL_GPL(spu_get_profile_private_kref);

arch/powerpc/platforms/cell/spu_syscalls.c

+14 −0
Original line number Diff line number Diff line
@@ -145,6 +145,20 @@ int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset) 
	return ret;

}



void notify_spus_active(void)

{

	struct spufs_calls *calls;



	calls = spufs_calls_get();

	if (!calls)

		return;



	calls->notify_spus_active();

	spufs_calls_put(calls);



	return;

}



int register_spu_syscalls(struct spufs_calls *calls)

{

	if (spufs_calls)

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

+0 −16
Original line number Diff line number Diff line
@@ -190,19 +190,3 @@ void spu_release_saved(struct spu_context *ctx) 
	spu_release(ctx);

}

void spu_set_profile_private_kref(struct spu_context *ctx,

				  struct kref *prof_info_kref,

				  void ( * prof_info_release) (struct kref *kref))

{

	ctx->prof_priv_kref = prof_info_kref;

	ctx->prof_priv_release = prof_info_release;

}

EXPORT_SYMBOL_GPL(spu_set_profile_private_kref);



void *spu_get_profile_private_kref(struct spu_context *ctx)

{

	return ctx->prof_priv_kref;

}

EXPORT_SYMBOL_GPL(spu_get_profile_private_kref);