Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (b4dfd6bc) · Commits · 戴 / test

arch/ia64/kernel/msi_ia64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ int ia64_setup_msi_irq(struct pci_dev pdev, struct msi_desc desc)

		set_irq_msi(irq, desc);
		dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map));
		vector = irq;
		vector = irq_to_vector(irq);

		msg.address_hi = 0;
		msg.address_lo =
		@@ -110,7 +110,7 @@ static void ia64_ack_msi_irq(unsigned int irq)

		static int ia64_msi_retrigger_irq(unsigned int irq)
		{
		unsigned int vector = irq;
		unsigned int vector = irq_to_vector(irq);
		ia64_resend_irq(vector);

		return 1;

+1 −1

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ show_cpuinfo (struct seq_file m, void v)
		"features : %s\n"
		"cpu number : %lu\n"
		"cpu regs : %u\n"
		"cpu MHz : %lu.%06lu\n"
		"cpu MHz : %lu.%03lu\n"
		"itc MHz : %lu.%06lu\n"
		"BogoMIPS : %lu.%02lu\n",
		cpunum, c->vendor, c->family, c->model,

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
		* There are errors which still need to be cleaned up by
		* hubiio_crb_error_handler
		*/
		mod_timer(recovery_timer, HZ * 5);
		mod_timer(recovery_timer, jiffies + (HZ * 5));
		BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
		smp_processor_id()));
		return 1;
		@@ -95,7 +95,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
		icrbd.ii_icrb0_d_regval =
		REMOTE_HUB_L(nasid, IIO_ICRB_D(i));
		if (icrbd.d_bteop) {
		mod_timer(recovery_timer, HZ * 5);
		mod_timer(recovery_timer, jiffies + (HZ * 5));
		BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n",
		err_nodepda, smp_processor_id(),
		i));
		@@ -150,7 +150,7 @@ int shub2_bte_error_handler(unsigned long _nodepda)
		status = BTE_LNSTAT_LOAD(bte);
		if ((status & IBLS_ERROR) \|\| !(status & IBLS_BUSY))
		continue;
		mod_timer(recovery_timer, HZ * 5);
		mod_timer(recovery_timer, jiffies + (HZ * 5));
		BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
		smp_processor_id()));
		return 1;

+6 −2

Original line number	Diff line number	Diff line
		@@ -96,10 +96,14 @@ pcibr_dmamap_ate32(struct pcidev_info *info,
		}

		/*
		* If we're mapping for MSI, set the MSI bit in the ATE
		* If we're mapping for MSI, set the MSI bit in the ATE. If it's a
		* TIOCP based pci bus, we also need to set the PIO bit in the ATE.
		*/
		if (dma_flags & SN_DMA_MSI)
		if (dma_flags & SN_DMA_MSI) {
		ate \|= PCI32_ATE_MSI;
		if (IS_TIOCP_SOFT(pcibus_info))
		ate \|= PCI32_ATE_PIO;
		}

		ate_write(pcibus_info, ate_index, ate_count, ate);

+3 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#define IS_PCI_BRIDGE_ASIC(asic) (asic == PCIIO_ASIC_TYPE_PIC \|\| \
		asic == PCIIO_ASIC_TYPE_TIOCP)
		#define IS_PIC_SOFT(ps) (ps->pbi_bridge_type == PCIBR_BRIDGETYPE_PIC)
		#define IS_TIOCP_SOFT(ps) (ps->pbi_bridge_type == PCIBR_BRIDGETYPE_TIOCP)


		/*
		@@ -53,8 +54,8 @@
		* Bridge PMU Address Transaltion Entry Attibutes
		*/
		#define PCI32_ATE_V (0x1 << 0)
		#define PCI32_ATE_CO (0x1 << 1)
		#define PCI32_ATE_PREC (0x1 << 2)
		#define PCI32_ATE_CO (0x1 << 1) /* PIC ASIC ONLY */
		#define PCI32_ATE_PIO (0x1 << 1) /* TIOCP ASIC ONLY */
		#define PCI32_ATE_MSI (0x1 << 2)
		#define PCI32_ATE_PREF (0x1 << 3)
		#define PCI32_ATE_BAR (0x1 << 4)