From 5278b87b26ef7e2fdc68d5566c2015d4254c4942 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 25 Mar 2011 22:18:17 +0000 Subject: [PATCH] kernel: remove wrong chunks from the 2.6.37 and 2.6.38 version of the mips oprofile fix git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26297 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.37/208-mips_oprofile_fix.patch | 12 ------------ .../patches-2.6.38/208-mips_oprofile_fix.patch | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/target/linux/generic/patches-2.6.37/208-mips_oprofile_fix.patch b/target/linux/generic/patches-2.6.37/208-mips_oprofile_fix.patch index 2841ed883..f83c96bb8 100644 --- a/target/linux/generic/patches-2.6.37/208-mips_oprofile_fix.patch +++ b/target/linux/generic/patches-2.6.37/208-mips_oprofile_fix.patch @@ -1,15 +1,3 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -48,6 +48,9 @@ ifneq ($(SUBARCH),$(ARCH)) - endif - endif - -+ifndef CONFIG_PROFILING -+ cflags-y := -ffunction-sections -+endif - ifdef CONFIG_FUNCTION_GRAPH_TRACER - ifndef KBUILD_MCOUNT_RA_ADDRESS - ifeq ($(call cc-option-yn,-mmcount-ra-address), y) --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c @@ -298,6 +298,11 @@ static void reset_counters(void *arg) diff --git a/target/linux/generic/patches-2.6.38/208-mips_oprofile_fix.patch b/target/linux/generic/patches-2.6.38/208-mips_oprofile_fix.patch index 2841ed883..f83c96bb8 100644 --- a/target/linux/generic/patches-2.6.38/208-mips_oprofile_fix.patch +++ b/target/linux/generic/patches-2.6.38/208-mips_oprofile_fix.patch @@ -1,15 +1,3 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -48,6 +48,9 @@ ifneq ($(SUBARCH),$(ARCH)) - endif - endif - -+ifndef CONFIG_PROFILING -+ cflags-y := -ffunction-sections -+endif - ifdef CONFIG_FUNCTION_GRAPH_TRACER - ifndef KBUILD_MCOUNT_RA_ADDRESS - ifeq ($(call cc-option-yn,-mmcount-ra-address), y) --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c @@ -298,6 +298,11 @@ static void reset_counters(void *arg) -- 2.20.1