diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /include/asm-sparc64 | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/page.h | 5 | ||||
| -rw-r--r-- | include/asm-sparc64/smplock.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index 757f43c4d..7211c7d81 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h @@ -1,4 +1,4 @@ -/* $Id: page.h,v 1.32 2000/03/15 07:19:28 davem Exp $ */ +/* $Id: page.h,v 1.33 2000/03/22 02:48:04 davem Exp $ */ #ifndef _SPARC64_PAGE_H #define _SPARC64_PAGE_H @@ -96,8 +96,7 @@ typedef unsigned long iopgprot_t; #ifndef __ASSEMBLY__ /* Do prdele, look what happens to be in %g4... */ -register unsigned long page_offset asm("g4"); -#define PAGE_OFFSET page_offset +register unsigned long PAGE_OFFSET asm("g4"); #else #define PAGE_OFFSET 0xFFFFF80000000000 #endif diff --git a/include/asm-sparc64/smplock.h b/include/asm-sparc64/smplock.h index 5791e3c7a..6b3c900de 100644 --- a/include/asm-sparc64/smplock.h +++ b/include/asm-sparc64/smplock.h @@ -9,6 +9,8 @@ extern spinlock_t kernel_flag; +#define kernel_locked() spin_is_locked(&kernel_flag) + /* * Release global kernel lock and global interrupt lock */ |