1 files changed, 17 insertions, 5 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cdc9a6ff4be8..bf6cedfa05db 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -42,6 +42,10 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+        bool
+        default y
+
 config HAVE_SETUP_PER_CPU_AREA
         def_bool PPC64
 
@@ -89,10 +93,6 @@ config GENERIC_HWEIGHT
         bool
         default y
 
-config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
-
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -125,6 +125,8 @@ config PPC
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
         select HAVE_SYSCALL_WRAPPERS if PPC64
+        select GENERIC_ATOMIC64 if PPC32
+        select HAVE_PERF_COUNTERS
 
 config EARLY_PRINTK
         bool
@@ -296,9 +298,19 @@ config IOMMU_VMERGE
 config IOMMU_HELPER
         def_bool PPC64
 
+config SWIOTLB
+        bool "SWIOTLB support"
+        default n
+        select IOMMU_HELPER
+        ---help---
+          Support for IO bounce buffering for systems without an IOMMU.
+          This allows us to DMA to the full physical address space on
+          platforms where the size of a physical address is larger
+          than the bus address.  Not all platforms support this.
+
 config PPC_NEED_DMA_SYNC_OPS
         def_bool y
-        depends on NOT_COHERENT_CACHE
+        depends on (NOT_COHERENT_CACHE || SWIOTLB)
 
 config HOTPLUG_CPU
         bool "Support for enabling/disabling CPUs"