Correct some spelling typo in comments
Xie XiuQi (3):
irq: fix some trivial typos in comments
mm: fix some trivial typos in comments
timekeeping: Fix some trivial typos in comments.
kernel/irq/chip.c | 2 +-
kernel/irq/manage.c | 2 +-
kernel/time/timekeeping.c | 3 ++-
mm/slub.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
--
1.7.7
Signed-off-by: Xie XiuQi <[email protected]>
---
kernel/irq/chip.c | 2 +-
kernel/irq/manage.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a3bb14f..dc04c16 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -214,7 +214,7 @@ void irq_enable(struct irq_desc *desc)
}
/**
- * irq_disable - Mark interupt disabled
+ * irq_disable - Mark interrupt disabled
* @desc: irq descriptor which should be disabled
*
* If the chip does not implement the irq_disable callback, we
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 514bcfd..6394a3c 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -786,7 +786,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
}
/*
- * Interrupts explicitely requested as threaded interupts want to be
+ * Interrupts explicitely requested as threaded interrupts want to be
* preemtible - many of them need to sleep and wait for slow busses to
* complete.
*/
--
1.7.7
Signed-off-by: Xie XiuQi <[email protected]>
---
mm/slub.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index c3eb3d3..c9aa8d4 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -955,7 +955,7 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x)
kmemleak_free_recursive(x, s->flags);
/*
- * Trouble is that we may no longer disable interupts in the fast path
+ * Trouble is that we may no longer disable interrupts in the fast path
* So in order to make the debug calls that expect irqs to be
* disabled we need to disable interrupts temporarily.
*/
--
1.7.7
Signed-off-by: Xie XiuQi <[email protected]>
---
kernel/time/timekeeping.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 947ba25..3abf534 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1613,9 +1613,10 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
* ktime_get_update_offsets - hrtimer helper
* @offs_real: pointer to storage for monotonic -> realtime offset
* @offs_boot: pointer to storage for monotonic -> boottime offset
+ * @offs_tai: pointer to storage for monotonic -> clock tai offset
*
* Returns current monotonic time and updates the offsets
- * Called from hrtimer_interupt() or retrigger_next_event()
+ * Called from hrtimer_interrupt() or retrigger_next_event()
*/
ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot,
ktime_t *offs_tai)
--
1.7.7
On 10/17/13 18:12, Xie XiuQi wrote:
> Signed-off-by: Xie XiuQi <[email protected]>
> ---
> kernel/irq/chip.c | 2 +-
> kernel/irq/manage.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
> index a3bb14f..dc04c16 100644
> --- a/kernel/irq/chip.c
> +++ b/kernel/irq/chip.c
> @@ -214,7 +214,7 @@ void irq_enable(struct irq_desc *desc)
> }
>
> /**
> - * irq_disable - Mark interupt disabled
> + * irq_disable - Mark interrupt disabled
> * @desc: irq descriptor which should be disabled
> *
> * If the chip does not implement the irq_disable callback, we
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index 514bcfd..6394a3c 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -786,7 +786,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
> }
>
> /*
> - * Interrupts explicitely requested as threaded interupts want to be
> + * Interrupts explicitely requested as threaded interrupts want to be
explicitly
> * preemtible - many of them need to sleep and wait for slow busses to
> * complete.
> */
>
--
~Randy
On Thu, 17 Oct 2013, Randy Dunlap wrote:
> > ---
> > kernel/irq/chip.c | 2 +-
> > kernel/irq/manage.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
> > index a3bb14f..dc04c16 100644
> > --- a/kernel/irq/chip.c
> > +++ b/kernel/irq/chip.c
> > @@ -214,7 +214,7 @@ void irq_enable(struct irq_desc *desc)
> > }
> >
> > /**
> > - * irq_disable - Mark interupt disabled
> > + * irq_disable - Mark interrupt disabled
> > * @desc: irq descriptor which should be disabled
> > *
> > * If the chip does not implement the irq_disable callback, we
> > diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> > index 514bcfd..6394a3c 100644
> > --- a/kernel/irq/manage.c
> > +++ b/kernel/irq/manage.c
> > @@ -786,7 +786,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
> > }
> >
> > /*
> > - * Interrupts explicitely requested as threaded interupts want to be
> > + * Interrupts explicitely requested as threaded interrupts want to be
>
> explicitly
I have fixed this one and applied the series.
--
Jiri Kosina
SUSE Labs
On 10/17/2013 06:13 PM, Xie XiuQi wrote:
> Signed-off-by: Xie XiuQi <[email protected]>
> ---
> kernel/time/timekeeping.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index 947ba25..3abf534 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -1613,9 +1613,10 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
> * ktime_get_update_offsets - hrtimer helper
> * @offs_real: pointer to storage for monotonic -> realtime offset
> * @offs_boot: pointer to storage for monotonic -> boottime offset
> + * @offs_tai: pointer to storage for monotonic -> clock tai offset
> *
> * Returns current monotonic time and updates the offsets
> - * Called from hrtimer_interupt() or retrigger_next_event()
> + * Called from hrtimer_interrupt() or retrigger_next_event()
> */
> ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot,
> ktime_t *offs_tai)
Even though its trivial, next time please add some sort of commit
message, even if its redundent to the commit subject.
Queued in my 3.13 branch.
thanks
-john
Acked-by: Christoph Lameter <[email protected]>