diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-11-16 20:07:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-04 09:16:57 -0800 |
| commit | 7c979c49c9882badee45c0a7a3dbca1040b7ba73 (patch) | |
| tree | 5b65705defe58677d48e3c2c2fdf102ed8d935d2 | |
| parent | 5115f39c2034cb80a050d996a2a6343bce189628 (diff) | |
| download | lwn-7c979c49c9882badee45c0a7a3dbca1040b7ba73.tar.gz lwn-7c979c49c9882badee45c0a7a3dbca1040b7ba73.zip | |
sparc64: unify arch/sparc64/oprofile/
A simple:
diff arch/sparc64/oprofile/init.c arch/sparc/oprofile/init.c
diff arch/sparc64/oprofile/Makefile arch/sparc/oprofile/Makefile
revealed that the directories were equal.
So let sparc64 point to the sparc version and drop the sparc64 oprofile dir
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc64/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc64/oprofile/Makefile | 9 | ||||
| -rw-r--r-- | arch/sparc64/oprofile/init.c | 23 |
3 files changed, 1 insertions, 33 deletions
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index e9f98ec4a69e..3dbda408572b 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile @@ -30,7 +30,7 @@ head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o core-y += arch/sparc64/kernel/ arch/sparc64/mm/ core-y += arch/sparc/math-emu/ libs-y += arch/sparc64/prom/ arch/sparc64/lib/ -drivers-$(CONFIG_OPROFILE) += arch/sparc64/oprofile/ +drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/ boot := arch/sparc64/boot diff --git a/arch/sparc64/oprofile/Makefile b/arch/sparc64/oprofile/Makefile deleted file mode 100644 index e9feca1ca28b..000000000000 --- a/arch/sparc64/oprofile/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -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) init.o diff --git a/arch/sparc64/oprofile/init.c b/arch/sparc64/oprofile/init.c deleted file mode 100644 index 17bb6035069b..000000000000 --- a/arch/sparc64/oprofile/init.c +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file init.c - * - * @remark Copyright 2002 OProfile authors - * @remark Read the file COPYING - * - * @author John Levon <levon@movementarian.org> - */ - -#include <linux/kernel.h> -#include <linux/oprofile.h> -#include <linux/errno.h> -#include <linux/init.h> - -int __init oprofile_arch_init(struct oprofile_operations *ops) -{ - return -ENODEV; -} - - -void oprofile_arch_exit(void) -{ -} |