10 files changed, 15 insertions, 27 deletions

diff --git a/arch/powerpc/include/asm/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h
index 1e180a594589..0de404dfee8b 100644
--- a/arch/powerpc/include/asm/reg_fsl_emb.h
+++ b/arch/powerpc/include/asm/reg_fsl_emb.h
@@ -39,7 +39,7 @@
 #define PMRN_PMLCB2     0x112   /* PM Local Control B2 */
 #define PMRN_PMLCB3     0x113   /* PM Local Control B3 */
 
-#define PMLCB_THRESHMUL_MASK    0x0700  /* Threshhold Multiple Field */
+#define PMLCB_THRESHMUL_MASK    0x0700  /* Threshold Multiple Field */
 #define PMLCB_THRESHMUL_SHIFT   8
 
 #define PMLCB_THRESHOLD_MASK    0x003f  /* Threshold Field */
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index 641c74bb8e27..b6bd1eaa1c24 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -52,7 +52,7 @@ static struct hard_trap_info
         { 0x2030, 0x08 /* SIGFPE */  },         /* spe fp data */
         { 0x2040, 0x08 /* SIGFPE */  },         /* spe fp data */
         { 0x2050, 0x08 /* SIGFPE */  },         /* spe fp round */
-        { 0x2060, 0x0e /* SIGILL */  },         /* performace monitor */
+        { 0x2060, 0x0e /* SIGILL */  },         /* performance monitor */
         { 0x2900, 0x08 /* SIGFPE */  },         /* apu unavailable */
         { 0x3100, 0x0e /* SIGALRM */ },         /* fixed interval timer */
         { 0x3200, 0x02 /* SIGINT */  },         /* watchdog */
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index c04832c4a02e..3370e62e43d4 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -140,7 +140,6 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
                         unsigned long prot, unsigned long flags,
                         unsigned long fd, unsigned long off, int shift)
 {
-        struct file * file = NULL;
         unsigned long ret = -EINVAL;
 
         if (!arch_validate_prot(prot))
@@ -151,20 +150,8 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
                         goto out;
                 off >>= shift;
         }
-                
-        ret = -EBADF;
-        if (!(flags & MAP_ANONYMOUS)) {
-                if (!(file = fget(fd)))
-                        goto out;
-        }
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-        down_write(&current->mm->mmap_sem);
-        ret = do_mmap_pgoff(file, addr, len, prot, flags, off);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
+        ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off);
 out:
         return ret;
 }
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index c3a56d65c5a9..a753b72efbc0 100644
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -59,7 +59,7 @@ void set_thresholds(unsigned long cpu)
         mtspr(SPRN_THRM1, THRM1_THRES(tau[cpu].low) | THRM1_V | THRM1_TIE | THRM1_TID);
 
         /* setup THRM2,
-         * threshold, valid bit, enable interrupts, interrupt when above threshhold
+         * threshold, valid bit, enable interrupts, interrupt when above threshold
          */
         mtspr (SPRN_THRM2, THRM1_THRES(tau[cpu].high) | THRM1_V | THRM1_TIE);
 #else
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index e9af16cc7c0c..9ba2cc88591d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -835,7 +835,8 @@ static cycle_t timebase_read(struct clocksource *cs)
         return (cycle_t)get_tb();
 }
 
-void update_vsyscall(struct timespec *wall_time, struct clocksource *clock)
+void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
+                     u32 mult)
 {
         u64 t2x, stamp_xsec;
 
@@ -848,7 +849,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock)
 
         /* XXX this assumes clock->shift == 22 */
         /* 4611686018 ~= 2^(20+64-22) / 1e9 */
-        t2x = (u64) clock->mult * 4611686018ULL;
+        t2x = (u64) mult * 4611686018ULL;
         stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
         do_div(stamp_xsec, 1000000000);
         stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
@@ -925,7 +926,7 @@ static void register_decrementer_clockevent(int cpu)
         *dec = decrementer_clockevent;
         dec->cpumask = cpumask_of(cpu);
 
-        printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
+        printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",
                dec->name, dec->mult, dec->shift, cpu);
 
         clockevents_register_device(dec);
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 137dc22afa42..d84d19224a95 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -721,7 +721,7 @@ static int __init vdso_init(void)
 
 #ifdef CONFIG_PPC64
         /*
-         * Fill up the "systemcfg" stuff for backward compatiblity
+         * Fill up the "systemcfg" stuff for backward compatibility
          */
         strcpy((char *)vdso_data->eye_catcher, "SYSTEMCFG:PPC64");
         vdso_data->version.major = SYSTEMCFG_MAJOR;
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index ae06c6236d9c..2c9e52267292 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -248,7 +248,7 @@ static int pm_rtas_activate_signals(u32 node, u32 count)
          * There is no debug setup required for the cycles event.
          * Note that only events in the same group can be used.
          * Otherwise, there will be conflicts in correctly routing
-         * the signals on the debug bus.  It is the responsiblity
+         * the signals on the debug bus.  It is the responsibility
          * of the OProfile user tool to check the events are in
          * the same group.
          */
@@ -1594,7 +1594,7 @@ static void cell_handle_interrupt_spu(struct pt_regs *regs,
                  * to a latch.  The new values (interrupt setting bits, reset
                  * counter value etc.) are not copied to the actual registers
                  * until the performance monitor is enabled.  In order to get
-                 * this to work as desired, the permormance monitor needs to
+                 * this to work as desired, the performance monitor needs to
                  * be disabled while writing to the latches.  This is a
                  * HW design issue.
                  */
@@ -1668,7 +1668,7 @@ static void cell_handle_interrupt_ppu(struct pt_regs *regs,
                  * to a latch.  The new values (interrupt setting bits, reset
                  * counter value etc.) are not copied to the actual registers
                  * until the performance monitor is enabled.  In order to get
-                 * this to work as desired, the permormance monitor needs to
+                 * this to work as desired, the performance monitor needs to
                  * be disabled while writing to the latches.  This is a
                  * HW design issue.
                  */
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index dd43114e9684..da110bd88346 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -100,7 +100,7 @@ const struct of_device_id mpc52xx_pci_ids[] __initdata = {
 };
 
 /* ======================================================================== */
-/* PCI configuration acess                                                  */
+/* PCI configuration access                                                 */
 /* ======================================================================== */
 
 static int
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index e81403b245b5..ab2027cdf893 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -302,7 +302,7 @@ static void __init setup_chaos(struct pci_controller *hose,
  *  1 -> Skip the device but act as if the access was successfull
  *       (return 0xff's on reads, eventually, cache config space
  *       accesses in a later version)
- * -1 -> Hide the device (unsuccessful acess)
+ * -1 -> Hide the device (unsuccessful access)
  */
 static int u3_ht_skip_device(struct pci_controller *hose,
                              struct pci_bus *bus, unsigned int devfn)
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index ae3c4db86fe8..bafc3f85360d 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -160,7 +160,7 @@ static int dart_build(struct iommu_table *tbl, long index,
 
         dp = ((unsigned int*)tbl->it_base) + index;
 
-        /* On U3, all memory is contigous, so we can move this
+        /* On U3, all memory is contiguous, so we can move this
          * out of the loop.
          */
         l = npages;