diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-21 18:37:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-21 18:37:55 +1000 |
| commit | 81dced6084b86de118187883453e3a42e34d3838 (patch) | |
| tree | 9dc06286b9c79feb3f2dd2030b6f05c53e13e1d5 | |
| parent | 1a8b1ff4d8c5d6dd467f102eee4c056e439e5edd (diff) | |
| parent | f0d62b8ea39c029a11aaa4c6ed11ed73eb126366 (diff) | |
| download | linux-81dced6084b86de118187883453e3a42e34d3838.tar.gz linux-81dced6084b86de118187883453e3a42e34d3838.tar.xz | |
Merge branch 'akpm/master'
| -rw-r--r-- | arch/unicore32/kernel/fpu-ucf64.c | 4 | ||||
| -rw-r--r-- | drivers/w1/w1_int.c | 3 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/unicore32/kernel/fpu-ucf64.c b/arch/unicore32/kernel/fpu-ucf64.c index 282a60ac82ba..a53343a90ca2 100644 --- a/arch/unicore32/kernel/fpu-ucf64.c +++ b/arch/unicore32/kernel/fpu-ucf64.c @@ -90,8 +90,8 @@ void ucf64_exchandler(u32 inst, u32 fpexc, struct pt_regs *regs) tmp &= ~(FPSCR_CON); exc &= ~(FPSCR_CMPINSTR_BIT | FPSCR_CON); } else { - pr_debug(KERN_ERR "UniCore-F64 Error: unhandled exceptions\n"); - pr_debug(KERN_ERR "UniCore-F64 FPSCR 0x%08x INST 0x%08x\n", + pr_debug("UniCore-F64 Error: unhandled exceptions\n"); + pr_debug("UniCore-F64 FPSCR 0x%08x INST 0x%08x\n", cff(FPSCR), inst); ucf64_raise_sigfpe(0, regs); diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 47249a30eae3..20f766afa4c7 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -91,8 +91,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, err = device_register(&dev->dev); if (err) { pr_err("Failed to register master device. err=%d\n", err); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); + put_device(&dev->dev); dev = NULL; } diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index c099b082cd02..5a3f76f8cdfe 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -195,14 +195,14 @@ static int console_may_schedule; * need to be changed in the future, when the requirements change. * * /dev/kmsg exports the structured data in the following line format: - * "level,sequnum,timestamp;<message text>\n" + * "level,sequnum,timestamp[,additional_values, ... ];<message text>\n" + * + * Users of the export format should ignore possible additional values + * separated by ',', and find the message after the ';' character. * * The optional key/value pairs are attached as continuation lines starting * with a space character and terminated by a newline. All possible * non-prinatable characters are escaped in the "\xff" notation. - * - * Users of the export format should ignore possible additional values - * separated by ',', and find the message after the ';' character. */ enum log_flags { |