Patchwork [meta-fsl-ppc] oprofile: remove useless patches

login
register
mail settings
Submitter Ting Liu
Date March 12, 2013, 9:30 a.m.
Message ID <1363080645-27771-1-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/46035/
State Accepted
Delegated to: Matthew McClintock
Headers show

Comments

Ting Liu - March 12, 2013, 9:30 a.m.
From: Ting Liu <b28495@freescale.com>

There patches is useless since bb file had been removed in commit:
commit 330e7d07a6c6881ea47038dc7c9d0a588d5218c8
Author: Matthew McClintock <msm@freescale.com>
Date:   Thu Jan 17 12:46:12 2013 -0600
oprofile: remove from meta-fsl-ppc and use oe-core

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 ...ile-0.9.6-add-e500mc-support-in-op_events.patch |   17 --
 .../oprofile/oprofile-0.9.6-e500mc-support-2.patch |   37 ---
 .../oprofile/oprofile-0.9.6-e500mc-support.patch   |  171 --------------
 .../oprofile/oprofile-no-query-modules.patch       |   29 ---
 recipes-kernel/oprofile/oprofile/opstart.patch     |  237 --------------------
 5 files changed, 0 insertions(+), 491 deletions(-)
 delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
 delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
 delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
 delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
 delete mode 100644 recipes-kernel/oprofile/oprofile/opstart.patch
Matthew McClintock - March 15, 2013, 2:37 p.m.
On Tue, Mar 12, 2013 at 4:30 AM,  <b28495@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> There patches is useless since bb file had been removed in commit:
> commit 330e7d07a6c6881ea47038dc7c9d0a588d5218c8
> Author: Matthew McClintock <msm@freescale.com>
> Date:   Thu Jan 17 12:46:12 2013 -0600
> oprofile: remove from meta-fsl-ppc and use oe-core
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

Good catch, applied.

-M

> ---
>  ...ile-0.9.6-add-e500mc-support-in-op_events.patch |   17 --
>  .../oprofile/oprofile-0.9.6-e500mc-support-2.patch |   37 ---
>  .../oprofile/oprofile-0.9.6-e500mc-support.patch   |  171 --------------
>  .../oprofile/oprofile-no-query-modules.patch       |   29 ---
>  recipes-kernel/oprofile/oprofile/opstart.patch     |  237 --------------------
>  5 files changed, 0 insertions(+), 491 deletions(-)
>  delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
>  delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
>  delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
>  delete mode 100644 recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
>  delete mode 100644 recipes-kernel/oprofile/oprofile/opstart.patch
>
> diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
> deleted file mode 100644
> index 2409a63..0000000
> --- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Upstream-Status: Pending
> -
> -Add e500mc support in libop/op_events.c
> -
> -Signed-off-by: Zhenhua Luo <b19537@freescale.com>
> -===============================================================================
> -diff -urN oprofile-0.9.6/libop/op_events.c oprofile-0.9.6-new/libop/op_events.c
> ---- oprofile-0.9.6/libop/op_events.c   2009-11-24 23:25:17.000000000 +0800
> -+++ oprofile-0.9.6-new/libop/op_events.c       2010-08-19 11:13:15.000000000 +0800
> -@@ -1062,6 +1062,7 @@
> -
> -               case CPU_PPC_E500:
> -               case CPU_PPC_E500_2:
> -+              case CPU_PPC_E500MC:
> -               case CPU_PPC_E300:
> -                       descr->name = "CPU_CLK";
> -                       break;
> diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
> deleted file mode 100644
> index 297b954..0000000
> --- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -Upstream-Status: Pending
> -
> -Add e500mc event in oprofile Makefile to add e500mc support
> -
> -Signed-off-by: Luo Zhenhua <b19537@freescale.com>
> -===============================================================================
> -diff -urN oprofile-0.9.6-old/events/Makefile.am oprofile-0.9.6/events/Makefile.am
> ---- oprofile-0.9.6-old/events/Makefile.am      2009-11-24 23:25:18.000000000 +0800
> -+++ oprofile-0.9.6/events/Makefile.am  2010-08-13 15:23:24.000000000 +0800
> -@@ -55,6 +55,7 @@
> -       mips/vr5500/events mips/vr5500/unit_masks \
> -       ppc/7450/events ppc/7450/unit_masks \
> -       ppc/e500/events ppc/e500/unit_masks \
> -+      ppc/e500mc/events ppc/e500mc/unit_masks \
> -       ppc/e500v2/events ppc/e500v2/unit_masks \
> -       ppc/e300/events ppc/e300/unit_masks
> -
> -diff -urN oprofile-0.9.6-old/events/Makefile.in oprofile-0.9.6/events/Makefile.in
> ---- oprofile-0.9.6-old/events/Makefile.in      2009-11-24 23:25:48.000000000 +0800
> -+++ oprofile-0.9.6/events/Makefile.in  2010-08-13 15:23:03.000000000 +0800
> -@@ -258,6 +258,7 @@
> -       mips/vr5500/events mips/vr5500/unit_masks \
> -       ppc/7450/events ppc/7450/unit_masks \
> -       ppc/e500/events ppc/e500/unit_masks \
> -+      ppc/e500mc/events ppc/e500mc/unit_masks \
> -       ppc/e500v2/events ppc/e500v2/unit_masks \
> -       ppc/e300/events ppc/e300/unit_masks
> -
> -@@ -312,7 +313,7 @@
> -
> -
> - distdir: $(DISTFILES)
> --      $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/arch_perfmon $(distdir)/i386/athlon $(distdir)/i386/atom $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/core_i7 $(distdir)/i386/nehalem $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)
 /ppc64/
>  970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/ibm-compat-v1 $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/ppc64/power7 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/family11h $(distdir)/x86-64/hammer
> -+      $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/arch_perfmon $(distdir)/i386/athlon $(distdir)/i386/atom $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/core_i7 $(distdir)/i386/nehalem $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500mc $(distdir)/ppc/e500v2 $(distdir
 )/ppc64
