From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 27 Apr 2014 16:13:31 +0000 (+0200)
Subject: uprobes/x86: Simplify riprel_{pre,post}_xol() and make them similar
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~34^2~14^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90a6950120a7e45f31a22653fe6543507ae64d0;p=pandora-kernel.git

uprobes/x86: Simplify riprel_{pre,post}_xol() and make them similar

Ignoring the "correction" logic riprel_pre_xol() and riprel_post_xol()
are very similar but look quite differently.

1. Add the "UPROBE_FIX_RIP_AX | UPROBE_FIX_RIP_CX" check at the start
   of riprel_pre_xol(), like the same check in riprel_post_xol().

2. Add the trivial scratch_reg() helper which returns the address of
   scratch register pre_xol/post_xol need to change.

3. Change these functions to use the new helper and avoid copy-and-paste
   under if/else branches.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---

Reading git-diff-tree failed