Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / platforms / powernv / setup.c

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 5a0e2dc..30b1c3e 100644 (file)
--- 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)
        return __dma_set_mask(dev, dma_mask);
 }
 
+static u64 pnv_dma_get_required_mask(struct device *dev)
+{
+       if (dev_is_pci(dev))
+               return pnv_pci_dma_get_required_mask(to_pci_dev(dev));
+
+       return __dma_get_required_mask(dev);
+}
+
 static void pnv_shutdown(void)
 {
        /* Let the PCI code clear up IODA tables */
@@ -257,10 +265,8 @@ static unsigned long pnv_memory_block_size(void)
 static void __init pnv_setup_machdep_opal(void)
 {
        ppc_md.get_boot_time = opal_get_boot_time;
-       ppc_md.get_rtc_time = opal_get_rtc_time;
-       ppc_md.set_rtc_time = opal_set_rtc_time;
        ppc_md.restart = pnv_restart;
-       ppc_md.power_off = pnv_power_off;
+       pm_power_off = pnv_power_off;
        ppc_md.halt = pnv_halt;
        ppc_md.machine_check_exception = opal_machine_check;
        ppc_md.mce_check_early_recovery = opal_mce_check_early_recovery;
@@ -277,7 +283,7 @@ static void __init pnv_setup_machdep_rtas(void)
                ppc_md.set_rtc_time = rtas_set_rtc_time;
        }
        ppc_md.restart = rtas_restart;
-       ppc_md.power_off = rtas_power_off;
+       pm_power_off = rtas_power_off;
        ppc_md.halt = rtas_halt;
 }
 #endif /* CONFIG_PPC_POWERNV_RTAS */
@@ -307,7 +313,7 @@ static int __init pnv_probe(void)
  * Returns the cpu frequency for 'cpu' in Hz. This is used by
  * /proc/cpuinfo
  */
-unsigned long pnv_get_proc_freq(unsigned int cpu)
+static unsigned long pnv_get_proc_freq(unsigned int cpu)
 {
        unsigned long ret_freq;
 
@@ -335,6 +341,7 @@ define_machine(powernv) {
        .power_save             = power7_idle,
        .calibrate_decr         = generic_calibrate_decr,
        .dma_set_mask           = pnv_dma_set_mask,
+       .dma_get_required_mask  = pnv_dma_get_required_mask,
 #ifdef CONFIG_KEXEC
        .kexec_cpu_down         = pnv_kexec_cpu_down,
 #endif