From 6d3689f0a0c4ece1e3b13c014d574bd971b840c5 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Sat, 20 Oct 2007 01:09:42 +0200 Subject: [PATCH] --- yaml --- r: 71853 b: refs/heads/master c: 761a7e3544b8192c662d8b67913a353f6a014c08 h: refs/heads/master i: 71851: 8afbddc28ea746a2dc50c3bce215cb3722f5693d v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/irq.c | 2 +- trunk/arch/frv/kernel/semaphore.c | 2 +- trunk/arch/frv/kernel/time.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c36ddc1759ce..4966bcc9c798 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b4ff3304b52b18c490fc4deb400b61bb7ed142 +refs/heads/master: 761a7e3544b8192c662d8b67913a353f6a014c08 diff --git a/trunk/arch/frv/kernel/irq.c b/trunk/arch/frv/kernel/irq.c index 7ddb69089ed4..73abae767fdc 100644 --- a/trunk/arch/frv/kernel/irq.c +++ b/trunk/arch/frv/kernel/irq.c @@ -134,7 +134,7 @@ static struct irq_chip frv_cpu_pic = { }; /* - * handles all normal device IRQ's + * handles all normal device IRQs * - registers are referred to by the __frame variable (GR28) * - IRQ distribution is complicated in this arch because of the many PICs, the * way they work and the way they cascade diff --git a/trunk/arch/frv/kernel/semaphore.c b/trunk/arch/frv/kernel/semaphore.c index 8e182ced1a0f..7ee3a147b471 100644 --- a/trunk/arch/frv/kernel/semaphore.c +++ b/trunk/arch/frv/kernel/semaphore.c @@ -139,7 +139,7 @@ void __up(struct semaphore *sem) waiter = list_entry(sem->wait_list.next, struct sem_waiter, list); /* We must be careful not to touch 'waiter' after we set ->task = NULL. - * It is an allocated on the waiter's stack and may become invalid at + * It is allocated on the waiter's stack and may become invalid at * any time after that point (due to a wakeup from another source). */ list_del_init(&waiter->list); diff --git a/trunk/arch/frv/kernel/time.c b/trunk/arch/frv/kernel/time.c index e83e0bccfab9..925fb0199a0f 100644 --- a/trunk/arch/frv/kernel/time.c +++ b/trunk/arch/frv/kernel/time.c @@ -66,7 +66,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) /* * Here we are in the timer irq handler. We just have irqs locally * disabled but we don't know if the timer_bh is running on the other - * CPU. We need to avoid to SMP race with it. NOTE: we don' t need + * CPU. We need to avoid to SMP race with it. NOTE: we don't need * the irq version of write_lock because as just said we have irq * locally disabled. -arca */ @@ -126,7 +126,7 @@ void time_init(void) /* FIX by dqg : Set to zero for platforms that don't have tod */ /* without this time is undefined and can overflow time_t, causing */ - /* very stange errors */ + /* very strange errors */ year = 1980; mon = day = 1; hour = min = sec = 0;