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 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
kprobes.c
diff --git
a/arch/arm/kernel/kprobes.c
b/arch/arm/kernel/kprobes.c
index
5593dd2
..
5ee39e1
100644
(file)
--- a/
arch/arm/kernel/kprobes.c
+++ b/
arch/arm/kernel/kprobes.c
@@
-274,7
+274,7
@@
int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
* for kretprobe handlers which should normally be interested in r0 only
* anyway.
*/
* for kretprobe handlers which should normally be interested in r0 only
* anyway.
*/
-
static void __attribute__((naked))
__kprobes kretprobe_trampoline(void)
+
void __naked
__kprobes kretprobe_trampoline(void)
{
__asm__ __volatile__ (
"stmdb sp!, {r0 - r11} \n\t"
{
__asm__ __volatile__ (
"stmdb sp!, {r0 - r11} \n\t"