Commit c16dbd54 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <>
parents 257313b2 c5fc4721
......@@ -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;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment