Commit 9f09069c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of https://github.com/openrisc/linux 

Pull OpenRISC fixes from Stafford Horne:
 "Fixups for OpenRISC found during recent testing:

   - An OpenRISC irqchip fix to stop acking level interrupts which was
     causing issues on SMP platforms

   - A comment typo fix in our unwinder code"

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: unwinder: Fix grammar issue in comment
  irqchip: or1k-pic: Undefine mask_ack for level triggered hardware
parents c3850b3f 48bddb89

arch/openrisc/kernel/unwinder.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct or1k_frameinfo { 
/*

 * Verify a frameinfo structure.  The return address should be a valid text

 * address.  The frame pointer may be null if its the last frame, otherwise

 * the frame pointer should point to a location in the stack after the the

 * the frame pointer should point to a location in the stack after the

 * top of the next frame up.

 */

static inline int or1k_frameinfo_valid(struct or1k_frameinfo *frameinfo)

drivers/irqchip/irq-or1k-pic.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static struct or1k_pic_dev or1k_pic_level = { 
		.name = "or1k-PIC-level",

		.irq_unmask = or1k_pic_unmask,

		.irq_mask = or1k_pic_mask,

		.irq_mask_ack = or1k_pic_mask_ack,

	},

	.handle = handle_level_irq,

	.flags = IRQ_LEVEL | IRQ_NOPROBE,