Merge branch 'perf/core' into perf/urgent

Merge reason: One pending commit was left in perf/core after Linus merged
              perf/core - continue v2.6.40 work in the perf/urgent reason.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/extable.c b/kernel/extable.c
index c2d625fcda77..d44aac0c3faa 100644
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -74,7 +74,7 @@ int core_kernel_text(unsigned long addr)
 
 int core_kernel_data(unsigned long addr)
 {
-        if (addr >= (unsigned long)_sdata &&
+        if (addr >= (unsigned long)_stext &&
             addr < (unsigned long)_edata)
                 return 1;
         return 0;