diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/kprobes-test.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c index 1862d8f2fd44..0cd63d080c7b 100644 --- a/arch/arm/kernel/kprobes-test.c +++ b/arch/arm/kernel/kprobes-test.c | |||
@@ -1598,7 +1598,7 @@ static int __init run_all_tests(void) | |||
1598 | { | 1598 | { |
1599 | int ret = 0; | 1599 | int ret = 0; |
1600 | 1600 | ||
1601 | pr_info("Begining kprobe tests...\n"); | 1601 | pr_info("Beginning kprobe tests...\n"); |
1602 | 1602 | ||
1603 | #ifndef CONFIG_THUMB2_KERNEL | 1603 | #ifndef CONFIG_THUMB2_KERNEL |
1604 | 1604 | ||
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 342e378da1ec..1f3b3ef3e103 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -191,7 +191,7 @@ static irqreturn_t l2_ecc_err(int irq, void *dev_id) | |||
191 | { | 191 | { |
192 | int status; | 192 | int status; |
193 | 193 | ||
194 | printk(KERN_ERR "L2 ecc error happend\n"); | 194 | printk(KERN_ERR "L2 ecc error happened\n"); |
195 | status = bfin_read32(L2CTL0_STAT); | 195 | status = bfin_read32(L2CTL0_STAT); |
196 | if (status & 0x1) | 196 | if (status & 0x1) |
197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", | 197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", |