diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:36:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:36:47 -0700 |
commit | 375479c38689fbc403cf57b2999278615a4163f5 (patch) | |
tree | da9565f449ab769802bce0f69cb41e74c4dfb605 /arch/um/include/shared/irq_user.h | |
parent | 45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (diff) | |
parent | e40238dedb484c8a19f8257e4ef5d77d038f9ad8 (diff) | |
download | op-kernel-dev-375479c38689fbc403cf57b2999278615a4163f5.zip op-kernel-dev-375479c38689fbc403cf57b2999278615a4163f5.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- a new and faster epoll based IRQ controller and NIC driver
- misc fixes and janitorial updates
* git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
Fix vector raw inintialization logic
Migrate vector timers to new timer API
um: Compile with modern headers
um: vector: Fix an error handling path in 'vector_parse()'
um: vector: Fix a memory allocation check
um: vector: fix missing unlock on error in vector_net_open()
um: Add missing EXPORT for free_irq_by_fd()
High Performance UML Vector Network Driver
Epoll based IRQ controller
um: Use POSIX ucontext_t instead of struct ucontext
um: time: Use timespec64 for persistent clock
um: Restore symbol versions for __memcpy and memcpy
Diffstat (limited to 'arch/um/include/shared/irq_user.h')
-rw-r--r-- | arch/um/include/shared/irq_user.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h index df56330..a7a6120 100644 --- a/arch/um/include/shared/irq_user.h +++ b/arch/um/include/shared/irq_user.h @@ -7,6 +7,7 @@ #define __IRQ_USER_H__ #include <sysdep/ptrace.h> +#include <stdbool.h> struct irq_fd { struct irq_fd *next; @@ -15,10 +16,17 @@ struct irq_fd { int type; int irq; int events; - int current_events; + bool active; + bool pending; + bool purge; }; -enum { IRQ_READ, IRQ_WRITE }; +#define IRQ_READ 0 +#define IRQ_WRITE 1 +#define IRQ_NONE 2 +#define MAX_IRQ_TYPE (IRQ_NONE + 1) + + struct siginfo; extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs); |