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 <[email protected]>
olifre · May 20, 2011 · c16dbd5 · c16dbd5
2 parents 257313b + c5fc472
commit c16dbd5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;