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

Commit c97beb47 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

[PATCH] x86_64 irq: Fix comments after changing IRQ0_VECTOR from 0x20 to 0x30 



Signed-off-by: default avatarYinghai Lu <yinghai.lu@amd.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 190a4408

arch/x86_64/kernel/i8259.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


/*

 * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts:

 * (these are usually mapped to vectors 0x20-0x2f)

 * (these are usually mapped to vectors 0x30-0x3f)

 */



/*
@@ -299,7 +299,7 @@ void init_8259A(int auto_eoi) 
	 * outb_p - this has to work on a wide range of PC hardware.

	 */

	outb_p(0x11, 0x20);	/* ICW1: select 8259A-1 init */

	outb_p(IRQ0_VECTOR, 0x21);	/* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */

	outb_p(IRQ0_VECTOR, 0x21);	/* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */

	outb_p(0x04, 0x21);	/* 8259A-1 (the master) has a slave on IR2 */

	if (auto_eoi)

		outb_p(0x03, 0x21);	/* master does Auto EOI */
@@ -307,7 +307,7 @@ void init_8259A(int auto_eoi) 
		outb_p(0x01, 0x21);	/* master expects normal EOI */



	outb_p(0x11, 0xA0);	/* ICW1: select 8259A-2 init */

	outb_p(IRQ8_VECTOR, 0xA1);	/* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */

	outb_p(IRQ8_VECTOR, 0xA1);	/* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */

	outb_p(0x02, 0xA1);	/* 8259A-2 is a slave on master's IR2 */

	outb_p(0x01, 0xA1);	/* (slave's support for AEOI in flat mode

				    is to be investigated) */

include/asm-x86_64/hw_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define IRQ_MOVE_CLEANUP_VECTOR	FIRST_EXTERNAL_VECTOR

 

/*

 * Vectors 0x20-0x2f are used for ISA interrupts.

 * Vectors 0x30-0x3f are used for ISA interrupts.

 */

#define IRQ0_VECTOR		FIRST_EXTERNAL_VECTOR + 0x10

#define IRQ1_VECTOR		IRQ0_VECTOR + 1