diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
| commit | 51b643b404827d8fde60d7953773a42d46ca87e0 (patch) | |
| tree | ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /include/asm-generic/sections.h | |
| parent | 554f786e284a6ce859d51f62240d615603944c8e (diff) | |
| parent | 480c93df5b99699390f93a7024c9f60d09da0e96 (diff) | |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
Diffstat (limited to 'include/asm-generic/sections.h')
| -rw-r--r-- | include/asm-generic/sections.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 79a7ff925bf..4ce48e87853 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -9,7 +9,7 @@ extern char __bss_start[], __bss_stop[]; extern char __init_begin[], __init_end[]; extern char _sinittext[], _einittext[]; extern char _end[]; -extern char __per_cpu_start[], __per_cpu_end[]; +extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[]; extern char __kprobes_text_start[], __kprobes_text_end[]; extern char __initdata_begin[], __initdata_end[]; extern char __start_rodata[], __end_rodata[]; |