From 753fb14dfb0662e1d38758ffc6876c0ab1c7bd9e Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Mon, 31 May 2010 12:52:35 -0400 Subject: Make platform-specific Feather-Trace depend on !CONFIG_DEBUG_RODATA Feather-Trace rewrites instructions in the kernel's .text segment. This segment may be write-protected if CONFIG_DEBUG_RODATA is selected. In this case, fall back to the default flag-based Feather-Trace implementation. In the future, we could either adopt the ftrace method of rewriting .text addresses using non-.text mappings or we could consider replacing Feather-Trace with ftrace altogether. For now, this patch avoids unexpected runtime errors. --- litmus/ft_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'litmus/ft_event.c') diff --git a/litmus/ft_event.c b/litmus/ft_event.c index 58124fe0ad90..399a07becca5 100644 --- a/litmus/ft_event.c +++ b/litmus/ft_event.c @@ -2,7 +2,7 @@ #include -#ifndef CONFIG_ARCH_HAS_FEATHER_TRACE +#if !defined(CONFIG_ARCH_HAS_FEATHER_TRACE) || defined(CONFIG_DEBUG_RODATA) /* provide dummy implementation */ int ft_events[MAX_EVENTS]; -- cgit v1.2.2