Skip to content

Commit

Permalink
tile: use standard tile_bundle_bits type in traps.c
Browse files Browse the repository at this point in the history
We were rolling our own bundle_bits, which is unnecessary.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  • Loading branch information
Chris Metcalf committed Sep 3, 2013
1 parent 43b7f2f commit a009930
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions arch/tile/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,15 @@ static int retry_gpv(unsigned int gpv_reason)

#endif /* CHIP_HAS_TILE_DMA() */

#ifdef __tilegx__
#define bundle_bits tilegx_bundle_bits
#else
#define bundle_bits tile_bundle_bits
#endif

extern bundle_bits bpt_code;
extern tile_bundle_bits bpt_code;

asm(".pushsection .rodata.bpt_code,\"a\";"
".align 8;"
"bpt_code: bpt;"
".size bpt_code,.-bpt_code;"
".popsection");

static int special_ill(bundle_bits bundle, int *sigp, int *codep)
static int special_ill(tile_bundle_bits bundle, int *sigp, int *codep)
{
int sig, code, maxcode;

Expand Down Expand Up @@ -263,7 +257,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
siginfo_t info = { 0 };
int signo, code;
unsigned long address = 0;
bundle_bits instr;
tile_bundle_bits instr;
int is_kernel = !user_mode(regs);

/* Handle breakpoints, etc. */
Expand Down

0 comments on commit a009930

Please sign in to comment.