[PATCH 04/22 -v7] x86_64: notrace annotations

Steven Rostedt
2008-01-30T03:23:48Z

[-- Attachment #1: mcount-add-x86_64-notrace-annotations.patch --]
[-- Type: text/plain, Size: 2212 bytes --]

Add "notrace" annotation to x86_64 specific files.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
arch/x86/kernel/head64.c | 2 +-
arch/x86/kernel/setup64.c | 4 ++--
arch/x86/kernel/smpboot_64.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-mcount.git/arch/x86/kernel/head64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/head64.c 2008-01-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/head64.c 2008-01-25 21:47:05.000000000 -0500
@@ -46,7 +46,7 @@ static void __init copy_bootdata(char *r
}
}

-void __init x86_64_start_kernel(char * real_mode_data)
+notrace void __init x86_64_start_kernel(char *real_mode_data)
{
int i;

Index: linux-mcount.git/arch/x86/kernel/setup64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/setup64.c 2008-01-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/setup64.c 2008-01-25 21:47:05.000000000 -0500
@@ -114,7 +114,7 @@ void __init setup_per_cpu_areas(void)
}
}

-void pda_init(int cpu)
+notrace void pda_init(int cpu)
{
struct x8664_pda *pda = cpu_pda(cpu);

@@ -197,7 +197,7 @@ DEFINE_PER_CPU(struct orig_ist, orig_ist
* 'CPU state barrier', nothing should get across.
* A lot of state is already set up in PDA init.
*/
-void __cpuinit cpu_init (void)
+notrace void __cpuinit cpu_init(void)
{
int cpu = stack_smp_processor_id();
struct tss_struct *t = &per_cpu(init_tss, cpu);
Index: linux-mcount.git/arch/x86/kernel/smpboot_64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/smpboot_64.c 2008-01-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/smpboot_64.c 2008-01-25 21:47:05.000000000 -0500
@@ -317,7 +317,7 @@ static inline void set_cpu_sibling_map(i
/*
* Setup code on secondary processor (after comming out of the trampoline)
*/
-void __cpuinit start_secondary(void)
+notrace __cpuinit void start_secondary(void)
{
/*
* Dont put anything before smp_callin(), SMP

--