>  /970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/ibm-compat-v1 $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/ppc64/power7 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/family11h $(distdir)/x86-64/hammer
> -       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
> -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
> -       list='$(DISTFILES)'; for file in $$list; do \
> diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
> deleted file mode 100644
> index 022b5bd..0000000
> --- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
> +++ /dev/null
> @@ -1,171 +0,0 @@
> -Upstream-Status: Pending
> -
> -Add e500mc event in oprofile to add e500mc support
> -
> -Signed-off-by: George Stephen <Stephen.George@freescale.com>
> -===============================================================================
> -diff -urN oprofile-0.9.6/events/ppc/e500mc/events oprofile-0.9.6-new/events/ppc/e500mc/events
> ---- oprofile-0.9.6/events/ppc/e500mc/events    1970-01-01 08:00:00.000000000 +0800
> -+++ oprofile-0.9.6-new/events/ppc/e500mc/events        2010-08-16 17:57:49.000000000 +0800
> -@@ -0,0 +1,120 @@
> -+# e500mc Events
> -+#
> -+# Copyright (C) 2010 Freescale Semiconductor, Inc.
> -+#
> -+event:0x1 counters:0,1,2,3 um:zero minimum:100 name:CPU_CLK : Cycles
> -+event:0x2 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_INSNS : Completed Instructions (0, 1, or 2 per cycle)
> -+event:0x3 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_OPS : Completed Micro-ops (counts 2 for load/store w/update)
> -+event:0x4 counters:0,1,2,3 um:zero minimum:500 name:INSTRUCTION_FETCHES : Instruction fetches
> -+event:0x5 counters:0,1,2,3 um:zero minimum:500 name:DECODED_OPS : Micro-ops decoded
> -+event:0x8 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_BRANCHES : Branch Instructions completed
> -+event:0x9 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_LOAD_OPS : Load micro-ops completed
> -+event:0xa counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_STORE_OPS : Store micro-ops completed
> -+event:0xb counters:0,1,2,3 um:zero minimum:500 name:COMPLETION_REDIRECTS : Number of completion buffer redirects
> -+event:0xc counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_FINISHED : Branches finished
> -+event:0xd counters:0,1,2,3 um:zero minimum:500 name:TAKEN_BRANCHES_FINISHED : Taken branches finished
> -+event:0xe counters:0,1,2,3 um:zero minimum:500 name:BIFFED_BRANCHES_FINISHED : Biffed branches finished
> -+event:0xf counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED : Branch instructions mispredicted due to direction, target, or IAB prediction
> -+event:0x10 counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED_DIRECTION : Branches mispredicted due to direction prediction
> -+event:0x11 counters:0,1,2,3 um:zero minimum:500 name:BTB_HITS : Branches that hit in the BTB, or missed but are not taken
> -+event:0x12 counters:0,1,2,3 um:zero minimum:500 name:DECODE_STALLED : Cycles the instruction buffer was not empty, but 0 instructions decoded
> -+event:0x13 counters:0,1,2,3 um:zero minimum:500 name:ISSUE_STALLED : Cycles the issue buffer is not empty but 0 instructions issued
> -+event:0x14 counters:0,1,2,3 um:zero minimum:500 name:BRANCH_ISSUE_STALLED : Cycles the branch buffer is not empty but 0 instructions issued
> -+event:0x15 counters:0,1,2,3 um:zero minimum:500 name:SRS0_SCHEDULE_STALLED : Cycles SRS0 is not empty but 0 instructions scheduled
> -+event:0x16 counters:0,1,2,3 um:zero minimum:500 name:SRS1_SCHEDULE_STALLED : Cycles SRS1 is not empty but 0 instructions scheduled
> -+event:0x17 counters:0,1,2,3 um:zero minimum:500 name:VRS_SCHEDULE_STALLED : Cycles VRS is not empty but 0 instructions scheduled
> -+event:0x18 counters:0,1,2,3 um:zero minimum:500 name:LRS_SCHEDULE_STALLED : Cycles LRS is not empty but 0 instructions scheduled
> -+event:0x19 counters:0,1,2,3 um:zero minimum:500 name:BRS_SCHEDULE_STALLED : Cycles BRS is not empty but 0 instructions scheduled Load/Store, Data Cache, and dLFB Events
> -+event:0x1a counters:0,1,2,3 um:zero minimum:500 name:TOTAL_TRANSLATED : Total Ldst microops translated.
> -+event:0x1b counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED : Number of cacheable L* or EVL* microops translated. (This includes microops from load-multiple, load-update, and load-context instructions.)
> -+event:0x1c counters:0,1,2,3 um:zero minimum:500 name:STORES_TRANSLATED : Number of cacheable ST* or EVST* microops translated. (This includes microops from store-multiple, store-update, and save-context instructions.)
> -+event:0x1d counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED : Number of cacheable DCBT and DCBTST instructions translated (L1 only) (Does not count touches that are converted to nops i.e. exceptions, noncacheable, hid0[nopti] bit is set.)
> -+event:0x1e counters:0,1,2,3 um:zero minimum:500 name:CACHEOPS_TRANSLATED : Number of dcba, dcbf, dcbst, and dcbz instructions translated (e500 traps on dcbi)
> -+event:0x1f counters:0,1,2,3 um:zero minimum:500 name:CACHEINHIBITED_ACCESSES_TRANSLATED : Number of cache inhibited accesses translated
> -+event:0x20 counters:0,1,2,3 um:zero minimum:500 name:GUARDED_LOADS_TRANSLATED : Number of guarded loads translated
> -+event:0x21 counters:0,1,2,3 um:zero minimum:500 name:WRITETHROUGH_STORES_TRANSLATED : Number of write-through stores translated
> -+event:0x22 counters:0,1,2,3 um:zero minimum:500 name:MISALIGNED_ACCESSES_TRANSLATED : Number of misaligned load or store accesses translated.
> -+event:0x23 counters:0,1,2,3 um:zero minimum:500 name:TOTAL_ALLOCATED_DLFB : Total allocated to dLFB
> -+event:0x24 counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED_ALLOCATED_DLFB : Loads translated and allocated to dLFB (Applies to same class of instructions as loads translated.)
> -+event:0x25 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED_ALLOCATED_DLFB : Stores completed and allocated to dLFB (Applies to same class of instructions as stores translated.)
> -+event:0x26 counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED_ALLOCATED_DLFB : Touches translated and allocated to dLFB (Applies to same class of instructions as touches translated.)
> -+event:0x27 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED : Number of cacheable ST* or EVST* microops completed. (Applies to the same class of instructions as stores translated.)
> -+event:0x28 counters:0,1,2,3 um:zero minimum:500 name:DL1_LOCKS : Number of cache lines locked in the dL1. (Counts a lock even if an overlock condition is encountered.)
> -+event:0x29 counters:0,1,2,3 um:zero minimum:500 name:DL1_RELOADS : This is historically used to determine dcache miss rate (along with loads/stores completed). This counts dL1 reloads for any reason.
> -+event:0x2a counters:0,1,2,3 um:zero minimum:500 name:DL1_CASTOUTS : dL1 castouts. Does not count castouts due to DCBF.
> -+event:0x2b counters:0,1,2,3 um:zero minimum:500 name:DETECTED_REPLAYS : Times detected replay condition - Load miss with dLFB full.
> -+event:0x2c counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_REPLAYS : Load miss with load queue full.
> -+event:0x2d counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_REPLAYS : Load guarded miss when the load is not yet at the bottom of the completion buffer.
> -+event:0x2e counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_REPLAYS : Translate a store when the StQ is full.
> -+event:0x2f counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_REPLAYS : Address collision.
> -+event:0x30 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_REPLAYS : DMMU_MISS_REPLAYS : DMMU miss.
> -+event:0x31 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_REPLAYS : DMMU_BUSY_REPLAYS : DMMU busy.
> -+event:0x32 counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_REPLAYS : Second part of misaligned access when first part missed in cache.
> -+event:0x33 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_DLFB_FULL_CYCLES : Cycles stalled on replay condition - Load miss with dLFB full.
> -+event:0x34 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Load miss with load queue full.
> -+event:0x35 counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_CYCLES : Cycles stalled on replay condition - Load guarded miss when the load is not yet at the bottom of the completion buffer.
> -+event:0x36 counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Translate a store when the StQ is full.
> -+event:0x37 counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_CYCLES : Cycles stalled on replay condition - Address collision.
> -+event:0x38 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_CYCLES : Cycles stalled on replay condition - DMMU miss.
> -+event:0x39 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_CYCLES : Cycles stalled on replay condition - DMMU busy.
> -+event:0x3a counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_CYCLES : Cycles stalled on replay condition - Second part of misaligned access when first part missed in cache.
> -+event:0x3b counters:0,1,2,3 um:zero minimum:500 name:IL1_LOCKS : Number of cache lines locked in the iL1. (Counts a lock even if an overlock condition is encountered.)
> -+event:0x3c counters:0,1,2,3 um:zero minimum:500 name:IL1_FETCH_RELOADS : This is historically used to determine icache miss rate (along with instructions completed) Reloads due to demand fetch.
> -+event:0x3d counters:0,1,2,3 um:zero minimum:500 name:FETCHES : Counts the number of fetches that write at least one instruction to the instruction buffer. (With instruction fetched, can used to compute instructions-per-fetch)
> -+event:0x3e counters:0,1,2,3 um:zero minimum:500 name:IMMU_TLB4K_RELOADS : iMMU TLB4K reloads
> -+event:0x3f counters:0,1,2,3 um:zero minimum:500 name:IMMU_VSP_RELOADS : iMMU VSP reloads
> -+event:0x40 counters:0,1,2,3 um:zero minimum:500 name:DMMU_TLB4K_RELOADS : dMMU TLB4K reloads
> -+event:0x41 counters:0,1,2,3 um:zero minimum:500 name:DMMU_VSP_RELOADS : dMMU VSP reloads
> -+event:0x42 counters:0,1,2,3 um:zero minimum:500 name:L2MMU_MISSES : Counts iTLB/dTLB error interrupt
> -+event:0x43 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_REQUESTS : Number of master transactions. (Number of master TSs.)
> -+event:0x44 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_I_REQUESTS : Number of master I-Side transactions. (Number of master I-Side TSs.)
> -+event:0x45 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_REQUESTS : Number of master D-Side transactions. (Number of master D-Side TSs.)
> -+event:0x46 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_CASTOUT_REQUESTS : Number of master D-Side non-program-demand castout transactions. This counts replacement pushes and snoop pushes. This does not count DCBF castouts. (Number of master D-side non-program-demand castout TSs.)
> -+event:0x48 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_REQUESTS : Number of externally generated snoop requests. (Counts snoop TSs.)
> -+event:0x49 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_HITS : Number of snoop hits on all D-side resources regardless of the cache state (modified, exclusive, or shared)
> -+event:0x4a counters:0,1,2,3 um:zero minimum:500 name:SNOOP_PUSHES : Number of snoop pushes from all D-side resources. (Counts snoop ARTRY/WOPs.)
> -+event:0x52 counters:0,1,2,3 um:zero minimum:500 name:PMC0_OVERFLOW : Counts the number of times PMC0[32] transitioned from 1 to 0.
> -+event:0x53 counters:0,1,2,3 um:zero minimum:500 name:PMC1_OVERFLOW : Counts the number of times PMC1[32] transitioned from 1 to 0.
> -+event:0x54 counters:0,1,2,3 um:zero minimum:500 name:PMC2_OVERFLOW : Counts the number of times PMC2[32] transitioned from 1 to 0.
> -+event:0x55 counters:0,1,2,3 um:zero minimum:500 name:PMC3_OVERFLOW : Counts the number of times PMC3[32] transitioned from 1 to 0.
> -+event:0x56 counters:0,1,2,3 um:zero minimum:500 name:INTERRUPTS : Number of interrupts taken
> -+event:0x57 counters:0,1,2,3 um:zero minimum:500 name:EXTERNAL_INTERRUPTS : Number of external input interrupts taken
> -+event:0x58 counters:0,1,2,3 um:zero minimum:500 name:CRITICAL_INTERRUPTS : Number of critical input interrupts taken
> -+event:0x59 counters:0,1,2,3 um:zero minimum:500 name:SC_TRAP_INTERRUPTS : Number of system call and trap interrupts
> -+event:0x5b counters:0,1,2,3 um:zero minimum:500 name:L2_LINEFILL_REQ : Number L2 Linefill requests
> -+event:0x5c counters:0,1,2,3 um:zero minimum:500 name:L2_VICTIM_SELECT : Number L2 Victim selects
> -+event:0x6e counters:0,1,2,3 um:zero minimum:500 name:L2_ACCESS : Number L2 cache accesses
> -+event:0x6f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_ACCESS : Number L2 hit cache accesses
> -+event:0x70 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ACCESS : Number L2 data cache accesses
> -+event:0x71 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_ACCESS : Number L2 hit data cache accesses
> -+event:0x72 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ACCESS : Number L2 instruction cache accesses
> -+event:0x73 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_INST_ACCESS : Number L2 hit instruction cache accesses
> -+event:0x74 counters:0,1,2,3 um:zero minimum:500 name:L2_ALLOC : Number L2 cache allocations
> -+event:0x75 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ALLOC : Number L2 data cache allocations
> -+event:0x76 counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_DATA_ALLOC : Number L2 dirty data cache allocations
> -+event:0x77 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ALLOC : Number L2 instruction cache allocations
> -+event:0x78 counters:0,1,2,3 um:zero minimum:500 name:L2_UPDATE : Number L2 cache updates
> -+event:0x79 counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_UPDATE : Number L2 cache clean updates
> -+event:0x7a counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_UPDATE : Number L2 cache dirty updates
> -+event:0x7b counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_REDU_UPDATE : Number L2 cache clean redundant updates
> -+event:0x7c counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_REDU_UPDATE : Number L2 cache dirty redundant updates
> -+event:0x7d counters:0,1,2,3 um:zero minimum:500 name:L2_LOCKS : Number L2 cache locks
> -+event:0x7e counters:0,1,2,3 um:zero minimum:500 name:L2_CASTOUT : Number L2 cache castouts
> -+event:0x7f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_DIRTY : Number L2 cache data dirty hits
> -+event:0x82 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_CLEAN : Number L2 cache invalidation of clean lines
> -+event:0x83 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_INCOHER : Number L2 cache invalidation of incoherent lines
> -+event:0x84 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_COHER : Number L2 cache invalidation of coherent lines
> -+event:0x94 counters:0,1,2,3 um:zero minimum:500 name:DVT0 : Detection of write to DEVENT with DVT0 set
> -+event:0x95 counters:0,1,2,3 um:zero minimum:500 name:DVT1 : Detection of write to DEVENT with DVT1 set
> -+event:0x96 counters:0,1,2,3 um:zero minimum:500 name:DVT2 : Detection of write to DEVENT with DVT2 set
> -+event:0x97 counters:0,1,2,3 um:zero minimum:500 name:DVT3 : Detection of write to DEVENT with DVT3 set
> -+event:0x98 counters:0,1,2,3 um:zero minimum:500 name:DVT4 : Detection of write to DEVENT with DVT4 set
> -+event:0x99 counters:0,1,2,3 um:zero minimum:500 name:DVT5 : Detection of write to DEVENT with DVT5 set
> -+event:0x9a counters:0,1,2,3 um:zero minimum:500 name:DVT6 : Detection of write to DEVENT with DVT6 set
> -+event:0x9b counters:0,1,2,3 um:zero minimum:500 name:DVT7 : Detection of write to DEVENT with DVT7 set
> -+event:0x9c counters:0,1,2,3 um:zero minimum:500 name:CYCLES_NEXUS_STALLED : Number of completion cycles stalled due to Nexus FIFO full
> -+event:0xb0 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_LOAD : Number of decorated loads.
> -+event:0xb1 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_STORE : Number of decorated stores
> -+event:0xb2 counters:0,1,2,3 um:zero minimum:500 name:LOAD_RETRY : Number of load retries
> -+event:0xb3 counters:0,1,2,3 um:zero minimum:500 name:STWCX_SUCCESS : Number of successful stwcx. instructions
> -+event:0xb4 counters:0,1,2,3 um:zero minimum:500 name:STWCX_UNSUCCESS : Number of unsuccessful stwcx. instructions
> -diff -urN oprofile-0.9.6/events/ppc/e500mc/unit_masks oprofile-0.9.6-new/events/ppc/e500mc/unit_masks
> ---- oprofile-0.9.6/events/ppc/e500mc/unit_masks        1970-01-01 08:00:00.000000000 +0800
> -+++ oprofile-0.9.6-new/events/ppc/e500mc/unit_masks    2010-08-16 17:56:03.000000000 +0800
> -@@ -0,0 +1,4 @@
> -+# e500 possible unit masks
> -+#
> -+name:zero type:mandatory default:0x0
> -+      0x0 No unit mask
> -diff -urN oprofile-0.9.6/libop/op_cpu_type.c oprofile-0.9.6-new/libop/op_cpu_type.c
> ---- oprofile-0.9.6/libop/op_cpu_type.c 2009-11-24 23:25:17.000000000 +0800
> -+++ oprofile-0.9.6-new/libop/op_cpu_type.c     2010-08-16 17:56:03.000000000 +0800
> -@@ -82,6 +82,7 @@
> -       { "ppc64 compat version 1", "ppc64/ibm-compat-v1", CPU_PPC64_IBM_COMPAT_V1, 4 },
> -       { "Intel Core/i7", "i386/core_i7", CPU_CORE_I7, 4 },
> -       { "Intel Atom", "i386/atom", CPU_ATOM, 2 },
> -+      { "e500mc", "ppc/e500mc", CPU_PPC_E500MC, 4 },
> - };
> -
> - static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
> -diff -urN oprofile-0.9.6/libop/op_cpu_type.h oprofile-0.9.6-new/libop/op_cpu_type.h
> ---- oprofile-0.9.6/libop/op_cpu_type.h 2009-11-24 23:25:17.000000000 +0800
> -+++ oprofile-0.9.6-new/libop/op_cpu_type.h     2010-08-16 17:56:03.000000000 +0800
> -@@ -79,6 +79,7 @@
> -       CPU_PPC64_IBM_COMPAT_V1, /**< IBM PPC64 processor compat mode version 1 */
> -       CPU_CORE_I7, /* Intel Core i7, Nehalem */
> -       CPU_ATOM, /* First generation Intel Atom */
> -+      CPU_PPC_E500MC, /**< e500mc */
> -       MAX_CPU_TYPE
> - } op_cpu;
> -
> -diff -urN oprofile-0.9.6/utils/ophelp.c oprofile-0.9.6-new/utils/ophelp.c
> ---- oprofile-0.9.6/utils/ophelp.c      2009-11-24 23:25:17.000000000 +0800
> -+++ oprofile-0.9.6-new/utils/ophelp.c  2010-08-16 17:56:03.000000000 +0800
> -@@ -619,6 +619,7 @@
> -
> -       case CPU_PPC_E500:
> -       case CPU_PPC_E500_2:
> -+      case CPU_PPC_E500MC:
> -               event_doc =
> -                       "See PowerPC e500 Core Complex Reference Manual\n"
> -                       "Chapter 7: Performance Monitor\n"
> diff --git a/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch b/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
> deleted file mode 100644
> index c9d7cd6..0000000
> --- a/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -disable portions which use query_module on 2.6 kernel this is not available
> -in OE we dont support 2.4 anyway
> -
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Index: oprofile-0.9.6/daemon/liblegacy/opd_kernel.c
> -===================================================================
> ---- oprofile-0.9.6.orig/daemon/liblegacy/opd_kernel.c  2009-11-24 07:25:17.000000000 -0800
> -+++ oprofile-0.9.6/daemon/liblegacy/opd_kernel.c       2011-07-18 10:08:39.863798825 -0700
> -@@ -270,6 +270,9 @@
> -  */
> - static void opd_drop_module_sample(unsigned long eip)
> - {
> -+      verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
> -+
> -+#if   0
> -       char * module_names;
> -       char * name;
> -       size_t size = 1024;
> -@@ -307,6 +310,7 @@
> -
> -       if (module_names)
> -               free(module_names);
> -+#endif
> - }
> -
> -
> diff --git a/recipes-kernel/oprofile/oprofile/opstart.patch b/recipes-kernel/oprofile/oprofile/opstart.patch
> deleted file mode 100644
> index c588deb..0000000
> --- a/recipes-kernel/oprofile/oprofile/opstart.patch
> +++ /dev/null
> @@ -1,237 +0,0 @@
> -Upstream-Status: Pending
> -
> -Index: oprofile/utils/Makefile.am
> -===================================================================
> ---- oprofile.orig/utils/Makefile.am    2005-03-31 18:20:41.000000000 +0100
> -+++ oprofile/utils/Makefile.am 2008-07-02 15:14:07.000000000 +0100
> -@@ -3,8 +3,15 @@
> -
> - LIBS=@POPT_LIBS@ @LIBERTY_LIBS@
> -
> --bin_PROGRAMS = ophelp
> -+bin_PROGRAMS = ophelp opstart
> - dist_bin_SCRIPTS = opcontrol
> -
> - ophelp_SOURCES = ophelp.c
> - ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
> -+
> -+opstart_SOURCES = opstart.c
> -+
> -+install-exec-local:
> -+      cd $(DESTDIR)/$(bindir) && \
> -+              rm -f opstop && \
> -+              $(LN_S) opstart opstop
> -Index: oprofile/utils/opstart.c
> -===================================================================
> ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
> -+++ oprofile/utils/opstart.c   2008-07-02 15:14:07.000000000 +0100
> -@@ -0,0 +1,110 @@
> -+/**
> -+ * @file opstart.c
> -+ * Start/Stop oprofile
> -+ *
> -+ * @remark Copyright 2007 Openedhand Ltd.
> -+ * @remark Read the file COPYING
> -+ *
> -+ * @author Richard Purdie
> -+ */
> -+
> -+#include <signal.h>
> -+#include <stdio.h>
> -+#include <stdlib.h>
> -+#include <string.h>
> -+#include <unistd.h>
> -+#include <sys/types.h>
> -+#include <sys/stat.h>
> -+
> -+int main(const int argc, const char* argv[])
> -+{
> -+      const char *enable = "/dev/oprofile/enable";
> -+      const char *lockfile;
> -+      unsigned long dpid;
> -+      struct stat sbuf;
> -+      FILE *lfile, *efile;
> -+      int sig, enb, err;
> -+
> -+      if (argc >= 2) {
> -+              printf("Error: Invalid options.\n");
> -+              return 1;
> -+      }
> -+
> -+      lockfile = getenv("LOCK_FILE");
> -+      if (!lockfile)
> -+              lockfile = "/var/lib/oprofile/lock";
> -+
> -+      /* Add SESSION_DIR support? */
> -+
> -+      if (geteuid()) {
> -+              printf("Error: This program must be run as root.\n");
> -+              return 1;
> -+      }
> -+
> -+      if (stat(enable, &sbuf)) {
> -+              printf("Error: Could not find /dev/oprofile/enable, the"
> -+                     " kernel module probably isn't loaded.\n");
> -+              printf("This binary only works with 2.6 kernels and oprofile"
> -+                     " must have been initialised with 'opcontrol --start-daemon'.\n");
> -+              return 1;
> -+      }
> -+
> -+      if (stat(lockfile, &sbuf)) {
> -+              printf("Error: Could not find lockfile %s.\n", lockfile);
> -+              printf("The oprofile daemon must be running (oprofile must"
> -+                     " have been initialised with 'opcontrol --start-daemon').\n");
> -+              return 1;
> -+      }
> -+
> -+      lfile = fopen(lockfile, "r");
> -+      if (!lfile) {
> -+              printf("Error opening lockfile %s.\n", lockfile);
> -+              return 1;
> -+      }
> -+
> -+      err = fscanf(lfile, "%lud", (unsigned long *) &dpid);
> -+      if (err != 1) {
> -+              printf("Error reading pid from lockfile %s.\n", lockfile);
> -+              return 1;
> -+      }
> -+      fclose(lfile);
> -+
> -+      efile = fopen(enable, "r");
> -+      if (!efile) {
> -+              printf("Error opening %s.\n", enable);
> -+              return 1;
> -+      }
> -+
> -+      if (strstr(argv[0], "opstart")) {
> -+              printf("Starting Profiler\n");
> -+              sig = SIGUSR1;
> -+              enb = 1;
> -+      } else if (strstr(argv[0], "opstop")) {
> -+              printf("Stopping Oprofile.\n");
> -+              printf("You need to run 'opcontrol --dump' when the session"
> -+                     " is finished.\n");
> -+              sig = SIGUSR2;
> -+              enb = 0;
> -+      } else {
> -+              printf("Error: Please call as 'opstart' or 'opstop'\n");
> -+              return 1;
> -+      }
> -+
> -+      err = kill(dpid, 0);
> -+      if (err) {
> -+              printf("Error sending signal to oprofiled. Stale lockfile"
> -+                     " (%s) ?\n", lockfile);
> -+              return 1;
> -+      }
> -+
> -+      fprintf(efile, "%d\n", enb);
> -+      err = kill(dpid, sig);
> -+      if (err) {
> -+              printf("Error sending signal to oprofiled. Stale lockfile"
> -+                     " (%s) ?\n", lockfile);
> -+              return 1;
> -+      }
> -+
> -+      return 0;
> -+}
> -+
> -Index: oprofile/configure.in
> -===================================================================
> ---- oprofile.orig/configure.in 2008-07-02 15:13:58.000000000 +0100
> -+++ oprofile/configure.in      2008-07-02 15:17:37.000000000 +0100
> -@@ -16,6 +16,7 @@
> - AM_CONFIG_HEADER(config.h)
> -
> - AC_PROG_RANLIB
> -+AC_PROG_LN_S
> - AC_PROG_LIBTOOL
> -
> - dnl for the man page
> -@@ -241,6 +242,8 @@
> -       doc/xsl/catalog-1.xml \
> -       doc/oprofile.1 \
> -       doc/opcontrol.1 \
> -+      doc/opstart.1 \
> -+      doc/opstop.1 \
> -       doc/ophelp.1 \
> -       doc/opreport.1 \
> -       doc/opannotate.1 \
> -Index: oprofile/doc/Makefile.am
> -===================================================================
> ---- oprofile.orig/doc/Makefile.am      2008-07-02 15:13:59.000000000 +0100
> -+++ oprofile/doc/Makefile.am   2008-07-02 15:14:07.000000000 +0100
> -@@ -11,6 +11,8 @@
> - man_MANS = \
> -       oprofile.1 \
> -       opcontrol.1 \
> -+      opstart.1 \
> -+      opstop.1 \
> -       opreport.1 \
> -       opannotate.1 \
> -       opgprof.1 \
> -Index: oprofile/doc/opstart.1.in
> -===================================================================
> ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
> -+++ oprofile/doc/opstart.1.in  2008-07-02 15:14:07.000000000 +0100
> -@@ -0,0 +1,27 @@
> -+.TH OPSTART 1 "@DATE@" "oprofile @VERSION@"
> -+.UC 4
> -+.SH NAME
> -+opstart \- start OProfile profiling
> -+.SH SYNOPSIS
> -+.br
> -+.B opstart
> -+.SH DESCRIPTION
> -+.B opstart
> -+is a simple optimised command to start profiling with 2.6 Linux kernels.
> -+OProfile should have already been initialised by calling "opcontrol --start-daemon".
> -+
> -+.SH ENVIRONMENT
> -+No special environment variables are recognised by opstart.
> -+
> -+.SH FILES
> -+.TP
> -+.I /var/lib/oprofile/samples/
> -+The location of the generated sample files.
> -+
> -+.SH VERSION
> -+.TP
> -+This man page is current for @PACKAGE@-@VERSION@.
> -+
> -+.SH SEE ALSO
> -+.BR @OP_DOCDIR@,
> -+.BR oprofile(1)
> -Index: oprofile/doc/opstop.1.in
> -===================================================================
> ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
> -+++ oprofile/doc/opstop.1.in   2008-07-02 15:14:07.000000000 +0100
> -@@ -0,0 +1,28 @@
> -+.TH OPSTOP 1 "@DATE@" "oprofile @VERSION@"
> -+.UC 4
> -+.SH NAME
> -+opstop \- stop OProfile profiling
> -+.SH SYNOPSIS
> -+.br
> -+.B opstop
> -+.SH DESCRIPTION
> -+.B opstop
> -+is a simple optimsed command to stop profiling with 2.6 Linux kernels.
> -+You need to run "opcontrol --dump" before being able to view a profile
> -+with opreport.
> -+
> -+.SH ENVIRONMENT
> -+No special environment variables are recognised by opstop.
> -+
> -+.SH FILES
> -+.TP
> -+.I /var/lib/oprofile/samples/
> -+The location of the generated sample files.
> -+
> -+.SH VERSION
> -+.TP
> -+This man page is current for @PACKAGE@-@VERSION@.
> -+
> -+.SH SEE ALSO
> -+.BR @OP_DOCDIR@,
> -+.BR oprofile(1)
> --
> 1.7.3.4
>
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Patch

diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
deleted file mode 100644
index 2409a63..0000000
--- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-add-e500mc-support-in-op_events.patch
+++ /dev/null
@@ -1,17 +0,0 @@ 
-Upstream-Status: Pending
-
-Add e500mc support in libop/op_events.c
-
-Signed-off-by: Zhenhua Luo <b19537@freescale.com>
-===============================================================================
-diff -urN oprofile-0.9.6/libop/op_events.c oprofile-0.9.6-new/libop/op_events.c
---- oprofile-0.9.6/libop/op_events.c	2009-11-24 23:25:17.000000000 +0800
-+++ oprofile-0.9.6-new/libop/op_events.c	2010-08-19 11:13:15.000000000 +0800
-@@ -1062,6 +1062,7 @@
- 
- 		case CPU_PPC_E500:
- 		case CPU_PPC_E500_2:
-+		case CPU_PPC_E500MC:
- 		case CPU_PPC_E300:
- 			descr->name = "CPU_CLK";
- 			break;
diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
deleted file mode 100644
index 297b954..0000000
--- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-Upstream-Status: Pending
-
-Add e500mc event in oprofile Makefile to add e500mc support
-
-Signed-off-by: Luo Zhenhua <b19537@freescale.com>
-===============================================================================
-diff -urN oprofile-0.9.6-old/events/Makefile.am oprofile-0.9.6/events/Makefile.am
---- oprofile-0.9.6-old/events/Makefile.am	2009-11-24 23:25:18.000000000 +0800
-+++ oprofile-0.9.6/events/Makefile.am	2010-08-13 15:23:24.000000000 +0800
-@@ -55,6 +55,7 @@
- 	mips/vr5500/events mips/vr5500/unit_masks \
- 	ppc/7450/events ppc/7450/unit_masks \
- 	ppc/e500/events ppc/e500/unit_masks \
-+	ppc/e500mc/events ppc/e500mc/unit_masks \
- 	ppc/e500v2/events ppc/e500v2/unit_masks \
- 	ppc/e300/events ppc/e300/unit_masks
- 
-diff -urN oprofile-0.9.6-old/events/Makefile.in oprofile-0.9.6/events/Makefile.in
---- oprofile-0.9.6-old/events/Makefile.in	2009-11-24 23:25:48.000000000 +0800
-+++ oprofile-0.9.6/events/Makefile.in	2010-08-13 15:23:03.000000000 +0800
-@@ -258,6 +258,7 @@
- 	mips/vr5500/events mips/vr5500/unit_masks \
- 	ppc/7450/events ppc/7450/unit_masks \
- 	ppc/e500/events ppc/e500/unit_masks \
-+	ppc/e500mc/events ppc/e500mc/unit_masks \
- 	ppc/e500v2/events ppc/e500v2/unit_masks \
- 	ppc/e300/events ppc/e300/unit_masks
- 
-@@ -312,7 +313,7 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/arch_perfmon $(distdir)/i386/athlon $(distdir)/i386/atom $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/core_i7 $(distdir)/i386/nehalem $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/
 970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/ibm-compat-v1 $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/ppc64/power7 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/family11h $(distdir)/x86-64/hammer
