Diff
Modified: trunk/arch/blackfin/Makefile (5900 => 5901)
--- trunk/arch/blackfin/Makefile 2008-12-19 10:19:01 UTC (rev 5900)
+++ trunk/arch/blackfin/Makefile 2008-12-19 10:44:03 UTC (rev 5901)
@@ -107,10 +107,10 @@
core-y += arch/$(ARCH)/kernel/cplb-nompu/
endif
+core-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/
+
libs-y += arch/$(ARCH)/lib/
-drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/
-
machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y))
KBUILD_CFLAGS += -Iarch/$(ARCH)/include/
Modified: trunk/arch/blackfin/oprofile/Makefile (5900 => 5901)
--- trunk/arch/blackfin/oprofile/Makefile 2008-12-19 10:19:01 UTC (rev 5900)
+++ trunk/arch/blackfin/oprofile/Makefile 2008-12-19 10:44:03 UTC (rev 5901)
@@ -2,12 +2,4 @@
# arch/blackfin/oprofile/Makefile
#
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
- oprof.o cpu_buffer.o buffer_sync.o \
- event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o \
- timer_int.o )
-
-oprofile-y := $(DRIVER_OBJS) common.o
+obj-$(CONFIG_OPROFILE) += bfin_oprofile.o
Copied: trunk/arch/blackfin/oprofile/bfin_oprofile.c (from rev 5900, trunk/arch/blackfin/oprofile/common.c) (0 => 5901)
--- trunk/arch/blackfin/oprofile/bfin_oprofile.c (rev 0)
+++ trunk/arch/blackfin/oprofile/bfin_oprofile.c 2008-12-19 10:44:03 UTC (rev 5901)
@@ -0,0 +1,41 @@
+/*
+ * File: arch/blackfin/oprofile/common.c
+ * Based on: arch/alpha/oprofile/common.c
+ * Author: Anton Blanchard <[email protected]>
+ *
+ * Created:
+ * Description:
+ *
+ * Modified:
+ * Copyright (C) 2004 Anton Blanchard <[email protected]>, IBM
+ * Copyright 2004-2008 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)
+{
+}
Deleted: trunk/arch/blackfin/oprofile/common.c (5900 => 5901)
--- trunk/arch/blackfin/oprofile/common.c 2008-12-19 10:19:01 UTC (rev 5900)
+++ trunk/arch/blackfin/oprofile/common.c 2008-12-19 10:44:03 UTC (rev 5901)
@@ -1,41 +0,0 @@
-/*
- * File: arch/blackfin/oprofile/common.c
- * Based on: arch/alpha/oprofile/common.c
- * Author: Anton Blanchard <[email protected]>
- *
- * Created:
- * Description:
- *
- * Modified:
- * Copyright (C) 2004 Anton Blanchard <[email protected]>, 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)
-{
-}
Modified: trunk/drivers/Makefile (5900 => 5901)
--- trunk/drivers/Makefile 2008-12-19 10:19:01 UTC (rev 5900)
+++ trunk/drivers/Makefile 2008-12-19 10:44:03 UTC (rev 5901)
@@ -102,3 +102,4 @@
obj-$(CONFIG_REGULATOR) += regulator/
obj-$(CONFIG_STAGING) += staging/
obj-$(CONFIG_UWB) += uwb/
+obj-$(CONFIG_OPROFILE) += oprofile/
Added: trunk/drivers/oprofile/Makefile (0 => 5901)
--- trunk/drivers/oprofile/Makefile (rev 0)
+++ trunk/drivers/oprofile/Makefile 2008-12-19 10:44:03 UTC (rev 5901)
@@ -0,0 +1,7 @@
+#
+# drivers/oprofile/Makefile
+#
+obj-y := oprof.o cpu_buffer.o buffer_sync.o \
+ event_buffer.o oprofile_files.o \
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o
