| Message ID | 20230405045316.95003-1-joel@jms.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 92cb1eff88a67e95daaf39eccf777272e85398c6 |
| Headers | show |
| Series | powerpc: Remove duplicate SPRN_HSRR definitions | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
On Wed, 05 Apr 2023 14:23:16 +0930, Joel Stanley wrote: > There are two copies of these defines. Keep the older ones as they have > associated bit definitions. > > Applied to powerpc/next. [1/1] powerpc: Remove duplicate SPRN_HSRR definitions https://git.kernel.org/powerpc/c/92cb1eff88a67e95daaf39eccf777272e85398c6 cheers
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 1e8b2e04e626..0bf4c506a1eb 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -382,8 +382,6 @@ #define SPRN_HIOR 0x137 /* 970 Hypervisor interrupt offset */ #define SPRN_RMOR 0x138 /* Real mode offset register */ #define SPRN_HRMOR 0x139 /* Real mode offset register */ -#define SPRN_HSRR0 0x13A /* Hypervisor Save/Restore 0 */ -#define SPRN_HSRR1 0x13B /* Hypervisor Save/Restore 1 */ #define SPRN_ASDR 0x330 /* Access segment descriptor register */ #define SPRN_IC 0x350 /* Virtual Instruction Count */ #define SPRN_VTB 0x351 /* Virtual Time Base */
There are two copies of these defines. Keep the older ones as they have associated bit definitions. Signed-off-by: Joel Stanley <joel@jms.id.au> --- Today I learnt that if you have two copies of the define, but they are the same value, the compiler won't warn. arch/powerpc/include/asm/reg.h | 2 -- 1 file changed, 2 deletions(-)