-+	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/arch_perfmon $(distdir)/i386/athlon $(distdir)/i386/atom $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/core_i7 $(distdir)/i386/nehalem $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500mc $(distdir)/ppc/e500v2 $(distdir)/ppc64
 /970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/ibm-compat-v1 $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/ppc64/power7 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/family11h $(distdir)/x86-64/hammer
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch b/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
deleted file mode 100644
index 022b5bd..0000000
--- a/recipes-kernel/oprofile/oprofile/oprofile-0.9.6-e500mc-support.patch
+++ /dev/null
@@ -1,171 +0,0 @@ 
-Upstream-Status: Pending
-
-Add e500mc event in oprofile to add e500mc support
-
-Signed-off-by: George Stephen <Stephen.George@freescale.com>
-===============================================================================
-diff -urN oprofile-0.9.6/events/ppc/e500mc/events oprofile-0.9.6-new/events/ppc/e500mc/events
---- oprofile-0.9.6/events/ppc/e500mc/events	1970-01-01 08:00:00.000000000 +0800
-+++ oprofile-0.9.6-new/events/ppc/e500mc/events	2010-08-16 17:57:49.000000000 +0800
-@@ -0,0 +1,120 @@
-+# e500mc Events
-+# 
-+# Copyright (C) 2010 Freescale Semiconductor, Inc.
-+#
-+event:0x1 counters:0,1,2,3 um:zero minimum:100 name:CPU_CLK : Cycles
-+event:0x2 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_INSNS : Completed Instructions (0, 1, or 2 per cycle)
-+event:0x3 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_OPS : Completed Micro-ops (counts 2 for load/store w/update)
-+event:0x4 counters:0,1,2,3 um:zero minimum:500 name:INSTRUCTION_FETCHES : Instruction fetches
-+event:0x5 counters:0,1,2,3 um:zero minimum:500 name:DECODED_OPS : Micro-ops decoded
-+event:0x8 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_BRANCHES : Branch Instructions completed
-+event:0x9 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_LOAD_OPS : Load micro-ops completed
-+event:0xa counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_STORE_OPS : Store micro-ops completed
-+event:0xb counters:0,1,2,3 um:zero minimum:500 name:COMPLETION_REDIRECTS : Number of completion buffer redirects
-+event:0xc counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_FINISHED : Branches finished
-+event:0xd counters:0,1,2,3 um:zero minimum:500 name:TAKEN_BRANCHES_FINISHED : Taken branches finished
-+event:0xe counters:0,1,2,3 um:zero minimum:500 name:BIFFED_BRANCHES_FINISHED : Biffed branches finished
-+event:0xf counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED : Branch instructions mispredicted due to direction, target, or IAB prediction
-+event:0x10 counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED_DIRECTION : Branches mispredicted due to direction prediction
-+event:0x11 counters:0,1,2,3 um:zero minimum:500 name:BTB_HITS : Branches that hit in the BTB, or missed but are not taken
-+event:0x12 counters:0,1,2,3 um:zero minimum:500 name:DECODE_STALLED : Cycles the instruction buffer was not empty, but 0 instructions decoded
-+event:0x13 counters:0,1,2,3 um:zero minimum:500 name:ISSUE_STALLED : Cycles the issue buffer is not empty but 0 instructions issued 
-+event:0x14 counters:0,1,2,3 um:zero minimum:500 name:BRANCH_ISSUE_STALLED : Cycles the branch buffer is not empty but 0 instructions issued 
-+event:0x15 counters:0,1,2,3 um:zero minimum:500 name:SRS0_SCHEDULE_STALLED : Cycles SRS0 is not empty but 0 instructions scheduled 
-+event:0x16 counters:0,1,2,3 um:zero minimum:500 name:SRS1_SCHEDULE_STALLED : Cycles SRS1 is not empty but 0 instructions scheduled 
-+event:0x17 counters:0,1,2,3 um:zero minimum:500 name:VRS_SCHEDULE_STALLED : Cycles VRS is not empty but 0 instructions scheduled 
-+event:0x18 counters:0,1,2,3 um:zero minimum:500 name:LRS_SCHEDULE_STALLED : Cycles LRS is not empty but 0 instructions scheduled 
-+event:0x19 counters:0,1,2,3 um:zero minimum:500 name:BRS_SCHEDULE_STALLED : Cycles BRS is not empty but 0 instructions scheduled Load/Store, Data Cache, and dLFB Events 
-+event:0x1a counters:0,1,2,3 um:zero minimum:500 name:TOTAL_TRANSLATED : Total Ldst microops translated. 
-+event:0x1b counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED : Number of cacheable L* or EVL* microops translated. (This includes microops from load-multiple, load-update, and load-context instructions.) 
-+event:0x1c counters:0,1,2,3 um:zero minimum:500 name:STORES_TRANSLATED : Number of cacheable ST* or EVST* microops translated. (This includes microops from store-multiple, store-update, and save-context instructions.) 
-+event:0x1d counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED : Number of cacheable DCBT and DCBTST instructions translated (L1 only) (Does not count touches that are converted to nops i.e. exceptions, noncacheable, hid0[nopti] bit is set.) 
-+event:0x1e counters:0,1,2,3 um:zero minimum:500 name:CACHEOPS_TRANSLATED : Number of dcba, dcbf, dcbst, and dcbz instructions translated (e500 traps on dcbi) 
-+event:0x1f counters:0,1,2,3 um:zero minimum:500 name:CACHEINHIBITED_ACCESSES_TRANSLATED : Number of cache inhibited accesses translated 
-+event:0x20 counters:0,1,2,3 um:zero minimum:500 name:GUARDED_LOADS_TRANSLATED : Number of guarded loads translated 
-+event:0x21 counters:0,1,2,3 um:zero minimum:500 name:WRITETHROUGH_STORES_TRANSLATED : Number of write-through stores translated 
-+event:0x22 counters:0,1,2,3 um:zero minimum:500 name:MISALIGNED_ACCESSES_TRANSLATED : Number of misaligned load or store accesses translated. 
-+event:0x23 counters:0,1,2,3 um:zero minimum:500 name:TOTAL_ALLOCATED_DLFB : Total allocated to dLFB
-+event:0x24 counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED_ALLOCATED_DLFB : Loads translated and allocated to dLFB (Applies to same class of instructions as loads translated.) 
-+event:0x25 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED_ALLOCATED_DLFB : Stores completed and allocated to dLFB (Applies to same class of instructions as stores translated.) 
-+event:0x26 counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED_ALLOCATED_DLFB : Touches translated and allocated to dLFB (Applies to same class of instructions as touches translated.) 
-+event:0x27 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED : Number of cacheable ST* or EVST* microops completed. (Applies to the same class of instructions as stores translated.) 
-+event:0x28 counters:0,1,2,3 um:zero minimum:500 name:DL1_LOCKS : Number of cache lines locked in the dL1. (Counts a lock even if an overlock condition is encountered.) 
-+event:0x29 counters:0,1,2,3 um:zero minimum:500 name:DL1_RELOADS : This is historically used to determine dcache miss rate (along with loads/stores completed). This counts dL1 reloads for any reason. 
-+event:0x2a counters:0,1,2,3 um:zero minimum:500 name:DL1_CASTOUTS : dL1 castouts. Does not count castouts due to DCBF. 
-+event:0x2b counters:0,1,2,3 um:zero minimum:500 name:DETECTED_REPLAYS : Times detected replay condition - Load miss with dLFB full. 
-+event:0x2c counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_REPLAYS : Load miss with load queue full. 
-+event:0x2d counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_REPLAYS : Load guarded miss when the load is not yet at the bottom of the completion buffer.
-+event:0x2e counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_REPLAYS : Translate a store when the StQ is full.
-+event:0x2f counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_REPLAYS : Address collision.
-+event:0x30 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_REPLAYS : DMMU_MISS_REPLAYS : DMMU miss.
-+event:0x31 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_REPLAYS : DMMU_BUSY_REPLAYS : DMMU busy.
-+event:0x32 counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_REPLAYS : Second part of misaligned access when first part missed in cache.
-+event:0x33 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_DLFB_FULL_CYCLES : Cycles stalled on replay condition - Load miss with dLFB full.
-+event:0x34 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Load miss with load queue full.
-+event:0x35 counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_CYCLES : Cycles stalled on replay condition - Load guarded miss when the load is not yet at the bottom of the completion buffer.
-+event:0x36 counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Translate a store when the StQ is full.
-+event:0x37 counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_CYCLES : Cycles stalled on replay condition - Address collision.
-+event:0x38 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_CYCLES : Cycles stalled on replay condition - DMMU miss.
-+event:0x39 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_CYCLES : Cycles stalled on replay condition - DMMU busy.
-+event:0x3a counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_CYCLES : Cycles stalled on replay condition - Second part of misaligned access when first part missed in cache.
-+event:0x3b counters:0,1,2,3 um:zero minimum:500 name:IL1_LOCKS : Number of cache lines locked in the iL1. (Counts a lock even if an overlock condition is encountered.) 
-+event:0x3c counters:0,1,2,3 um:zero minimum:500 name:IL1_FETCH_RELOADS : This is historically used to determine icache miss rate (along with instructions completed) Reloads due to demand fetch. 
-+event:0x3d counters:0,1,2,3 um:zero minimum:500 name:FETCHES : Counts the number of fetches that write at least one instruction to the instruction buffer. (With instruction fetched, can used to compute instructions-per-fetch) 
-+event:0x3e counters:0,1,2,3 um:zero minimum:500 name:IMMU_TLB4K_RELOADS : iMMU TLB4K reloads
-+event:0x3f counters:0,1,2,3 um:zero minimum:500 name:IMMU_VSP_RELOADS : iMMU VSP reloads
-+event:0x40 counters:0,1,2,3 um:zero minimum:500 name:DMMU_TLB4K_RELOADS : dMMU TLB4K reloads
-+event:0x41 counters:0,1,2,3 um:zero minimum:500 name:DMMU_VSP_RELOADS : dMMU VSP reloads
-+event:0x42 counters:0,1,2,3 um:zero minimum:500 name:L2MMU_MISSES : Counts iTLB/dTLB error interrupt 
-+event:0x43 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_REQUESTS : Number of master transactions. (Number of master TSs.) 
-+event:0x44 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_I_REQUESTS : Number of master I-Side transactions. (Number of master I-Side TSs.) 
-+event:0x45 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_REQUESTS : Number of master D-Side transactions. (Number of master D-Side TSs.) 
-+event:0x46 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_CASTOUT_REQUESTS : Number of master D-Side non-program-demand castout transactions. This counts replacement pushes and snoop pushes. This does not count DCBF castouts. (Number of master D-side non-program-demand castout TSs.) 
-+event:0x48 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_REQUESTS : Number of externally generated snoop requests. (Counts snoop TSs.) 
-+event:0x49 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_HITS : Number of snoop hits on all D-side resources regardless of the cache state (modified, exclusive, or shared) 
-+event:0x4a counters:0,1,2,3 um:zero minimum:500 name:SNOOP_PUSHES : Number of snoop pushes from all D-side resources. (Counts snoop ARTRY/WOPs.) 
-+event:0x52 counters:0,1,2,3 um:zero minimum:500 name:PMC0_OVERFLOW : Counts the number of times PMC0[32] transitioned from 1 to 0. 
-+event:0x53 counters:0,1,2,3 um:zero minimum:500 name:PMC1_OVERFLOW : Counts the number of times PMC1[32] transitioned from 1 to 0. 
-+event:0x54 counters:0,1,2,3 um:zero minimum:500 name:PMC2_OVERFLOW : Counts the number of times PMC2[32] transitioned from 1 to 0. 
-+event:0x55 counters:0,1,2,3 um:zero minimum:500 name:PMC3_OVERFLOW : Counts the number of times PMC3[32] transitioned from 1 to 0.
-+event:0x56 counters:0,1,2,3 um:zero minimum:500 name:INTERRUPTS : Number of interrupts taken
-+event:0x57 counters:0,1,2,3 um:zero minimum:500 name:EXTERNAL_INTERRUPTS : Number of external input interrupts taken
-+event:0x58 counters:0,1,2,3 um:zero minimum:500 name:CRITICAL_INTERRUPTS : Number of critical input interrupts taken
-+event:0x59 counters:0,1,2,3 um:zero minimum:500 name:SC_TRAP_INTERRUPTS : Number of system call and trap interrupts
-+event:0x5b counters:0,1,2,3 um:zero minimum:500 name:L2_LINEFILL_REQ : Number L2 Linefill requests
-+event:0x5c counters:0,1,2,3 um:zero minimum:500 name:L2_VICTIM_SELECT : Number L2 Victim selects
-+event:0x6e counters:0,1,2,3 um:zero minimum:500 name:L2_ACCESS : Number L2 cache accesses
-+event:0x6f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_ACCESS : Number L2 hit cache accesses
-+event:0x70 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ACCESS : Number L2 data cache accesses
-+event:0x71 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_ACCESS : Number L2 hit data cache accesses
-+event:0x72 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ACCESS : Number L2 instruction cache accesses
-+event:0x73 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_INST_ACCESS : Number L2 hit instruction cache accesses
-+event:0x74 counters:0,1,2,3 um:zero minimum:500 name:L2_ALLOC : Number L2 cache allocations
-+event:0x75 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ALLOC : Number L2 data cache allocations
-+event:0x76 counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_DATA_ALLOC : Number L2 dirty data cache allocations
-+event:0x77 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ALLOC : Number L2 instruction cache allocations
-+event:0x78 counters:0,1,2,3 um:zero minimum:500 name:L2_UPDATE : Number L2 cache updates
-+event:0x79 counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_UPDATE : Number L2 cache clean updates
-+event:0x7a counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_UPDATE : Number L2 cache dirty updates
-+event:0x7b counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_REDU_UPDATE : Number L2 cache clean redundant updates
-+event:0x7c counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_REDU_UPDATE : Number L2 cache dirty redundant updates
-+event:0x7d counters:0,1,2,3 um:zero minimum:500 name:L2_LOCKS : Number L2 cache locks
-+event:0x7e counters:0,1,2,3 um:zero minimum:500 name:L2_CASTOUT : Number L2 cache castouts
-+event:0x7f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_DIRTY : Number L2 cache data dirty hits
-+event:0x82 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_CLEAN : Number L2 cache invalidation of clean lines
-+event:0x83 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_INCOHER : Number L2 cache invalidation of incoherent lines
-+event:0x84 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_COHER : Number L2 cache invalidation of coherent lines
-+event:0x94 counters:0,1,2,3 um:zero minimum:500 name:DVT0 : Detection of write to DEVENT with DVT0 set
-+event:0x95 counters:0,1,2,3 um:zero minimum:500 name:DVT1 : Detection of write to DEVENT with DVT1 set
-+event:0x96 counters:0,1,2,3 um:zero minimum:500 name:DVT2 : Detection of write to DEVENT with DVT2 set
-+event:0x97 counters:0,1,2,3 um:zero minimum:500 name:DVT3 : Detection of write to DEVENT with DVT3 set
-+event:0x98 counters:0,1,2,3 um:zero minimum:500 name:DVT4 : Detection of write to DEVENT with DVT4 set
-+event:0x99 counters:0,1,2,3 um:zero minimum:500 name:DVT5 : Detection of write to DEVENT with DVT5 set
-+event:0x9a counters:0,1,2,3 um:zero minimum:500 name:DVT6 : Detection of write to DEVENT with DVT6 set
-+event:0x9b counters:0,1,2,3 um:zero minimum:500 name:DVT7 : Detection of write to DEVENT with DVT7 set
-+event:0x9c counters:0,1,2,3 um:zero minimum:500 name:CYCLES_NEXUS_STALLED : Number of completion cycles stalled due to Nexus FIFO full
-+event:0xb0 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_LOAD : Number of decorated loads.
-+event:0xb1 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_STORE : Number of decorated stores
-+event:0xb2 counters:0,1,2,3 um:zero minimum:500 name:LOAD_RETRY : Number of load retries
-+event:0xb3 counters:0,1,2,3 um:zero minimum:500 name:STWCX_SUCCESS : Number of successful stwcx. instructions
-+event:0xb4 counters:0,1,2,3 um:zero minimum:500 name:STWCX_UNSUCCESS : Number of unsuccessful stwcx. instructions
-diff -urN oprofile-0.9.6/events/ppc/e500mc/unit_masks oprofile-0.9.6-new/events/ppc/e500mc/unit_masks
---- oprofile-0.9.6/events/ppc/e500mc/unit_masks	1970-01-01 08:00:00.000000000 +0800
-+++ oprofile-0.9.6-new/events/ppc/e500mc/unit_masks	2010-08-16 17:56:03.000000000 +0800
-@@ -0,0 +1,4 @@
-+# e500 possible unit masks
-+#
-+name:zero type:mandatory default:0x0
-+	0x0 No unit mask
-diff -urN oprofile-0.9.6/libop/op_cpu_type.c oprofile-0.9.6-new/libop/op_cpu_type.c
---- oprofile-0.9.6/libop/op_cpu_type.c	2009-11-24 23:25:17.000000000 +0800
-+++ oprofile-0.9.6-new/libop/op_cpu_type.c	2010-08-16 17:56:03.000000000 +0800
-@@ -82,6 +82,7 @@
- 	{ "ppc64 compat version 1", "ppc64/ibm-compat-v1", CPU_PPC64_IBM_COMPAT_V1, 4 },
-    	{ "Intel Core/i7", "i386/core_i7", CPU_CORE_I7, 4 },
-    	{ "Intel Atom", "i386/atom", CPU_ATOM, 2 },
-+	{ "e500mc", "ppc/e500mc", CPU_PPC_E500MC, 4 },
- };
-  
- static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
-diff -urN oprofile-0.9.6/libop/op_cpu_type.h oprofile-0.9.6-new/libop/op_cpu_type.h
---- oprofile-0.9.6/libop/op_cpu_type.h	2009-11-24 23:25:17.000000000 +0800
-+++ oprofile-0.9.6-new/libop/op_cpu_type.h	2010-08-16 17:56:03.000000000 +0800
-@@ -79,6 +79,7 @@
- 	CPU_PPC64_IBM_COMPAT_V1, /**< IBM PPC64 processor compat mode version 1 */
-    	CPU_CORE_I7, /* Intel Core i7, Nehalem */
-    	CPU_ATOM, /* First generation Intel Atom */
-+	CPU_PPC_E500MC,	/**< e500mc */
- 	MAX_CPU_TYPE
- } op_cpu;
- 
-diff -urN oprofile-0.9.6/utils/ophelp.c oprofile-0.9.6-new/utils/ophelp.c
---- oprofile-0.9.6/utils/ophelp.c	2009-11-24 23:25:17.000000000 +0800
-+++ oprofile-0.9.6-new/utils/ophelp.c	2010-08-16 17:56:03.000000000 +0800
-@@ -619,6 +619,7 @@
- 
- 	case CPU_PPC_E500:
- 	case CPU_PPC_E500_2:
-+	case CPU_PPC_E500MC:
- 		event_doc =
- 			"See PowerPC e500 Core Complex Reference Manual\n"
- 			"Chapter 7: Performance Monitor\n"
diff --git a/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch b/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
deleted file mode 100644
index c9d7cd6..0000000
--- a/recipes-kernel/oprofile/oprofile/oprofile-no-query-modules.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-disable portions which use query_module on 2.6 kernel this is not available
-in OE we dont support 2.4 anyway
-
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: oprofile-0.9.6/daemon/liblegacy/opd_kernel.c
-===================================================================
---- oprofile-0.9.6.orig/daemon/liblegacy/opd_kernel.c	2009-11-24 07:25:17.000000000 -0800
-+++ oprofile-0.9.6/daemon/liblegacy/opd_kernel.c	2011-07-18 10:08:39.863798825 -0700
-@@ -270,6 +270,9 @@
-  */
- static void opd_drop_module_sample(unsigned long eip)
- {
-+	verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
-+
-+#if	0
- 	char * module_names;
- 	char * name;
- 	size_t size = 1024;
-@@ -307,6 +310,7 @@
- 
- 	if (module_names)
- 		free(module_names);
-+#endif
- }
- 
- 
diff --git a/recipes-kernel/oprofile/oprofile/opstart.patch b/recipes-kernel/oprofile/oprofile/opstart.patch
deleted file mode 100644
index c588deb..0000000
--- a/recipes-kernel/oprofile/oprofile/opstart.patch
+++ /dev/null
@@ -1,237 +0,0 @@ 
-Upstream-Status: Pending
-
-Index: oprofile/utils/Makefile.am
-===================================================================
---- oprofile.orig/utils/Makefile.am	2005-03-31 18:20:41.000000000 +0100
-+++ oprofile/utils/Makefile.am	2008-07-02 15:14:07.000000000 +0100
-@@ -3,8 +3,15 @@
- 
- LIBS=@POPT_LIBS@ @LIBERTY_LIBS@
- 
--bin_PROGRAMS = ophelp
-+bin_PROGRAMS = ophelp opstart
- dist_bin_SCRIPTS = opcontrol
- 
- ophelp_SOURCES = ophelp.c
- ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
-+
-+opstart_SOURCES = opstart.c
-+
-+install-exec-local:
-+	cd $(DESTDIR)/$(bindir) && \
-+		rm -f opstop && \
-+		$(LN_S) opstart opstop
-Index: oprofile/utils/opstart.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ oprofile/utils/opstart.c	2008-07-02 15:14:07.000000000 +0100
-@@ -0,0 +1,110 @@
-+/**
-+ * @file opstart.c
-+ * Start/Stop oprofile
-+ *
-+ * @remark Copyright 2007 Openedhand Ltd.
-+ * @remark Read the file COPYING
-+ *
-+ * @author Richard Purdie
-+ */
-+
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
-+int main(const int argc, const char* argv[])
-+{
-+	const char *enable = "/dev/oprofile/enable";
-+	const char *lockfile;
-+	unsigned long dpid;
-+	struct stat sbuf;
-+	FILE *lfile, *efile;
-+	int sig, enb, err;
-+
-+	if (argc >= 2) {
-+		printf("Error: Invalid options.\n");
-+		return 1;
-+	}
-+
-+	lockfile = getenv("LOCK_FILE");
-+	if (!lockfile)
-+		lockfile = "/var/lib/oprofile/lock";
-+
-+	/* Add SESSION_DIR support? */
-+
-+	if (geteuid()) {
-+		printf("Error: This program must be run as root.\n");
-+		return 1;
-+	}
-+
-+	if (stat(enable, &sbuf)) {
-+		printf("Error: Could not find /dev/oprofile/enable, the"
-+		       " kernel module probably isn't loaded.\n");
-+		printf("This binary only works with 2.6 kernels and oprofile"
-+		       " must have been initialised with 'opcontrol --start-daemon'.\n");
-+		return 1;
-+	}
-+
-+	if (stat(lockfile, &sbuf)) {
-+		printf("Error: Could not find lockfile %s.\n", lockfile);
-+		printf("The oprofile daemon must be running (oprofile must"
-+		       " have been initialised with 'opcontrol --start-daemon').\n");
-+		return 1;
-+	}
-+
-+	lfile = fopen(lockfile, "r");
-+	if (!lfile) {
-+		printf("Error opening lockfile %s.\n", lockfile);
-+		return 1;
-+	}
-+
-+	err = fscanf(lfile, "%lud", (unsigned long *) &dpid);
-+	if (err != 1) {
-+		printf("Error reading pid from lockfile %s.\n", lockfile);
-+		return 1;
-+	}
-+	fclose(lfile);
-+
-+	efile = fopen(enable, "r");
-+	if (!efile) {
-+		printf("Error opening %s.\n", enable);
-+		return 1;
-+	}
-+
-+	if (strstr(argv[0], "opstart")) {
-+		printf("Starting Profiler\n");
-+		sig = SIGUSR1;
-+		enb = 1;
-+	} else if (strstr(argv[0], "opstop")) {
-+		printf("Stopping Oprofile.\n");
-+		printf("You need to run 'opcontrol --dump' when the session"
-+		       " is finished.\n");
-+		sig = SIGUSR2;
-+		enb = 0;
-+	} else {
-+		printf("Error: Please call as 'opstart' or 'opstop'\n");
-+		return 1;
-+	}
-+
-+	err = kill(dpid, 0);
-+	if (err) {
-+		printf("Error sending signal to oprofiled. Stale lockfile"
-+		       " (%s) ?\n", lockfile);
-+		return 1;
-+	}
-+
-+	fprintf(efile, "%d\n", enb);
-+	err = kill(dpid, sig);
-+	if (err) {
-+		printf("Error sending signal to oprofiled. Stale lockfile"
-+		       " (%s) ?\n", lockfile);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-Index: oprofile/configure.in
-===================================================================
---- oprofile.orig/configure.in	2008-07-02 15:13:58.000000000 +0100
-+++ oprofile/configure.in	2008-07-02 15:17:37.000000000 +0100
-@@ -16,6 +16,7 @@
- AM_CONFIG_HEADER(config.h)
- 
- AC_PROG_RANLIB
-+AC_PROG_LN_S
- AC_PROG_LIBTOOL
- 
- dnl for the man page
-@@ -241,6 +242,8 @@
- 	doc/xsl/catalog-1.xml \
- 	doc/oprofile.1 \
- 	doc/opcontrol.1 \
-+	doc/opstart.1 \
-+	doc/opstop.1 \
- 	doc/ophelp.1 \
- 	doc/opreport.1 \
- 	doc/opannotate.1 \
-Index: oprofile/doc/Makefile.am
-===================================================================
---- oprofile.orig/doc/Makefile.am	2008-07-02 15:13:59.000000000 +0100
-+++ oprofile/doc/Makefile.am	2008-07-02 15:14:07.000000000 +0100
-@@ -11,6 +11,8 @@
- man_MANS = \
- 	oprofile.1 \
- 	opcontrol.1 \
-+	opstart.1 \
-+	opstop.1 \
- 	opreport.1 \
- 	opannotate.1 \
- 	opgprof.1 \
-Index: oprofile/doc/opstart.1.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ oprofile/doc/opstart.1.in	2008-07-02 15:14:07.000000000 +0100
-@@ -0,0 +1,27 @@
-+.TH OPSTART 1 "@DATE@" "oprofile @VERSION@"
-+.UC 4
-+.SH NAME
-+opstart \- start OProfile profiling
-+.SH SYNOPSIS
-+.br
-+.B opstart
-+.SH DESCRIPTION
-+.B opstart
-+is a simple optimised command to start profiling with 2.6 Linux kernels.
-+OProfile should have already been initialised by calling "opcontrol --start-daemon".
-+
-+.SH ENVIRONMENT
-+No special environment variables are recognised by opstart.
-+
-+.SH FILES
-+.TP
-+.I /var/lib/oprofile/samples/
-+The location of the generated sample files.
-+
-+.SH VERSION
-+.TP
-+This man page is current for @PACKAGE@-@VERSION@.
-+
-+.SH SEE ALSO
-+.BR @OP_DOCDIR@,
-+.BR oprofile(1)
-Index: oprofile/doc/opstop.1.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ oprofile/doc/opstop.1.in	2008-07-02 15:14:07.000000000 +0100
-@@ -0,0 +1,28 @@
-+.TH OPSTOP 1 "@DATE@" "oprofile @VERSION@"
-+.UC 4
-+.SH NAME
-+opstop \- stop OProfile profiling
-+.SH SYNOPSIS
-+.br
-+.B opstop
-+.SH DESCRIPTION
-+.B opstop
-+is a simple optimsed command to stop profiling with 2.6 Linux kernels.
-+You need to run "opcontrol --dump" before being able to view a profile
-+with opreport.
-+
-+.SH ENVIRONMENT
-+No special environment variables are recognised by opstop.
-+
-+.SH FILES
-+.TP
-+.I /var/lib/oprofile/samples/
-+The location of the generated sample files.
-+
-+.SH VERSION
-+.TP
-+This man page is current for @PACKAGE@-@VERSION@.
-+
-+.SH SEE ALSO
-+.BR @OP_DOCDIR@,
-+.BR oprofile(1)