diff options
| author | Linus Torvalds | 2014-04-01 00:01:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-01 00:01:16 +0200 |
| commit | e38be1b1066687204b05b6a46a2018806c7281de (patch) | |
| tree | d0210ff404d7726aabcaa6abe6ad5f712ad6dcff /arch/ia64/kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
| parent | [IA64] Keep format strings from leaking into printk (diff) | |
| download | kernel-qcow2-linux-e38be1b1066687204b05b6a46a2018806c7281de.tar.gz kernel-qcow2-linux-e38be1b1066687204b05b6a46a2018806c7281de.tar.xz kernel-qcow2-linux-e38be1b1066687204b05b6a46a2018806c7281de.zip | |
Merge tag 'please-pull-misc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 updates from Tony Luck:
"Miscellaneous ia64 fixes for 3.15 merge window"
* tag 'please-pull-misc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Keep format strings from leaking into printk
Fix warning in make defconfig
[IA64] sba_iommu: fix section mismatch To: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index b8edfa75a83f..601502ab7141 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -217,7 +217,7 @@ void ia64_mca_printk(const char *fmt, ...) /* Copy the output into mlogbuf */ if (oops_in_progress) { /* mlogbuf was abandoned, use printk directly instead. */ - printk(temp_buf); + printk("%s", temp_buf); } else { spin_lock(&mlogbuf_wlock); for (p = temp_buf; *p; p++) { @@ -268,7 +268,7 @@ void ia64_mlogbuf_dump(void) } *p = '\0'; if (temp_buf[0]) - printk(temp_buf); + printk("%s", temp_buf); mlogbuf_start = index; mlogbuf_timestamp = 0; |