diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 21:34:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 21:34:29 +0000 |
| commit | 913c94403b96b4c381bd40f9588839612d71d2e9 (patch) | |
| tree | 810e669fed6232fa9d37f8ce830d046d319c9cf0 /include | |
| parent | 9f2b43b25e6ab17ac47b7754a157e01075cb5ba9 (diff) | |
Kill warnings in the 64-bit kernel.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips64/posix_types.h | 9 | ||||
| -rw-r--r-- | include/asm-mips64/processor.h | 40 |
2 files changed, 36 insertions, 13 deletions
diff --git a/include/asm-mips64/posix_types.h b/include/asm-mips64/posix_types.h index f6e527571..e1395fb5d 100644 --- a/include/asm-mips64/posix_types.h +++ b/include/asm-mips64/posix_types.h @@ -1,11 +1,10 @@ -/* $Id: posix_types.h,v 1.5 2000/02/29 20:49:16 ulfc Exp $ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 1996, 1997, 1998, 1999 by Ralf Baechle - * Copyright (C) 1999 Silicon Graphics, Inc. + * Copyright (C) 1996, 1997, 1998, 1999, 2000 by Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ #ifndef _ASM_POSIX_TYPES_H #define _ASM_POSIX_TYPES_H @@ -28,7 +27,7 @@ typedef int __kernel_gid_t; typedef unsigned long __kernel_size_t; typedef long __kernel_ssize_t; typedef long __kernel_ptrdiff_t; -typedef int __kernel_time_t; +typedef long __kernel_time_t; typedef long __kernel_suseconds_t; typedef long __kernel_clock_t; typedef long __kernel_daddr_t; diff --git a/include/asm-mips64/processor.h b/include/asm-mips64/processor.h index 898df746a..565d6cb88 100644 --- a/include/asm-mips64/processor.h +++ b/include/asm-mips64/processor.h @@ -1,13 +1,12 @@ -/* $Id: processor.h,v 1.11 2000/03/14 01:39:27 ralf Exp $ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * * Copyright (C) 1994 Waldorf GMBH - * Copyright (C) 1995, 1996, 1997, 1998, 1999 Ralf Baechle + * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Ralf Baechle * Modified further for R[236]000 compatibility by Paul M. Antoine - * Copyright (C) 1999 Silicon Graphics, Inc. + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ #ifndef _ASM_PROCESSOR_H #define _ASM_PROCESSOR_H @@ -15,12 +14,37 @@ #include <linux/config.h> /* - * Default implementation of macro that returns current - * instruction pointer ("program counter"). + * Return current * instruction pointer ("program counter"). + * + * Two implementations. The ``la'' version results in shorter code for + * the kernel which we assume to reside in the 32-bit compat address space. + * The ``jal'' version is for use by modules which live in outer space. + * This is just a single instruction unlike the long dla macro expansion. */ -#define current_text_addr() ({ __label__ _l; _l: &&_l;}) +#ifdef MODULE +#define current_text_addr() \ +({ \ + void *_a; \ + \ + __asm__ ("jal\t1f, 1f\n\t" \ + "1:" \ + : "=r" (_a)); \ + \ + _a; \ +}) +#else +#define current_text_addr() \ +({ \ + void *_a; \ + \ + __asm__ ("dla\t%0, 1f\n\t" \ + "1:" \ + : "=r" (_a)); \ + \ + _a; \ +}) +#endif -#include <linux/config.h> #if !defined (_LANGUAGE_ASSEMBLY) #include <asm/cachectl.h> #include <asm/mipsregs.h> |