diff options
| -rw-r--r-- | arch/blackfin/Makefile | 4 | ||||
| -rw-r--r-- | arch/blackfin/oprofile/Makefile | 2 | ||||
| -rw-r--r-- | arch/blackfin/oprofile/bfin_oprofile.c | 18 | ||||
| -rw-r--r-- | arch/blackfin/oprofile/common.c | 41 |
4 files changed, 21 insertions, 44 deletions
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 558241e5ccc3..e550c8d46066 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -107,10 +107,10 @@ else core-y += arch/$(ARCH)/kernel/cplb-nompu/ endif -libs-y += arch/$(ARCH)/lib/ - drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ +libs-y += arch/$(ARCH)/lib/ + machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y)) KBUILD_CFLAGS += -Iarch/$(ARCH)/include/ diff --git a/arch/blackfin/oprofile/Makefile b/arch/blackfin/oprofile/Makefile index f11749078b53..c70af3a01297 100644 --- a/arch/blackfin/oprofile/Makefile +++ b/arch/blackfin/oprofile/Makefile @@ -10,4 +10,4 @@ DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \ oprofilefs.o oprofile_stats.o \ timer_int.o ) -oprofile-y := $(DRIVER_OBJS) common.o +oprofile-y := $(DRIVER_OBJS) bfin_oprofile.o diff --git a/arch/blackfin/oprofile/bfin_oprofile.c b/arch/blackfin/oprofile/bfin_oprofile.c new file mode 100644 index 000000000000..c3b9713b23f8 --- /dev/null +++ b/arch/blackfin/oprofile/bfin_oprofile.c @@ -0,0 +1,18 @@ +/* + * bfin_oprofile.c - Blackfin oprofile code + * + * Copyright 2004-2008 Analog Devices Inc. + * Licensed under the GPL-2 or later. + */ + +#include <linux/oprofile.h> +#include <linux/init.h> + +int __init oprofile_arch_init(struct oprofile_operations *ops) +{ + return -1; +} + +void oprofile_arch_exit(void) +{ +} diff --git a/arch/blackfin/oprofile/common.c b/arch/blackfin/oprofile/common.c deleted file mode 100644 index beace4fb22e1..000000000000 --- a/arch/blackfin/oprofile/common.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * File: arch/blackfin/oprofile/common.c - * Based on: arch/alpha/oprofile/common.c - * Author: Anton Blanchard <anton@au.ibm.com> - * - * Created: - * Description: - * - * Modified: - * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM - * Copyright 2004-2006 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * 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 of the License, 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, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <linux/oprofile.h> -#include <linux/init.h> - -int __init oprofile_arch_init(struct oprofile_operations *ops) -{ - return -1; -} - -void oprofile_arch_exit(void) -{ -} |