From: Felix Fietkau Date: Fri, 25 Mar 2011 22:18:17 +0000 (+0000) Subject: kernel: remove wrong chunks from the 2.6.37 and 2.6.38 version of the mips oprofile fix X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=def45b136cf95d555d4e18bea7b5caa56155d0b7;p=openwrt%2Fstaging%2Fblocktrron.git kernel: remove wrong chunks from the 2.6.37 and 2.6.38 version of the mips oprofile fix SVN-Revision: 26297 --- 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 2841ed883e..f83c96bb81 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 2841ed883e..f83c96bb81 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)