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

Commit 03b979dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 updates from Tony Luck:
 "A bunch of cleanups from Matt and some dead code removal from
  Anna-Maria"

* tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64/unaligned: Silence another GCC warning about an uninitialised variable
  ia64/traps: Silence GCC warning about uninitialised variable
  ia64: Reduce stack usage by iterating over nodemask
  ia64/PCI: Remove unused 'addr' and fix build warning
  ia64/PCI: Fix incorrect PCI resource end address
  ia64: Remove superfluous SMP function call
parents e9ad9b9b 787ca32d

arch/ia64/kernel/mca.c

+1 −4
Original line number Diff line number Diff line
@@ -1904,13 +1904,10 @@ static int mca_cpu_callback(struct notifier_block *nfb, 
				      unsigned long action,

				      void *hcpu)

{

	int hotcpu = (unsigned long) hcpu;



	switch (action) {

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

		smp_call_function_single(hotcpu, ia64_mca_cmc_vector_adjust,

					 NULL, 0);

		ia64_mca_cmc_vector_adjust(NULL);

		break;

	}

	return NOTIFY_OK;

arch/ia64/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, 
			return;

		}

		switch (vector) {

		      default:

		      case 29:

			siginfo.si_code = TRAP_HWBKPT;

#ifdef CONFIG_ITANIUM

arch/ia64/kernel/unaligned.c

+1 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,7 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs) 
	 * extract the instruction from the bundle given the slot number

	 */

	switch (ipsr->ri) {

	      default:

	      case 0: u.l = (bundle[0] >>  5); break;

	      case 1: u.l = (bundle[0] >> 46) | (bundle[1] << 18); break;

	      case 2: u.l = (bundle[1] >> 23); break;

arch/ia64/sn/kernel/io_acpi_init.c

+0 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
void

sn_acpi_slot_fixup(struct pci_dev *dev)

{

	void __iomem *addr;

	struct pcidev_info *pcidev_info = NULL;

	struct sn_irq_info *sn_irq_info = NULL;

	struct resource *res;

arch/ia64/sn/kernel/io_init.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ sn_io_slot_fixup(struct pci_dev *dev) 
{

	int idx;

	struct resource *res;

	unsigned long addr, size;

	unsigned long size;

	struct pcidev_info *pcidev_info;

	struct sn_irq_info *sn_irq_info;

	int status;
@@ -186,7 +186,7 @@ sn_io_slot_fixup(struct pci_dev *dev) 
			continue;



		res->start = pcidev_info->pdi_pio_mapped_addr[idx];

		res->end = addr + size;

		res->end = res->start + size;



		/*

		 * if it's already in the device structure, remove it before