Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e38be1b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f2427917 4c332c32

arch/ia64/configs/generic_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/ia64/hp/common/sba_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

arch/ia64/kernel/mca.c

+2 −2
Original line number Diff line number Diff line
@@ -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;