diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-11-28 01:33:45 +0300 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-12-01 11:57:32 -0500 |
| commit | fb4653ea565018aa26a730db6b59ff64f2c6afa8 (patch) | |
| tree | a343331fd74ce896232ca657f17ba84b47c2fd7f /runtime | |
| parent | 2069eacc8e19d784bb9e5eb532fcd61e5de1b606 (diff) | |
| download | systemtap-steved-fb4653ea565018aa26a730db6b59ff64f2c6afa8.tar.gz systemtap-steved-fb4653ea565018aa26a730db6b59ff64f2c6afa8.tar.xz systemtap-steved-fb4653ea565018aa26a730db6b59ff64f2c6afa8.zip | |
Share ppc64 and ppc32 code where possible
* runtime/copy.c: Can use ppc64's code.
* runtime/regs.h: Ditto.
* runtime/string.h: Ditto.
* tapset/context.stp: Ditto.
* tapset/errno.stp: Ditto.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/copy.c | 2 | ||||
| -rw-r--r-- | runtime/regs.h | 2 | ||||
| -rw-r--r-- | runtime/string.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/runtime/copy.c b/runtime/copy.c index 4fb87253..40f15117 100644 --- a/runtime/copy.c +++ b/runtime/copy.c @@ -105,7 +105,7 @@ do { \ : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \ : "memory"); \ } while (0) -#elif defined (__powerpc64__) || defined (__ia64__) || defined (__arm__) +#elif defined (__powerpc__) || defined (__ia64__) || defined (__arm__) #define __stp_strncpy_from_user(dst,src,count,res) \ do { res = __strncpy_from_user(dst, src, count); } while(0) diff --git a/runtime/regs.h b/runtime/regs.h index dc6b50af..08449aa6 100644 --- a/runtime/regs.h +++ b/runtime/regs.h @@ -36,7 +36,7 @@ (((regs)->cr_iip = (x) & ~3UL), (ia64_psr(regs)->ri = (x) & 3UL)) -#elif defined (__powerpc64__) +#elif defined (__powerpc__) #define REG_IP(regs) regs->nip #define REG_SP(regs) regs->gpr[1] diff --git a/runtime/string.h b/runtime/string.h index f4d4cc05..b08304e5 100644 --- a/runtime/string.h +++ b/runtime/string.h @@ -19,14 +19,14 @@ static void _stp_text_str(char *out, char *in, int len, int quoted, int user); * is provided without the paranoid check. Use it if available, fall back * to __get_user() if not. Other archs can use __get_user() as is */ -#ifdef __powerpc64__ +#if defined(__powerpc__) #ifdef __get_user_inatomic #define __stp_get_user(x, ptr) __get_user_inatomic(x, ptr) #else /* __get_user_inatomic */ #define __stp_get_user(x, ptr) __get_user(x, ptr) #endif /* __get_user_inatomic */ -#else /* __powerpc64__ */ +#else /* defined(__powerpc__) */ #define __stp_get_user(x, ptr) __get_user(x, ptr) -#endif /* __powerpc64__ */ +#endif /* defined(__powerpc__) */ #endif /* _STRING_H_ */ |