diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/dma-mapping.h | 3 | ||||
-rw-r--r-- | include/linux/topology.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index be86ae13893f..e13117cbd2f7 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
@@ -42,6 +42,9 @@ struct dma_map_ops { | |||
42 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); | 42 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); |
43 | int (*dma_supported)(struct device *dev, u64 mask); | 43 | int (*dma_supported)(struct device *dev, u64 mask); |
44 | int (*set_dma_mask)(struct device *dev, u64 mask); | 44 | int (*set_dma_mask)(struct device *dev, u64 mask); |
45 | #ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK | ||
46 | u64 (*get_required_mask)(struct device *dev); | ||
47 | #endif | ||
45 | int is_phys; | 48 | int is_phys; |
46 | }; | 49 | }; |
47 | 50 | ||
diff --git a/include/linux/topology.h b/include/linux/topology.h index fc839bfa7935..e26db031303b 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
@@ -201,6 +201,10 @@ int arch_update_cpu_topology(void); | |||
201 | .balance_interval = 64, \ | 201 | .balance_interval = 64, \ |
202 | } | 202 | } |
203 | 203 | ||
204 | #ifndef SD_NODES_PER_DOMAIN | ||
205 | #define SD_NODES_PER_DOMAIN 16 | ||
206 | #endif | ||
207 | |||
204 | #ifdef CONFIG_SCHED_BOOK | 208 | #ifdef CONFIG_SCHED_BOOK |
205 | #ifndef SD_BOOK_INIT | 209 | #ifndef SD_BOOK_INIT |
206 | #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!! | 210 | #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!! |