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

Commit 4bbffe71 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ac742d37 21199f27

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -117,6 +117,6 @@ handle_irq(int irq) 
	}



	irq_enter();

	generic_handle_irq_desc(irq, desc);

	generic_handle_irq_desc(desc);

	irq_exit();

}

arch/arc/kernel/mcip.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static struct irq_chip idu_irq_chip = { 


static int idu_first_irq;



static void idu_cascade_isr(unsigned int __core_irq, struct irq_desc *desc)

static void idu_cascade_isr(struct irq_desc *desc)

{

	struct irq_domain *domain = irq_desc_get_handler_data(desc);

	unsigned int core_irq = irq_desc_get_irq(desc);

arch/arm/common/it8152.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void it8152_init_irq(void) 
	}

}



void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)

void it8152_irq_demux(struct irq_desc *desc)

{

       int bits_pd, bits_lp, bits_ld;

       int i;

arch/arm/common/locomo.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static struct locomo_dev_info locomo_devices[] = { 
	},

};



static void locomo_handler(unsigned int __irq, struct irq_desc *desc)

static void locomo_handler(struct irq_desc *desc)

{

	struct locomo *lchip = irq_desc_get_chip_data(desc);

	int req, i;