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

Commit 33f2c231 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "perfmon: remove KSAPI"

parents 44a8077c 1e933a45

arch/arm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -1410,18 +1410,6 @@ config ARM_ERRATA_798181 
	  which sends an IPI to the CPUs that are running the same ASID

	  as the one being invalidated.



config KSAPI

        tristate "KSAPI support (EXPERIMENTAL)"

	depends on ARCH_MSM_KRAIT

        default n

        help

          KSAPI: Performance monitoring tool for linux.

          KSAPI records performance statistics for Snapdragon linux platform.

          It uses the /proc FS as a means to exchange configuration data and

          counter statistics. It can monitor the counter statistics for

          Scorpion processor supported hardware performance counters on a per

          thread basis or AXI counters on an overall system basis.



config PERFMAP

        tristate "Perfmap support (EXPERIMENTAL)"

	depends on ARCH_MSM_KRAIT

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ core-y += arch/arm/crypto/ 
core-y				+= $(machdirs) $(platdirs)



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

core-y				+= arch/arm/perfmon/



libs-y				:= arch/arm/lib/ $(libs-y)

arch/arm/include/asm/perftypes.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/* Copyright (c) 2010, The Linux Foundation. All rights reserved.

 *

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

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 */



/*

**  perftypes.h

**  DESCRIPTION

**  ksapi.ko function hooks header file

*/



#ifndef __PERFTYPES_H__

#define __PERFTYPES_H__



typedef void (*VPVF)(void);

typedef void (*VPULF)(unsigned long);

typedef void (*VPULULF)(unsigned long, unsigned long);



extern VPVF pp_interrupt_out_ptr;

extern VPVF pp_interrupt_in_ptr;

extern VPULF pp_process_remove_ptr;

extern void perf_mon_interrupt_in(void);

extern void perf_mon_interrupt_out(void);



#endif

arch/arm/kernel/irq.c

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/irq.h>

#include <asm/mach/time.h>

#include <asm/perftypes.h>



unsigned long irq_err_count;
@@ -67,7 +66,6 @@ void handle_IRQ(unsigned int irq, struct pt_regs *regs) 
{

	struct pt_regs *old_regs = set_irq_regs(regs);



	perf_mon_interrupt_in();

	irq_enter();



	/*
@@ -84,7 +82,6 @@ void handle_IRQ(unsigned int irq, struct pt_regs *regs) 


	irq_exit();

	set_irq_regs(old_regs);

	perf_mon_interrupt_out();

}



/*

arch/arm/perfmon/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
obj-$(CONFIG_KSAPI) += ksapi.o



# Object file lists.

obj-y						+= perf-function-hooks.o

ksapi-y						+= perf-v7.o per.o per-process-perf.o per-axi.o

ksapi-$(CONFIG_ARCH_MSM8X60)			+= perf-smp.o