diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 18:29:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 18:29:53 +1000 |
| commit | a00a5370cc0d4a9552e2cf1d9b790bf2ad0bd099 (patch) | |
| tree | bbba76bcc38315b0a3a55536d1a4a25f57e19e3e | |
| parent | e0f3deb831a6d9284ff3b512d2e06f2f00c09c63 (diff) | |
| parent | 5a47c654eb92019d0af27f9396adbc5f54412b30 (diff) | |
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 { |