Commit 6d24c8dc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] sparc64 pt_regs fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0d84438d

arch/sparc64/kernel/ebus.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void __ebus_dma_reset(struct ebus_dma_info *p, int no_drain) 
	}

}



static irqreturn_t ebus_dma_irq(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t ebus_dma_irq(int irq, void *dev_id)

{

	struct ebus_dma_info *p = dev_id;

	unsigned long flags;

arch/sparc64/kernel/irq.c

+4 −1
Original line number Diff line number Diff line
@@ -547,9 +547,11 @@ void timer_irq(int irq, struct pt_regs *regs) 
void handler_irq(int irq, struct pt_regs *regs)

{

	struct ino_bucket *bucket;

	struct pt_regs *old_regs;



	clear_softint(1 << irq);



	old_regs = set_irq_regs(regs);

	irq_enter();



	/* Sliiiick... */
@@ -558,12 +560,13 @@ void handler_irq(int irq, struct pt_regs *regs) 
		struct ino_bucket *next = __bucket(bucket->irq_chain);



		bucket->irq_chain = 0;

		__do_IRQ(bucket->virt_irq, regs);

		__do_IRQ(bucket->virt_irq);



		bucket = next;

	}



	irq_exit();

	set_irq_regs(old_regs);

}



struct sun5_timer {

arch/sparc64/kernel/pci_psycho.c

+3 −3
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static void psycho_check_iommu_error(struct pci_controller_info *p, 
#define  PSYCHO_UEAFSR_RESV2	0x00000000007fffffUL /* Reserved                     */

#define PSYCHO_UE_AFAR	0x0038UL



static irqreturn_t psycho_ue_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t psycho_ue_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_A.controller_regs + PSYCHO_UE_AFSR;
@@ -610,7 +610,7 @@ static irqreturn_t psycho_ue_intr(int irq, void *dev_id, struct pt_regs *regs) 
#define  PSYCHO_CEAFSR_RESV2	0x00000000007fffffUL /* Reserved                     */

#define PSYCHO_CE_AFAR	0x0040UL



static irqreturn_t psycho_ce_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t psycho_ce_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_A.controller_regs + PSYCHO_CE_AFSR;
@@ -735,7 +735,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm 
	return ret;

}



static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id)

{

	struct pci_pbm_info *pbm = dev_id;

	struct pci_controller_info *p = pbm->parent;

arch/sparc64/kernel/pci_sabre.c

+3 −3
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static void sabre_check_iommu_error(struct pci_controller_info *p, 
	spin_unlock_irqrestore(&iommu->lock, flags);

}



static irqreturn_t sabre_ue_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t sabre_ue_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_A.controller_regs + SABRE_UE_AFSR;
@@ -634,7 +634,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id, struct pt_regs *regs) 
	return IRQ_HANDLED;

}



static irqreturn_t sabre_ce_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t sabre_ce_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_A.controller_regs + SABRE_CE_AFSR;
@@ -726,7 +726,7 @@ static irqreturn_t sabre_pcierr_intr_other(struct pci_controller_info *p) 
	return ret;

}



static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg, afar_reg;

arch/sparc64/kernel/pci_schizo.c

+4 −4
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static void schizo_check_iommu_error(struct pci_controller_info *p, 
#define SCHIZO_UEAFSR_MTAG	0x000000000000e000UL /* Safari */

#define SCHIZO_UEAFSR_ECCSYND	0x00000000000001ffUL /* Safari */



static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t schizo_ue_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_B.controller_regs + SCHIZO_UE_AFSR;
@@ -603,7 +603,7 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs) 
#define SCHIZO_CEAFSR_MTAG	0x000000000000e000UL

#define SCHIZO_CEAFSR_ECCSYND	0x00000000000001ffUL



static irqreturn_t schizo_ce_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t schizo_ce_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	unsigned long afsr_reg = p->pbm_B.controller_regs + SCHIZO_CE_AFSR;
@@ -778,7 +778,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm) 
	return ret;

}



static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)

{

	struct pci_pbm_info *pbm = dev_id;

	struct pci_controller_info *p = pbm->parent;
@@ -933,7 +933,7 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg 
/* We only expect UNMAP errors here.  The rest of the Safari errors

 * are marked fatal and thus cause a system reset.

 */

static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id)

{

	struct pci_controller_info *p = dev_id;

	u64 errlog;