diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2013-08-13 15:33:53 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2013-09-03 14:53:22 -0400 |
| commit | a0099303cd6336675a5532e0444c1b6fd493ca49 (patch) | |
| tree | 2b4f1491ef662723bfed8b71569b0cac433d497a /arch/tile/kernel/traps.c | |
| parent | 43b7f2fb58d42d2b6bc02368f61e14abd002001a (diff) | |
| download | linux-next-a0099303cd6336675a5532e0444c1b6fd493ca49.tar.gz | |
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 <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/traps.c')
| -rw-r--r-- | arch/tile/kernel/traps.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c index a937365b3429..6b603d556ca6 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; int is_kernel = !user_mode(regs); /* Handle breakpoints, etc. */ |