git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cpus4096
[pandora-kernel.git]
/
arch
/
x86
/
vdso
/
vgetcpu.c
diff --git
a/arch/x86/vdso/vgetcpu.c
b/arch/x86/vdso/vgetcpu.c
index
c8097f1
..
9fbc6b2
100644
(file)
--- a/
arch/x86/vdso/vgetcpu.c
+++ b/
arch/x86/vdso/vgetcpu.c
@@
-13,7
+13,8
@@
#include <asm/vgtod.h>
#include "vextern.h"
-long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
+notrace long
+__vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
{
unsigned int p;