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

Commit 47ad504c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Fix GSC PS/2 driver name for keyboard and mouse
  parisc: KittyHawk LCD fix
  parisc: convert the rest of the irq handlers to simple/percpu
  parisc: fix dino/gsc interrupts
  parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
parents 7b2a69ba 7bfbeae9

arch/parisc/kernel/irq.c

+2 −5
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ static void cpu_unmask_irq(unsigned int irq) 
	smp_send_all_nop();

}



void no_ack_irq(unsigned int irq) { }

void no_end_irq(unsigned int irq) { }



void cpu_ack_irq(unsigned int irq)

{

	unsigned long mask = EIEM_MASK(irq);
@@ -241,7 +238,7 @@ int cpu_claim_irq(unsigned int irq, struct irq_chip *type, void *data) 


	/* for iosapic interrupts */

	if (type) {

		set_irq_chip_and_handler(irq, type, handle_level_irq);

		set_irq_chip_and_handler(irq, type, handle_percpu_irq);

		set_irq_chip_data(irq, data);

		cpu_unmask_irq(irq);

	}
@@ -392,7 +389,7 @@ static void claim_cpu_irqs(void) 
	int i;

	for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) {

		set_irq_chip_and_handler(i, &cpu_interrupt_type,

			handle_level_irq);

					 handle_percpu_irq);

	}



	set_irq_handler(TIMER_IRQ, handle_percpu_irq);

arch/parisc/kernel/signal.c

+1 −8
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ void 
sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)

{

	struct rt_sigframe __user *frame;

	struct siginfo si;

	sigset_t set;

	unsigned long usp = (regs->gr[30] & ~(0x01UL));

	unsigned long sigframe_size = PARISC_RT_SIGFRAME_SIZE;
@@ -178,13 +177,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall) 


give_sigsegv:

	DBG(1,"sys_rt_sigreturn: Sending SIGSEGV\n");

	si.si_signo = SIGSEGV;

	si.si_errno = 0;

	si.si_code = SI_KERNEL;

	si.si_pid = task_pid_vnr(current);

	si.si_uid = current_uid();

	si.si_addr = &frame->uc;

	force_sig_info(SIGSEGV, &si, current);

	force_sig(SIGSEGV, current);

	return;

}

drivers/input/serio/gscps2.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int __devinit gscps2_probe(struct parisc_device *dev) 
	gscps2_reset(ps2port);

	ps2port->id = readb(ps2port->addr + GSC_ID) & 0x0f;



	snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s",

	snprintf(serio->name, sizeof(serio->name), "gsc-ps2-%s",

		 (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse");

	strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys));

	serio->id.type		= SERIO_8042;

drivers/parisc/dino.c

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ static struct irq_chip dino_interrupt_type = { 
	.name	= "GSC-PCI",

	.unmask	= dino_unmask_irq,

	.mask	= dino_mask_irq,

	.ack	= no_ack_irq,

};

drivers/parisc/eisa.c

+1 −2
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static struct irq_chip eisa_interrupt_type = { 
	.name	=	"EISA",

	.unmask	=	eisa_unmask_irq,

	.mask	=	eisa_mask_irq,

	.ack	=	no_ack_irq,

};



static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
@@ -340,7 +339,7 @@ static int __init eisa_probe(struct parisc_device *dev) 
	setup_irq(2, &irq2_action);

	for (i = 0; i < 16; i++) {

		set_irq_chip_and_handler(i, &eisa_interrupt_type,

			handle_level_irq);

					 handle_simple_irq);

	}

	

	EISA_bus = 1;