diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-sparc | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/atops.h | 24 | ||||
| -rw-r--r-- | include/asm-sparc/hdreg.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/processor.h | 3 |
3 files changed, 4 insertions, 27 deletions
diff --git a/include/asm-sparc/atops.h b/include/asm-sparc/atops.h deleted file mode 100644 index 30bdf0fb7..000000000 --- a/include/asm-sparc/atops.h +++ /dev/null @@ -1,24 +0,0 @@ -/* atops.h: Atomic SPARC operations. - * - * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) - */ -#ifndef _SPARC_ATOPS_H -#define _SPARC_ATOPS_H - -#include <linux/config.h> - -#ifdef CONFIG_SMP - -extern __inline__ __volatile__ unsigned char ldstub(volatile unsigned char *lock) -{ - volatile unsigned char retval; - - __asm__ __volatile__("ldstub [%1], %0\n\t" : - "=&r" (retval) : - "r" (lock)); - return retval; -} - -#endif - -#endif diff --git a/include/asm-sparc/hdreg.h b/include/asm-sparc/hdreg.h index 1c321c3e7..8df7a4693 100644 --- a/include/asm-sparc/hdreg.h +++ b/include/asm-sparc/hdreg.h @@ -1,4 +1,4 @@ -/* $Id: hdreg.h,v 1.1 2000/01/21 04:56:27 zaitcev Exp $ +/* $Id: hdreg.h,v 1.2 2000/12/05 00:56:36 anton Exp $ * hdreg.h: SPARC PCI specific IDE glue. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -8,6 +8,6 @@ #ifndef __SPARC_HDREG_H #define __SPARC_HDREG_H -typedef unsigned int ide_ioreg_t; +typedef unsigned long ide_ioreg_t; #endif /* __SPARC_HDREG_H */ diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h index 278c15c80..41b96727a 100644 --- a/include/asm-sparc/processor.h +++ b/include/asm-sparc/processor.h @@ -1,4 +1,4 @@ -/* $Id: processor.h,v 1.77 2000/01/21 11:39:17 jj Exp $ +/* $Id: processor.h,v 1.78 2000/11/30 08:37:31 anton Exp $ * include/asm-sparc/processor.h * * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu) @@ -90,6 +90,7 @@ struct thread_struct { #define SPARC_FLAG_KTHREAD 0x1 /* task is a kernel thread */ #define SPARC_FLAG_UNALIGNED 0x2 /* is allowed to do unaligned accesses */ +#define SPARC_FLAG_MMAPSHARED 0x4 /* task wants a shared mmap */ #define INIT_MMAP { &init_mm, (0), (0), \ NULL, __pgprot(0x0) , VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL } |