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
This commit is contained in:
Linus Torvalds 2012-07-11 13:01:57 -07:00
Родитель 5f8ebd36f7 9e0304e388
Коммит 605cd83694
1 изменённых файлов: 7 добавлений и 2 удалений

Просмотреть файл

@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/byteorder.h>
#include <asm/backtrace.h> #include <asm/backtrace.h>
#include <asm/tile-desc.h> #include <asm/tile-desc.h>
#include <arch/abi.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); 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 = bundle.num_insns =
parse_insn_tile(bundle.bits, pc, bundle.insns); parse_insn_tile(bundle.bits, pc, bundle.insns);
num_info_ops = bt_get_info_ops(&bundle, info_operands); num_info_ops = bt_get_info_ops(&bundle, info_operands);