Commit e38be1b1066687204b05b6a46a2018806c7281de
Exists in
master
and in
13 other branches
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
Showing 3 changed files Side-by-side Diff
arch/ia64/configs/generic_defconfig
| ... | ... | @@ -30,9 +30,9 @@ |
| 30 | 30 | CONFIG_ACPI_FAN=m |
| 31 | 31 | CONFIG_ACPI_DOCK=y |
| 32 | 32 | CONFIG_ACPI_PROCESSOR=m |
| 33 | -CONFIG_ACPI_CONTAINER=m | |
| 33 | +CONFIG_ACPI_CONTAINER=y | |
| 34 | 34 | CONFIG_HOTPLUG_PCI=y |
| 35 | -CONFIG_HOTPLUG_PCI_ACPI=m | |
| 35 | +CONFIG_HOTPLUG_PCI_ACPI=y | |
| 36 | 36 | CONFIG_PACKET=y |
| 37 | 37 | CONFIG_UNIX=y |
| 38 | 38 | CONFIG_INET=y |
arch/ia64/hp/common/sba_iommu.c
| ... | ... | @@ -1596,7 +1596,7 @@ |
| 1596 | 1596 | * |
| 1597 | 1597 | ***************************************************************/ |
| 1598 | 1598 | |
| 1599 | -static void __init | |
| 1599 | +static void | |
| 1600 | 1600 | ioc_iova_init(struct ioc *ioc) |
| 1601 | 1601 | { |
| 1602 | 1602 | int tcnfg; |
| ... | ... | @@ -1807,7 +1807,7 @@ |
| 1807 | 1807 | { SX2000_IOC_ID, "sx2000", NULL }, |
| 1808 | 1808 | }; |
| 1809 | 1809 | |
| 1810 | -static struct ioc * __init | |
| 1810 | +static struct ioc * | |
| 1811 | 1811 | ioc_init(unsigned long hpa, void *handle) |
| 1812 | 1812 | { |
| 1813 | 1813 | struct ioc *ioc; |
| ... | ... | @@ -2041,7 +2041,7 @@ |
| 2041 | 2041 | #define sba_map_ioc_to_node(ioc, handle) |
| 2042 | 2042 | #endif |
| 2043 | 2043 | |
| 2044 | -static int __init | |
| 2044 | +static int | |
| 2045 | 2045 | acpi_sba_ioc_add(struct acpi_device *device, |
| 2046 | 2046 | const struct acpi_device_id *not_used) |
| 2047 | 2047 | { |
arch/ia64/kernel/mca.c
| ... | ... | @@ -217,7 +217,7 @@ |
| 217 | 217 | /* Copy the output into mlogbuf */ |
| 218 | 218 | if (oops_in_progress) { |
| 219 | 219 | /* mlogbuf was abandoned, use printk directly instead. */ |
| 220 | - printk(temp_buf); | |
| 220 | + printk("%s", temp_buf); | |
| 221 | 221 | } else { |
| 222 | 222 | spin_lock(&mlogbuf_wlock); |
| 223 | 223 | for (p = temp_buf; *p; p++) { |
| ... | ... | @@ -268,7 +268,7 @@ |
| 268 | 268 | } |
| 269 | 269 | *p = '\0'; |
| 270 | 270 | if (temp_buf[0]) |
| 271 | - printk(temp_buf); | |
| 271 | + printk("%s", temp_buf); | |
| 272 | 272 | mlogbuf_start = index; |
| 273 | 273 | |
| 274 | 274 | mlogbuf_timestamp = 0; |