From: Chris Metcalf Date: Tue, 13 Aug 2013 19:33:53 +0000 (-0400) Subject: tile: use standard tile_bundle_bits type in traps.c X-Git-Tag: next-20130822~108^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3f3753453747ade3829a0260756d30d7a2a4afd0;p=karo-tx-linux.git tile: use standard tile_bundle_bits type in traps.c We were rolling our own bundle_bits, which is unnecessary. Signed-off-by: Chris Metcalf --- diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c index ef95de28db32..8f41de22a67d 100644 --- a/arch/tile/kernel/traps.c +++ b/arch/tile/kernel/traps.c @@ -101,13 +101,7 @@ 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;" @@ -115,7 +109,7 @@ asm(".pushsection .rodata.bpt_code,\"a\";" ".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; @@ -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; /* Re-enable interrupts, if they were previously enabled. */ if (!(regs->flags & PT_FLAGS_DISABLE_IRQ))