diff options
author | Todd Poynor <tpoynor@mvista.com> | 2005-07-12 03:34:39 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 00:58:44 +0200 |
commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /include/asm-v850 | |
parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) |
Merge with rsync://fileserver/linux
Diffstat (limited to 'include/asm-v850')
-rw-r--r-- | include/asm-v850/checksum.h | 11 | ||||
-rw-r--r-- | include/asm-v850/mmu.h | 17 |
2 files changed, 9 insertions, 19 deletions
diff --git a/include/asm-v850/checksum.h b/include/asm-v850/checksum.h index d3aedb7bfc5..4df5e71098f 100644 --- a/include/asm-v850/checksum.h +++ b/include/asm-v850/checksum.h @@ -1,8 +1,8 @@ /* * include/asm-v850/checksum.h -- Checksum ops * - * Copyright (C) 2001 NEC Corporation - * Copyright (C) 2001 Miles Bader <miles@gnu.org> + * Copyright (C) 2001,2005 NEC Corporation + * Copyright (C) 2001,2005 Miles Bader <miles@gnu.org> * * 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 @@ -36,8 +36,8 @@ extern unsigned int csum_partial (const unsigned char * buff, int len, * here even more important to align src and dst on a 32-bit (or even * better 64-bit) boundary */ -extern unsigned csum_partial_copy (const char *src, char *dst, int len, - unsigned sum); +extern unsigned csum_partial_copy (const unsigned char *src, + unsigned char *dst, int len, unsigned sum); /* @@ -46,7 +46,8 @@ extern unsigned csum_partial_copy (const char *src, char *dst, int len, * here even more important to align src and dst on a 32-bit (or even * better 64-bit) boundary */ -extern unsigned csum_partial_copy_from_user (const char *src, char *dst, +extern unsigned csum_partial_copy_from_user (const unsigned char *src, + unsigned char *dst, int len, unsigned sum, int *csum_err); diff --git a/include/asm-v850/mmu.h b/include/asm-v850/mmu.h index e30a52becfd..267768c66ef 100644 --- a/include/asm-v850/mmu.h +++ b/include/asm-v850/mmu.h @@ -1,22 +1,11 @@ -/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */ +/* Copyright (C) 2002, 2005, David McCullough <davidm@snapgear.com> */ #ifndef __V850_MMU_H__ #define __V850_MMU_H__ -struct mm_rblock_struct { - int size; - int refcount; - void *kblock; -}; - -struct mm_tblock_struct { - struct mm_rblock_struct *rblock; - struct mm_tblock_struct *next; -}; - typedef struct { - struct mm_tblock_struct tblock; - unsigned long end_brk; + struct vm_list_struct *vmlist; + unsigned long end_brk; } mm_context_t; #endif /* __V850_MMU_H__ */ |