projects
/
platform
/
kernel
/
swap-modules.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9616888
)
[FIX] x86 build fix ARM specific code
author
Nikita Kalyazin
<n.kalyazin@samsung.com>
Mon, 15 Jul 2013 07:46:14 +0000
(11:46 +0400)
committer
Nikita Kalyazin
<n.kalyazin@samsung.com>
Mon, 15 Jul 2013 07:46:14 +0000
(11:46 +0400)
uprobe/swap_uprobes.c
patch
|
blob
|
history
diff --git
a/uprobe/swap_uprobes.c
b/uprobe/swap_uprobes.c
index
fcfddf4
..
4b3e551
100644
(file)
--- a/
uprobe/swap_uprobes.c
+++ b/
uprobe/swap_uprobes.c
@@
-732,12
+732,16
@@
static int pre_handler_uretprobe(struct kprobe *p, struct pt_regs *regs)
{
struct uprobe *up = container_of(p, struct uprobe, kp);
struct uretprobe *rp = container_of(up, struct uretprobe, up);
+#ifdef CONFIG_ARM
int noret = thumb_mode(regs) ? rp->thumb_noret : rp->arm_noret;
+#endif
struct uretprobe_instance *ri;
unsigned long flags;
+#ifdef CONFIG_ARM
if (noret)
return 0;
+#endif
/* TODO: consider to only swap the RA after the last pre_handler fired */
spin_lock_irqsave(&uretprobe_lock, flags);