diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-09-26 12:53:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-09-26 12:54:28 +0200 |
commit | ed3982cf3748b657ffb79d9d1c2e4a562661db2d (patch) | |
tree | 6e3654f460e23aa1b1512896aa3f03886a69be1b /tools/perf | |
parent | cba9bd22a5f8f857534b9a7f3fb3cafa0ac5fb75 (diff) | |
parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
download | op-kernel-dev-ed3982cf3748b657ffb79d9d1c2e4a562661db2d.zip op-kernel-dev-ed3982cf3748b657ffb79d9d1c2e4a562661db2d.tar.gz |
Merge commit 'v3.1-rc7' into perf/core
Merge reason: Pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/arch/arm/util/dwarf-regs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/arch/arm/util/dwarf-regs.c b/tools/perf/arch/arm/util/dwarf-regs.c index fff6450..e8d5c55 100644 --- a/tools/perf/arch/arm/util/dwarf-regs.c +++ b/tools/perf/arch/arm/util/dwarf-regs.c @@ -8,7 +8,10 @@ * published by the Free Software Foundation. */ +#include <stdlib.h> +#ifndef __UCLIBC__ #include <libio.h> +#endif #include <dwarf-regs.h> struct pt_regs_dwarfnum { |