diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-20 08:59:41 +0000 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-20 08:59:41 +0000 |
| commit | 044399b2cb6ad2d7f63cfca945268853d7443a4d (patch) | |
| tree | 5f96eb307b0389ac0b919a4744a40862b615e9da /arch/um/include/kern_util.h | |
| parent | 901359256b2666f52a3a7d3f31927677e91b3a2a (diff) | |
| parent | 18a4144028f056b77d6576d4eb284246e9c7ea97 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/include/kern_util.h')
| -rw-r--r-- | arch/um/include/kern_util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index 8f4e46d677a..c649108a9e9 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h @@ -120,8 +120,10 @@ extern void machine_halt(void); extern int is_syscall(unsigned long addr); extern void arch_switch(void); extern void free_irq(unsigned int, void *); -extern int um_in_interrupt(void); extern int cpu(void); + +/* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */ +extern int __cant_sleep(void); extern void segv_handler(int sig, union uml_pt_regs *regs); extern void sigio_handler(int sig, union uml_pt_regs *regs); |