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

Commit af3e565a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/vm86: Move the vm86 IRQ definitions to vm86.h 

Move vm86 specific definitions from irq_vectors.h to vm86.h.

Based on patch from Brian Gerst.

Originally-from: Brian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1438148483-11932-6-git-send-email-brgerst@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5ed92a8a

arch/x86/include/asm/irq_vectors.h

+0 −10
Original line number Diff line number Diff line
@@ -117,16 +117,6 @@ 


#define FPU_IRQ				  13



#define	FIRST_VM86_IRQ			   3

#define LAST_VM86_IRQ			  15



#ifndef __ASSEMBLY__

static inline int invalid_vm86_irq(int irq)

{

	return irq < FIRST_VM86_IRQ || irq > LAST_VM86_IRQ;

}

#endif



/*

 * Size the maximum number of interrupts.

 *

arch/x86/include/asm/vm86.h

+14 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ int handle_vm86_trap(struct kernel_vm86_regs *, long, int); 
void save_v86_state(struct kernel_vm86_regs *, int);



struct task_struct;

void release_vm86_irqs(struct task_struct *);



#define free_vm86(t) do {				\

	struct thread_struct *__t = (t);		\
@@ -59,6 +58,20 @@ void release_vm86_irqs(struct task_struct *); 
	}						\

} while (0)



/*

 * Support for VM86 programs to request interrupts for

 * real mode hardware drivers:

 */

#define FIRST_VM86_IRQ		 3

#define LAST_VM86_IRQ		15



static inline int invalid_vm86_irq(int irq)

{

	return irq < FIRST_VM86_IRQ || irq > LAST_VM86_IRQ;

}



void release_vm86_irqs(struct task_struct *);



#else



#define handle_vm86_fault(a, b)