Skip to content

Commit 872e2ae

Browse files
ozbenhmpe
authored andcommitted
powerpc: Remove useless EXC_COMMON_HV
The only difference between EXC_COMMON_HV and EXC_COMMON is that the former adds "2" to the trap number which is supposed to represent the fact that this is an "HV" interrupt which uses HSRR0/1. However KVM is the only one who cares and it has its own separate macros. In fact, we only have one user of EXC_COMMON_HV and it's for an unknown interrupt case. All the other ones already using EXC_COMMON. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent f5abe14 commit 872e2ae

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

arch/powerpc/include/asm/head-64.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ end_##sname:
178178
* TRAMP_REAL_* - real, unrelocated helpers (virt can call these)
179179
* TRAMP_VIRT_* - virt, unreloc helpers (in practice, real can use)
180180
* TRAMP_KVM - KVM handlers that get put into real, unrelocated
181-
* EXC_COMMON_* - virt, relocated common handlers
181+
* EXC_COMMON - virt, relocated common handlers
182182
*
183183
* The EXC handlers are given a name, and branch to name_common, or the
184184
* appropriate KVM or masking function. Vector handler verieties are as
@@ -211,7 +211,6 @@ end_##sname:
211211
* EXC_COMMON_BEGIN/END - used to open-code the handler
212212
* EXC_COMMON
213213
* EXC_COMMON_ASYNC
214-
* EXC_COMMON_HV
215214
*
216215
* TRAMP_REAL and TRAMP_VIRT can be used with BEGIN/END. KVM
217216
* and OOL handlers are implemented as types of TRAMP and TRAMP_VIRT handlers.
@@ -413,10 +412,6 @@ end_##sname:
413412
EXC_COMMON_BEGIN(name); \
414413
STD_EXCEPTION_COMMON_ASYNC(realvec, name, hdlr); \
415414

416-
#define EXC_COMMON_HV(name, realvec, hdlr) \
417-
EXC_COMMON_BEGIN(name); \
418-
STD_EXCEPTION_COMMON(realvec + 0x2, name, hdlr); \
419-
420415
#endif /* __ASSEMBLY__ */
421416

422417
#endif /* _ASM_POWERPC_HEAD_64_H */

arch/powerpc/kernel/exceptions-64s.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
13181318
b .
13191319
#endif
13201320

1321-
EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception)
1321+
EXC_COMMON(denorm_common, 0x1500, unknown_exception)
13221322

13231323

13241324
#ifdef CONFIG_CBE_RAS

0 commit comments

Comments
 (0)