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

Commit 7c979c49 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5115f39c

arch/sparc64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/sparc64/oprofile/Makefile

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
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

arch/sparc64/oprofile/init.c

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/**

 * @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)

{

}