diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/fsl_pamu_stash.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 2814304cec04..676454a65af8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -350,7 +350,6 @@ config ARM64_VA_BITS_42 | |||
350 | 350 | ||
351 | config ARM64_VA_BITS_48 | 351 | config ARM64_VA_BITS_48 |
352 | bool "48-bit" | 352 | bool "48-bit" |
353 | depends on !ARM_SMMU | ||
354 | 353 | ||
355 | endchoice | 354 | endchoice |
356 | 355 | ||
diff --git a/arch/powerpc/include/asm/fsl_pamu_stash.h b/arch/powerpc/include/asm/fsl_pamu_stash.h index caa1b21c25cd..38311c98eed9 100644 --- a/arch/powerpc/include/asm/fsl_pamu_stash.h +++ b/arch/powerpc/include/asm/fsl_pamu_stash.h | |||
@@ -32,8 +32,8 @@ enum pamu_stash_target { | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | struct pamu_stash_attribute { | 34 | struct pamu_stash_attribute { |
35 | u32 cpu; /* cpu number */ | 35 | u32 cpu; /* cpu number */ |
36 | u32 cache; /* cache to stash to: L1,L2,L3 */ | 36 | u32 cache; /* cache to stash to: L1,L2,L3 */ |
37 | }; | 37 | }; |
38 | 38 | ||
39 | #endif /* __FSL_PAMU_STASH_H */ | 39 | #endif /* __FSL_PAMU_STASH_H */ |