diff options
| -rw-r--r-- | arch/arm/mach-netx/xc.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/drxk_hard.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/mx2_emmaprp.c | 2 | ||||
| -rw-r--r-- | drivers/remoteproc/remoteproc_elf_loader.c | 4 | ||||
| -rw-r--r-- | tools/perf/Documentation/perf-record.txt | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index e4cfb7e5361..f1c972d87ba 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -136,7 +136,7 @@ int xc_request_firmware(struct xc *x) if (head->magic != 0x4e657458) { if (head->magic == 0x5874654e) { dev_err(x->dev, - "firmware magic is 'XteN'. Endianess problems?\n"); + "firmware magic is 'XteN'. Endianness problems?\n"); ret = -ENODEV; goto exit_release_firmware; } diff --git a/arch/blackfin/mach-bf609/Kconfig b/arch/blackfin/mach-bf609/Kconfig index 101b33ee9bb..95a4f1b676c 100644 --- a/arch/blackfin/mach-bf609/Kconfig +++ b/arch/blackfin/mach-bf609/Kconfig @@ -56,7 +56,7 @@ config SEC_IRQ_PRIORITY_LEVELS default 7 range 0 7 help - Devide the total number of interrupt priority levels into sub-levels. + Divide the total number of interrupt priority levels into sub-levels. There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels. endmenu diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 8b4c6d5f8f3..df9abe83f87 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state) state->m_oscClockFreq = 20250; break; default: - printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); + printk(KERN_ERR "drxk: Clock Frequency is unknown\n"); return -EINVAL; } /* diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c index 8f22ce543cf..bfa65079fc3 100644 --- a/drivers/media/platform/mx2_emmaprp.c +++ b/drivers/media/platform/mx2_emmaprp.c @@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data) if (!curr_ctx->aborting) { if ((irqst & PRP_INTR_ST_RDERR) || (irqst & PRP_INTR_ST_CH2WERR)) { - pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); + pr_err("PrP bus error occurred, this transfer is probably corrupted\n"); writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c index e1f89d64973..0d36f94ab51 100644 --- a/drivers/remoteproc/remoteproc_elf_loader.c +++ b/drivers/remoteproc/remoteproc_elf_loader.c @@ -66,13 +66,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) return -EINVAL; } - /* We assume the firmware has the same endianess as the host */ + /* We assume the firmware has the same endianness as the host */ # ifdef __LITTLE_ENDIAN if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { # else /* BIG ENDIAN */ if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) { # endif - dev_err(dev, "Unsupported firmware endianess\n"); + dev_err(dev, "Unsupported firmware endianness\n"); return -EINVAL; } diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index b38a1f9ad46..938e8904f64 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -175,7 +175,7 @@ following filters are defined: + The option requires at least one branch type among any, any_call, any_ret, ind_call. -The privilege levels may be ommitted, in which case, the privilege levels of the associated +The privilege levels may be omitted, in which case, the privilege levels of the associated event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege levels are subject to permissions. When sampling on multiple events, branch stack sampling is enabled for all the sampling events. The sampled branch type is the same for all events. |