diff options
Diffstat (limited to 'arch/powerpc/platforms/powernv/setup.c')
-rw-r--r-- | arch/powerpc/platforms/powernv/setup.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index 5a0e2dc6de5f..3f9546d8a51f 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c | |||
@@ -173,6 +173,14 @@ static int pnv_dma_set_mask(struct device *dev, u64 dma_mask) | |||
173 | return __dma_set_mask(dev, dma_mask); | 173 | return __dma_set_mask(dev, dma_mask); |
174 | } | 174 | } |
175 | 175 | ||
176 | static u64 pnv_dma_get_required_mask(struct device *dev) | ||
177 | { | ||
178 | if (dev_is_pci(dev)) | ||
179 | return pnv_pci_dma_get_required_mask(to_pci_dev(dev)); | ||
180 | |||
181 | return __dma_get_required_mask(dev); | ||
182 | } | ||
183 | |||
176 | static void pnv_shutdown(void) | 184 | static void pnv_shutdown(void) |
177 | { | 185 | { |
178 | /* Let the PCI code clear up IODA tables */ | 186 | /* Let the PCI code clear up IODA tables */ |
@@ -307,7 +315,7 @@ static int __init pnv_probe(void) | |||
307 | * Returns the cpu frequency for 'cpu' in Hz. This is used by | 315 | * Returns the cpu frequency for 'cpu' in Hz. This is used by |
308 | * /proc/cpuinfo | 316 | * /proc/cpuinfo |
309 | */ | 317 | */ |
310 | unsigned long pnv_get_proc_freq(unsigned int cpu) | 318 | static unsigned long pnv_get_proc_freq(unsigned int cpu) |
311 | { | 319 | { |
312 | unsigned long ret_freq; | 320 | unsigned long ret_freq; |
313 | 321 | ||
@@ -335,6 +343,7 @@ define_machine(powernv) { | |||
335 | .power_save = power7_idle, | 343 | .power_save = power7_idle, |
336 | .calibrate_decr = generic_calibrate_decr, | 344 | .calibrate_decr = generic_calibrate_decr, |
337 | .dma_set_mask = pnv_dma_set_mask, | 345 | .dma_set_mask = pnv_dma_set_mask, |
346 | .dma_get_required_mask = pnv_dma_get_required_mask, | ||
338 | #ifdef CONFIG_KEXEC | 347 | #ifdef CONFIG_KEXEC |
339 | .kexec_cpu_down = pnv_kexec_cpu_down, | 348 | .kexec_cpu_down = pnv_kexec_cpu_down, |
340 | #endif | 349 | #endif |