diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:39:02 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 17:39:02 +0800 |
| commit | 7acaa1968831591b5cf97b6cb00b0acca2dc5ee1 (patch) | |
| tree | 9dba673061452165322aa9d9c8493ce90e33a651 /arch/x86/kernel/paravirt.c | |
| parent | b71d24fd9283d80a2ca7b26cdd5de296b17de72c (diff) | |
| parent | 7ddc655ad909372848a3e7995e222c2b9224c2e0 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.09-rt
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 1f316f066c49..68cf2ec816d5 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -55,12 +55,12 @@ asm (".pushsection .entry.text, \"ax\"\n" ".popsection"); /* identity function, which can be inlined */ -u32 _paravirt_ident_32(u32 x) +u32 notrace _paravirt_ident_32(u32 x) { return x; } -u64 _paravirt_ident_64(u64 x) +u64 notrace _paravirt_ident_64(u64 x) { return x; } |