diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-11 13:01:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-11 13:01:57 -0700 |
| commit | 605cd83694fa175894a1c63191f1f10c449b93a8 (patch) | |
| tree | 951cb8b9881d696d82e722a734a6b13bee4e924d | |
| parent | 5f8ebd36f7dd95ec97aec82d5907522dc54e85ba (diff) | |
| parent | 9e0304e388ef0e7495b279ce737c24ad56d20b5d (diff) | |
| download | blockconsole-605cd83694fa175894a1c63191f1f10c449b93a8.tar.gz | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile fix from Chris Metcalf:
"This is a single change to fix backtracing in big-endian mode."
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: big-endian: properly bswap instruction bundles when backtracing
| -rw-r--r-- | arch/tile/kernel/backtrace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/tile/kernel/backtrace.c b/arch/tile/kernel/backtrace.c index 9092ce8aa6b47..f8b74ca83b925 100644 --- a/arch/tile/kernel/backtrace.c +++ b/arch/tile/kernel/backtrace.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/string.h> +#include <asm/byteorder.h> #include <asm/backtrace.h> #include <asm/tile-desc.h> #include <arch/abi.h> @@ -336,8 +337,12 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location, bytes_to_prefetch / sizeof(tile_bundle_bits); } - /* Decode the next bundle. */ - bundle.bits = prefetched_bundles[next_bundle++]; + /* + * Decode the next bundle. + * TILE always stores instruction bundles in little-endian + * mode, even when the chip is running in big-endian mode. + */ + bundle.bits = le64_to_cpu(prefetched_bundles[next_bundle++]); bundle.num_insns = parse_insn_tile(bundle.bits, pc, bundle.insns); num_info_ops = bt_get_info_ops(&bundle, info_operands); |