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

Commit c6fee081 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Fix build errors with gcc-4.6.0 



Most of the warnings emitted (we fail arch/sparc file
builds with -Werror) were legitimate but harmless, however
one case (n2_pcr_write) was a genuine bug.

Based almost entirely upon a patch by Sam Ravnborg.

Reported-by: default avatarDennis Gilmore <dennis@ausil.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0399bb5b

arch/sparc/kernel/iommu.c

+0 −3
Original line number Diff line number Diff line
@@ -333,13 +333,10 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, 
				 void *cpu, dma_addr_t dvma)

{

	struct iommu *iommu;

	iopte_t *iopte;

	unsigned long flags, order, npages;



	npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;

	iommu = dev->archdata.iommu;

	iopte = iommu->page_table +

		((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT);



	spin_lock_irqsave(&iommu->lock, flags);

arch/sparc/kernel/ldc.c

+18 −10
Original line number Diff line number Diff line
@@ -790,13 +790,17 @@ static void send_events(struct ldc_channel *lp, unsigned int event_mask) 
static irqreturn_t ldc_rx(int irq, void *dev_id)

{

	struct ldc_channel *lp = dev_id;

	unsigned long orig_state, hv_err, flags;

	unsigned long orig_state, flags;

	unsigned int event_mask;



	spin_lock_irqsave(&lp->lock, flags);



	orig_state = lp->chan_state;

	hv_err = sun4v_ldc_rx_get_state(lp->id,



	/* We should probably check for hypervisor errors here and

	 * reset the LDC channel if we get one.

	 */

	sun4v_ldc_rx_get_state(lp->id,

			       &lp->rx_head,

			       &lp->rx_tail,

			       &lp->chan_state);
@@ -904,13 +908,17 @@ out: 
static irqreturn_t ldc_tx(int irq, void *dev_id)

{

	struct ldc_channel *lp = dev_id;

	unsigned long flags, hv_err, orig_state;

	unsigned long flags, orig_state;

	unsigned int event_mask = 0;



	spin_lock_irqsave(&lp->lock, flags);



	orig_state = lp->chan_state;

	hv_err = sun4v_ldc_tx_get_state(lp->id,



	/* We should probably check for hypervisor errors here and

	 * reset the LDC channel if we get one.

	 */

	sun4v_ldc_tx_get_state(lp->id,

			       &lp->tx_head,

			       &lp->tx_tail,

			       &lp->chan_state);

arch/sparc/kernel/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus) 
		 * humanoid.

		 */

		err = sysfs_create_file(&dev->dev.kobj, &dev_attr_obppath.attr);

		(void) err;

	}

	list_for_each_entry(child_bus, &bus->children, node)

		pci_bus_register_of_sysfs(child_bus);

arch/sparc/kernel/pci_common.c

+7 −4
Original line number Diff line number Diff line
@@ -295,12 +295,15 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn, 
	unsigned int bus = bus_dev->number;

	unsigned int device = PCI_SLOT(devfn);

	unsigned int func = PCI_FUNC(devfn);

	unsigned long ret;



	if (config_out_of_range(pbm, bus, devfn, where)) {

		/* Do nothing. */

	} else {

		ret = pci_sun4v_config_put(devhandle,

		/* We don't check for hypervisor errors here, but perhaps

		 * we should and influence our return value depending upon

		 * what kind of error is thrown.

		 */

		pci_sun4v_config_put(devhandle,

				     HV_PCI_DEVICE_BUILD(bus, device, func),

				     where, size, value);

	}

arch/sparc/kernel/pci_fire.c

+0 −2
Original line number Diff line number Diff line
@@ -214,11 +214,9 @@ static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid, 


static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)

{

	unsigned long msiqid;

	u64 val;



	val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));

	msiqid = (val & MSI_MAP_EQNUM);



	val &= ~MSI_MAP_VALID;