mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Miscellaneous ia64 fixes for 3.15 merge window 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTOZCNAAoJEKurIx+X31iBc38QAIN62vAMv3YFhXnsgUa+czNk
 Tuw+tIhrnp9ApBS8N5hdZM4L7/aHSvWeVAiTyf7JasVMLnStu3qIGc7Wkyjx0k/w
 kSWC/HuEbEu2JNAZXG4UJqD7heVYnZPPRYxEh/eL3LHF6UXa5eqzNkJFrMHc31Ho
 fM8FbdLEJtgPxKjSZ9gplbXhgYJMbaeM7vBRhI+DZoXtBOFNCIjwxGqWcFkcZkdU
 e0vEKDn/Xv7uyt5WXjE1Zc6uhT2mAiBFDX9KqzZXEH1cdwzhyMrgDFKFWwQbg+4/
 X/RaNlE23R86gGihoZAQsZvKi23tFDooDn143bsw9VyoxtjArV1zpeePHF3mVyKF
 i6M8iU0+Rr9/E58/VljSW8kxvRPBmepm6OS4/dj7MsvSQVzQ0rsWatDqJej3Fq/I
 MLgjMC6V6V7S97eKGNqQpN37ZK3T4Gtha3o3RxBmQlaHKAfc9f4DBtFhbYzN3Fzb
 wOiWLR9ayLdaWSVZqM/g5IR1Hd7SvG+wkLNabauYrnovThG0kCFXX4Vki03YcFGu
 17pqQptVBFxFNDYKIEKMlNTMJ82SH32ZFDw7Wcqyux7RmO1W79yyartDDwwRMwfN
 5rJxQHU33uUgh4viGkTeq/cPqM3F231lyoGjtTdat/2Wcq5t7gCd4FI+9S6vdOrF
 WAIMhg9QDGVs9LWvJmfx
 =MThB
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-03-31 15:01:16 -07:00
parent f24279172d 4c332c3238
commit e38be1b106
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/configs/generic_defconfig
View File

@ -30,9 +30,9 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_CONTAINER=y
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y

6
arch/ia64/hp/common/sba_iommu.c
View File

@ -1596,7 +1596,7 @@ static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
*
***************************************************************/
static void __init
static void
ioc_iova_init(struct ioc *ioc)
{
int tcnfg;
@ -1807,7 +1807,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
{ SX2000_IOC_ID, "sx2000", NULL },
};
static struct ioc * __init
static struct ioc *
ioc_init(unsigned long hpa, void *handle)
{
struct ioc *ioc;
@ -2041,7 +2041,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
#define sba_map_ioc_to_node(ioc, handle)
#endif
static int __init
static int
acpi_sba_ioc_add(struct acpi_device *device,
const struct acpi_device_id *not_used)
{

4
arch/ia64/kernel/mca.c
View File

@ -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;