diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /include/asm-sparc64 | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/fcntl.h | 8 | ||||
| -rw-r--r-- | include/asm-sparc64/irq.h | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h index a55386944..cd8cc2124 100644 --- a/include/asm-sparc64/fcntl.h +++ b/include/asm-sparc64/fcntl.h @@ -22,10 +22,10 @@ #define O_LARGEFILE 0x40000 #define F_DUPFD 0 /* dup */ -#define F_GETFD 1 /* get f_flags */ -#define F_SETFD 2 /* set f_flags */ -#define F_GETFL 3 /* more flags (cloexec) */ -#define F_SETFL 4 +#define F_GETFD 1 /* get close_on_exec */ +#define F_SETFD 2 /* set/clear close_on_exec */ +#define F_GETFL 3 /* get file->f_flags */ +#define F_SETFL 4 /* set file->f_flags */ #define F_GETOWN 5 /* for sockets. */ #define F_SETOWN 6 /* for sockets. */ #define F_GETLK 7 diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h index 111ad568b..c5c3a2fc3 100644 --- a/include/asm-sparc64/irq.h +++ b/include/asm-sparc64/irq.h @@ -1,4 +1,4 @@ -/* $Id: irq.h,v 1.18 2000/05/09 17:40:15 davem Exp $ +/* $Id: irq.h,v 1.19 2000/06/26 19:40:27 davem Exp $ * irq.h: IRQ registers on the 64-bit Sparc. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -42,10 +42,10 @@ struct ino_bucket { /* Miscellaneous flags. */ /*0x06*/unsigned char flags; - /* Unused right now, but we will use it for proper - * enable_irq()/disable_irq() nesting. + /* This is used to deal with IBF_DMA_SYNC on + * Sabre systems. */ -/*0x07*/unsigned char __unused; +/*0x07*/unsigned char synctab_ent; /* Reference to handler for this IRQ. If this is * non-NULL this means it is active and should be @@ -69,6 +69,12 @@ struct ino_bucket { }; +#ifdef CONFIG_PCI +extern unsigned long pci_dma_wsync; +extern unsigned long dma_sync_reg_table[256]; +extern unsigned char dma_sync_reg_table_entry; +#endif + /* IMAP/ICLR register defines */ #define IMAP_VALID 0x80000000 /* IRQ Enabled */ #define IMAP_TID 0x7c000000 /* UPA TargetID */ |