Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[mirror_ubuntu-artful-kernel.git] / arch / sparc / kernel / pcic.c

diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index f2eae457fc9a24cc4c9c44a401c19a9270a3084c..a6a6f9823370582d3b6ef0ff18206c6d072f719a 100644 (file)
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -329,7 +329,7 @@ int __init pcic_probe(void)
        pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
        if ((pcic->pcic_config_space_addr =
            ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == 0) {
-               prom_printf("PCIC: Error, cannot map" 
+               prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Address.\n");
                prom_halt();
        }
@@ -341,7 +341,7 @@ int __init pcic_probe(void)
        pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
        if ((pcic->pcic_config_space_data =
            ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == 0) {
-               prom_printf("PCIC: Error, cannot map" 
+               prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Data.\n");
                prom_halt();
        }
@@ -518,8 +518,8 @@ static void pcic_map_pci_device(struct linux_pcic *pcic,
                                 * board in a PCI slot. We must remap it
                                 * under 64K but it is not done yet. XXX
                                 */
-                               printk("PCIC: Skipping I/O space at 0x%lx,"
-                                   "this will Oops if a driver attaches;"
+                               printk("PCIC: Skipping I/O space at 0x%lx, "
+                                   "this will Oops if a driver attaches "
                                    "device '%s' at %02x:%02x)\n", address,
                                    namebuf, dev->bus->number, dev->devfn);
                        }
@@ -713,10 +713,10 @@ static irqreturn_t pcic_timer_handler (int irq, void *h)
        write_seqlock(&xtime_lock);     /* Dummy, to show that we remember */
        pcic_clear_clock_irq();
        do_timer(1);
+       write_sequnlock(&xtime_lock);
 #ifndef CONFIG_SMP
        update_process_times(user_mode(get_irq_regs()));
 #endif
-       write_sequnlock(&xtime_lock);
        return IRQ_HANDLED;
 }
 
@@ -753,7 +753,7 @@ void __init pci_time_init(void)
        local_irq_enable();
 }
 
-static __inline__ unsigned long do_gettimeoffset(void)
+static inline unsigned long do_gettimeoffset(void)
 {
        /*
         * We divide all by 100