diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/tile/include/asm/opcode-tile_32.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/tile/include/asm/opcode-tile_32.h')
| -rw-r--r-- | arch/tile/include/asm/opcode-tile_32.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/tile/include/asm/opcode-tile_32.h b/arch/tile/include/asm/opcode-tile_32.h index eda60ecbae3d..03df7b1e77bf 100644 --- a/arch/tile/include/asm/opcode-tile_32.h +++ b/arch/tile/include/asm/opcode-tile_32.h | |||
| @@ -1502,5 +1502,12 @@ extern int parse_insn_tile(tile_bundle_bits bits, | |||
| 1502 | decoded[TILE_MAX_INSTRUCTIONS_PER_BUNDLE]); | 1502 | decoded[TILE_MAX_INSTRUCTIONS_PER_BUNDLE]); |
| 1503 | 1503 | ||
| 1504 | 1504 | ||
| 1505 | /* Given a set of bundle bits and a specific pipe, returns which | ||
| 1506 | * instruction the bundle contains in that pipe. | ||
| 1507 | */ | ||
| 1508 | extern const struct tile_opcode * | ||
| 1509 | find_opcode(tile_bundle_bits bits, tile_pipeline pipe); | ||
| 1510 | |||
| 1511 | |||
| 1505 | 1512 | ||
| 1506 | #endif /* opcode_tile_h */ | 1513 | #endif /* opcode_tile_h */ |