diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:16:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:16:58 +1100 |
| commit | 6a880665bee45f8256c829e2ca91cc66836ddcd8 (patch) | |
| tree | 55ac0298b8d9dd4877aad807b5734f5404b9c5e5 /kernel | |
| parent | 4ea24627ec27816c588ddd8f2628eaaacf59db00 (diff) | |
| parent | 6232ff0d7332a50af0d9e738814b329c9f1f47ad (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/chip.c | 4 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 2 | ||||
| -rw-r--r-- | kernel/perf_event.c | 4 | ||||
| -rw-r--r-- | kernel/time/clocksource.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index c1660194d115..ae70e93b29b5 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -166,11 +166,11 @@ int set_irq_data(unsigned int irq, void *data) EXPORT_SYMBOL(set_irq_data); /** - * set_irq_data - set irq type data for an irq + * set_irq_msi - set irq type data for an irq * @irq: Interrupt number * @entry: Pointer to MSI descriptor data * - * Set the hardware irq controller data for an irq + * Set the MSI descriptor entry for an irq */ int set_irq_msi(unsigned int irq, struct msi_desc *entry) { diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index bd7273e6282e..7a5894e87f24 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -232,7 +232,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, /* * If we are seeing only the odd spurious IRQ caused by * bus asynchronicity then don't eventually trigger an error, - * otherwise the couter becomes a doomsday timer for otherwise + * otherwise the counter becomes a doomsday timer for otherwise * working systems */ if (time_after(jiffies, desc->last_unhandled + HZ/10)) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 8f1e5642fce7..7c7da1ea9c27 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -419,7 +419,7 @@ static void perf_event_remove_from_context(struct perf_event *event) if (!task) { /* * Per cpu events are removed via an smp call and - * the removal is always sucessful. + * the removal is always successful. */ smp_call_function_single(event->cpu, __perf_event_remove_from_context, @@ -827,7 +827,7 @@ perf_install_in_context(struct perf_event_context *ctx, if (!task) { /* * Per cpu events are installed via an smp call and - * the install is always sucessful. + * the install is always successful. */ smp_call_function_single(cpu, __perf_install_in_context, event, 1); diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 4a310906b3e8..94fea4212601 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -580,7 +580,7 @@ sysfs_show_current_clocksources(struct sys_device *dev, * @count: length of buffer * * Takes input from sysfs interface for manually overriding the default - * clocksource selction. + * clocksource selection. */ static ssize_t sysfs_override_clocksource(struct sys_device *dev, struct sysdev_attribute *attr, |