summaryrefslogtreecommitdiff
path: root/kernel/extable.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-05-20 08:54:05 +0200
committerIngo Molnar <mingo@elte.hu>2011-05-20 08:54:08 +0200
commitc16dbd54a3fe126b539a0ef149d80221c667bbd5 (patch)
tree297a9b616ac100d8773373bd0cbf3fb4eb9d87a7 /kernel/extable.c
parent257313b2a87795e07a0bdf58d0fffbdba8b31051 (diff)
parentc5fc472171ec4f96d06d1ac039d88f9b89bb95db (diff)
downloadlinux-sh-c16dbd54a3fe126b539a0ef149d80221c667bbd5.tar.gz
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>
Diffstat (limited to 'kernel/extable.c')
-rw-r--r--kernel/extable.c2
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;