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

Commit 8ae43ff8 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: mark forward_interrupts as being mode-specific 



Mark forward_interrupts as being tt-mode only.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bacf4549

arch/um/include/irq_user.h

+6 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#ifndef __IRQ_USER_H__

#define __IRQ_USER_H__



#include "uml-config.h"



struct irq_fd {

	struct irq_fd *next;

	void *id;
@@ -26,9 +28,12 @@ extern void free_irq_by_fd(int fd); 
extern void reactivate_fd(int fd, int irqnum);

extern void deactivate_fd(int fd, int irqnum);

extern int deactivate_all_fds(void);

extern void forward_interrupts(int pid);

extern int activate_ipi(int fd, int pid);

extern unsigned long irq_lock(void);

extern void irq_unlock(unsigned long flags);



#ifdef CONFIG_MODE_TT

extern void forward_interrupts(int pid);

#endif



#endif

arch/um/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ int deactivate_all_fds(void) 
	return 0;

}



#ifdef CONFIG_MODE_TT

void forward_interrupts(int pid)

{

	struct irq_fd *irq;
@@ -371,6 +372,7 @@ void forward_interrupts(int pid) 
	}

	irq_unlock(flags);

}

#endif



/*

 * do_IRQ handles all normal device IRQ's (the special