18 files changed, 25 insertions, 39 deletions

diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index af5e85b91d02..f060a3959a75 100644
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -98,7 +98,7 @@ struct clkctl_acpu_speed {
 
 /*
  * ACPU speed table. Complete table is shown but certain speeds are commented
- * out to optimized speed switching. Initalize loops_per_jiffy to 0.
+ * out to optimized speed switching. Initialize loops_per_jiffy to 0.
  *
  * Table stepping up/down is optimized for 256mhz jumps while staying on the
  * same PLL.
@@ -494,7 +494,7 @@ uint32_t acpuclk_get_switch_time(void)
  * Clock driver initialization
  *---------------------------------------------------------------------------*/
 
-/* Initalize the lpj field in the acpu_freq_tbl. */
+/* Initialize the lpj field in the acpu_freq_tbl. */
 static void __init lpj_init(void)
 {
         int i;
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index b32ccd954a1b..ed8d330522f1 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -463,7 +463,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
         }
         if (!ret) {
                 /*
-                 * Switch the parent clock in the heirarchy, and make sure
+                 * Switch the parent clock in the hierarchy, and make sure
                  * that the new parent's usecount is correct.  Note: we
                  * enable the new parent before disabling the old to avoid
                  * any unnecessary hardware disable->enable transitions.
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index d522cd70bf53..ba53191ae4c5 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -60,7 +60,7 @@
 #define SDRC_DLLA_CTRL_V        OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)
 
         .text
-/* Function to aquire the semaphore in scratchpad */
+/* Function to acquire the semaphore in scratchpad */
 ENTRY(lock_scratchpad_sem)
         stmfd   sp!, {lr}       @ save registers on stack
 wait_sem:
diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
index 5f61fd45a0c8..d92790140fe5 100644
--- a/arch/arm/mach-u300/gpio.c
+++ b/arch/arm/mach-u300/gpio.c
@@ -523,7 +523,7 @@ static void gpio_set_initial_values(void)
 
         /*
          * Put all pins that are set to either 'GPIO_OUT' or 'GPIO_NOT_USED'
-         * to output and 'GPIO_IN' to input for each port. And initalize
+         * to output and 'GPIO_IN' to input for each port. And initialize
          * default value on outputs.
          */
         for (i = 0; i < U300_GPIO_NUM_PORTS; i++) {
diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c
index 8474d05274bd..931d26d1a54b 100644
--- a/arch/arm/plat-s3c24xx/clock.c
+++ b/arch/arm/plat-s3c24xx/clock.c
@@ -43,7 +43,7 @@
 #include <plat/cpu.h>
 #include <plat/pll.h>
 
-/* initalise all the clocks */
+/* initialise all the clocks */
 
 void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
                                            unsigned long hclk,
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 8bf79f3efdfb..90a20512d68d 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -391,7 +391,7 @@ void __init s3c_disable_clocks(struct clk *clkp, int nr_clks)
                 (clkp->enable)(clkp, 0);
 }
 
-/* initalise all the clocks */
+/* initialise all the clocks */
 
 int __init s3c24xx_register_baseclocks(unsigned long xtal)
 {
diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index 9e8b69cdf19e..1b17d92cef8e 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -33,8 +33,8 @@ static void crisv32_intmem_init(void)
 {
         static int initiated = 0;
         if (!initiated) {
-                struct intmem_allocation* alloc =
-                  (struct intmem_allocation*)kmalloc(sizeof *alloc, GFP_KERNEL);
+                struct intmem_allocation* alloc;
+                alloc = kmalloc(sizeof *alloc, GFP_KERNEL);
                 INIT_LIST_HEAD(&intmem_allocations);
                 intmem_virtual = ioremap(MEM_INTMEM_START + RESERVED_SIZE,
                                          MEM_INTMEM_SIZE - RESERVED_SIZE);
@@ -62,9 +62,8 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
                 if (allocation->status == STATUS_FREE &&
                     allocation->size >= size + alignment) {
                         if (allocation->size > size + alignment) {
-                                struct intmem_allocation* alloc =
-                                        (struct intmem_allocation*)
-                                        kmalloc(sizeof *alloc, GFP_ATOMIC);
+                                struct intmem_allocation* alloc;
+                                alloc = kmalloc(sizeof *alloc, GFP_ATOMIC);
                                 alloc->status = STATUS_FREE;
                                 alloc->size = allocation->size - size -
                                         alignment;
@@ -74,9 +73,7 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
 
                                 if (alignment) {
                                         struct intmem_allocation *tmp;
-                                        tmp = (struct intmem_allocation *)
-                                                kmalloc(sizeof *tmp,
-                                                        GFP_ATOMIC);
+                                        tmp = kmalloc(sizeof *tmp, GFP_ATOMIC);
                                         tmp->offset = allocation->offset;
                                         tmp->size = alignment;
                                         tmp->status = STATUS_FREE;
diff --git a/arch/h8300/kernel/timer/itu.c b/arch/h8300/kernel/timer/itu.c
index 4883ba7103a8..a2ae5e952137 100644
--- a/arch/h8300/kernel/timer/itu.c
+++ b/arch/h8300/kernel/timer/itu.c
@@ -73,7 +73,7 @@ void __init h8300_timer_setup(void)
 
         setup_irq(ITUIRQ, &itu_irq);
 
-        /* initalize timer */
+        /* initialize timer */
         ctrl_outb(0, TSTR);
         ctrl_outb(CCLR0 | div, ITUBASE + TCR);
         ctrl_outb(0x01, ITUBASE + TIER);
diff --git a/arch/h8300/kernel/timer/timer16.c b/arch/h8300/kernel/timer/timer16.c
index 042dbb53f3fb..ae0d38161139 100644
--- a/arch/h8300/kernel/timer/timer16.c
+++ b/arch/h8300/kernel/timer/timer16.c
@@ -68,7 +68,7 @@ void __init h8300_timer_setup(void)
 
         setup_irq(_16IRQ, &timer16_irq);
 
-        /* initalize timer */
+        /* initialize timer */
         ctrl_outb(0, TSTR);
         ctrl_outb(CCLR0 | div, _16BASE + TCR);
         ctrl_outw(cnt, _16BASE + GRA);
diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c
index 38be0cabef0d..3946c0fa8374 100644
--- a/arch/h8300/kernel/timer/timer8.c
+++ b/arch/h8300/kernel/timer/timer8.c
@@ -94,7 +94,7 @@ void __init h8300_timer_setup(void)
         ctrl_bclr(0, MSTPCRL)
 #endif
 
-        /* initalize timer */
+        /* initialize timer */
         ctrl_outw(cnt, _8BASE + TCORA);
         ctrl_outw(0x0000, _8BASE + _8TCSR);
         ctrl_outw((CMIEA|CCLR_CMA|CKS2) << 8 | div,
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 21b701374f72..9b109f25e49c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1237,7 +1237,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt;
         p_ctx->cr[8] = 0x3c;
 
-        /*Initilize region register*/
+        /*Initialize region register*/
         p_ctx->rr[0] = 0x30;
         p_ctx->rr[1] = 0x30;
         p_ctx->rr[2] = 0x30;
@@ -1246,7 +1246,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->rr[5] = 0x30;
         p_ctx->rr[7] = 0x30;
 
-        /*Initilize branch register 0*/
+        /*Initialize branch register 0*/
         p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry;
 
         vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr;
@@ -1707,7 +1707,7 @@ static int kvm_relocate_vmm(struct kvm_vmm_info *vmm_info,
         BUG_ON(!module);
 
         if (!kvm_vmm_base) {
-                printk("kvm: kvm area hasn't been initilized yet!!\n");
+                printk("kvm: kvm area hasn't been initialized yet!!\n");
                 return -EFAULT;
         }
 
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index d00dfc180021..dbc4cbecb5ed 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -507,7 +507,7 @@ static void __init sn_init_pdas(char **cmdline_p)
         cnodeid_t cnode;
 
         /*
-         * Allocate & initalize the nodepda for each node.
+         * Allocate & initialize the nodepda for each node.
          */
         for_each_online_node(cnode) {
                 nodepdaindr[cnode] =
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 72f6e8583746..592c7079de88 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -25,7 +25,7 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY)))
   ifeq ($(CPU_MAJOR),3)
     CPUFLAGS-1 += -mno-xl-soft-mul
   else
-    # USE_HW_MUL can be 0, 1, or 2, defining a heirarchy of HW Mul support.
+    # USE_HW_MUL can be 0, 1, or 2, defining a hierarchy of HW Mul support.
     CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high
     CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul
   endif
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 044bbe462c2c..919d2d58e6fa 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -362,19 +362,8 @@ asmlinkage void plat_irq_dispatch(void)
         unsigned int cpu = smp_processor_id();
         unsigned int pending;
 
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
-        /* Set compare to count to silence count/compare timer interrupts */
-        write_c0_compare(read_c0_count());
-#endif
-
         pending = read_c0_cause() & read_c0_status();
 
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
-        if (pending & CAUSEF_IP7)       /* Cpu performance counter interrupt */
-                sbprof_cpu_intr();
-        else
-#endif
-
         if (pending & CAUSEF_IP4)
                 do_IRQ(K_BCM1480_INT_TIMER_0 + cpu);
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 1e8a1e39dfe8..15a2510ee639 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -136,7 +136,7 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
          * As lv1_read_htab_entries() does not give us the RPN, we can
          * not synthesize the new hpte_r value here, and therefore can
          * not update the hpte with lv1_insert_htab_entry(), so we
-         * insted invalidate it and ask the caller to update it via
+         * instead invalidate it and ask the caller to update it via
          * ps3_hpte_insert() by returning a -1 value.
          */
         if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c
index e7f2940bd270..da031159e2b7 100644
--- a/arch/sparc/boot/btfixupprep.c
+++ b/arch/sparc/boot/btfixupprep.c
@@ -216,7 +216,7 @@ main1:
                 switch (buffer[nbase+3]) {
                 case 'f':
                         if (initval) {
-                                fprintf(stderr, "Cannot use pre-initalized fixups for calls\n%s\n", buffer);
+                                fprintf(stderr, "Cannot use pre-initialized fixups for calls\n%s\n", buffer);
                                 exit(1);
                         }
                         if (!strcmp (sect, "__ksymtab")) {
@@ -273,7 +273,7 @@ main1:
                         break;
                 case 'i':
                         if (initval) {
-                                fprintf(stderr, "Cannot use pre-initalized fixups for INT\n%s\n", buffer);
+                                fprintf(stderr, "Cannot use pre-initialized fixups for INT\n%s\n", buffer);
                                 exit(1);
                         }
                         if (strncmp (buffer + mode+9, "HI22      ", 10) && strncmp (buffer + mode+9, "LO10      ", 10)) {
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index c02cc692985c..0bcc5aeda998 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -460,7 +460,7 @@ static void lapic_timer_broadcast(const struct cpumask *mask)
 }
 
 /*
- * Setup the local APIC timer for this CPU. Copy the initilized values
+ * Setup the local APIC timer for this CPU. Copy the initialized values
  * of the boot CPU and register the clock event in the framework.
  */
 static void __cpuinit setup_APIC_timer(void)
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index b2e246037392..784360c0625c 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -20,7 +20,7 @@
 
 static void __init i386_default_early_setup(void)
 {
-        /* Initilize 32bit specific setup functions */
+        /* Initialize 32bit specific setup functions */
         x86_init.resources.probe_roms = probe_roms;
         x86_init.resources.reserve_resources = i386_reserve_resources;
         x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;