diff options
Diffstat (limited to 'linux/dev/include')
| -rw-r--r-- | linux/dev/include/asm-i386/string.h | 36 | ||||
| -rw-r--r-- | linux/dev/include/linux/blk.h | 6 | ||||
| -rw-r--r-- | linux/dev/include/linux/blkdev.h | 1 | ||||
| -rw-r--r-- | linux/dev/include/linux/fs.h | 8 | ||||
| -rw-r--r-- | linux/dev/include/linux/locks.h | 10 | ||||
| -rw-r--r-- | linux/dev/include/linux/mm.h | 2 | ||||
| -rw-r--r-- | linux/dev/include/linux/types.h | 9 |
7 files changed, 42 insertions, 30 deletions
diff --git a/linux/dev/include/asm-i386/string.h b/linux/dev/include/asm-i386/string.h index bdb75455..f41ca5c0 100644 --- a/linux/dev/include/asm-i386/string.h +++ b/linux/dev/include/asm-i386/string.h @@ -28,7 +28,7 @@ */ #define __HAVE_ARCH_STRCPY -extern inline char * strcpy(char * dest,const char *src) +static inline char * strcpy(char * dest,const char *src) { int d0, d1, d2; __asm__ __volatile__( @@ -43,7 +43,7 @@ return dest; } #define __HAVE_ARCH_STRNCPY -extern inline char * strncpy(char * dest,const char *src,size_t count) +static inline char * strncpy(char * dest,const char *src,size_t count) { int d0, d1, d2, d3; __asm__ __volatile__( @@ -63,7 +63,7 @@ return dest; } #define __HAVE_ARCH_STRCAT -extern inline char * strcat(char * dest,const char * src) +static inline char * strcat(char * dest,const char * src) { int d0, d1, d2, d3; __asm__ __volatile__( @@ -81,7 +81,7 @@ return dest; } #define __HAVE_ARCH_STRNCAT -extern inline char * strncat(char * dest,const char * src,size_t count) +static inline char * strncat(char * dest,const char * src,size_t count) { int d0, d1, d2, d3; __asm__ __volatile__( @@ -105,7 +105,7 @@ return dest; } #define __HAVE_ARCH_STRCMP -extern inline int strcmp(const char * cs,const char * ct) +static inline int strcmp(const char * cs,const char * ct) { int d0, d1; register int __res; @@ -127,7 +127,7 @@ return __res; } #define __HAVE_ARCH_STRNCMP -extern inline int strncmp(const char * cs,const char * ct,size_t count) +static inline int strncmp(const char * cs,const char * ct,size_t count) { register int __res; int d0, d1, d2; @@ -151,7 +151,7 @@ return __res; } #define __HAVE_ARCH_STRCHR -extern inline char * strchr(const char * s, int c) +static inline char * strchr(const char * s, int c) { int d0; register char * __res; @@ -171,7 +171,7 @@ return __res; } #define __HAVE_ARCH_STRRCHR -extern inline char * strrchr(const char * s, int c) +static inline char * strrchr(const char * s, int c) { int d0, d1; register char * __res; @@ -189,7 +189,7 @@ return __res; } #define __HAVE_ARCH_STRLEN -extern inline size_t strlen(const char * s) +static inline size_t strlen(const char * s) { int d0; register int __res; @@ -203,7 +203,7 @@ __asm__ __volatile__( return __res; } -extern inline void * __memcpy(void * to, const void * from, size_t n) +static inline void * __memcpy(void * to, const void * from, size_t n) { int d0, d1, d2; __asm__ __volatile__( @@ -226,7 +226,7 @@ return (to); * This looks horribly ugly, but the compiler can optimize it totally, * as the count is constant. */ -extern inline void * __constant_memcpy(void * to, const void * from, size_t n) +static inline void * __constant_memcpy(void * to, const void * from, size_t n) { switch (n) { case 0: @@ -299,7 +299,7 @@ __asm__ __volatile__( \ __memcpy((t),(f),(n))) #define __HAVE_ARCH_MEMMOVE -extern inline void * memmove(void * dest,const void * src, size_t n) +static inline void * memmove(void * dest,const void * src, size_t n) { int d0, d1, d2; if (dest<src) @@ -327,7 +327,7 @@ return dest; #define memcmp __builtin_memcmp #define __HAVE_ARCH_MEMCHR -extern inline void * memchr(const void * cs,int c,size_t count) +static inline void * memchr(const void * cs,int c,size_t count) { int d0; register void * __res; @@ -344,7 +344,7 @@ __asm__ __volatile__( return __res; } -extern inline void * __memset_generic(void * s, char c,size_t count) +static inline void * __memset_generic(void * s, char c,size_t count) { int d0, d1; __asm__ __volatile__( @@ -365,7 +365,7 @@ return s; * things 32 bits at a time even when we don't know the size of the * area at compile-time.. */ -extern inline void * __constant_c_memset(void * s, unsigned long c, size_t count) +static inline void * __constant_c_memset(void * s, unsigned long c, size_t count) { int d0, d1; __asm__ __volatile__( @@ -386,7 +386,7 @@ return (s); /* Added by Gertjan van Wingerde to make minix and sysv module work */ #define __HAVE_ARCH_STRNLEN -extern inline size_t strnlen(const char * s, size_t count) +static inline size_t strnlen(const char * s, size_t count) { int d0; register int __res; @@ -410,7 +410,7 @@ return __res; * This looks horribly ugly, but the compiler can optimize it totally, * as we by now know that both pattern and count is constant.. */ -extern inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count) +static inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count) { switch (count) { case 0: @@ -469,7 +469,7 @@ __asm__ __volatile__("cld\n\t" \ * find the first occurrence of byte 'c', or 1 past the area if none */ #define __HAVE_ARCH_MEMSCAN -extern inline void * memscan(void * addr, int c, size_t size) +static inline void * memscan(void * addr, int c, size_t size) { if (!size) return addr; diff --git a/linux/dev/include/linux/blk.h b/linux/dev/include/linux/blk.h index 412b8641..b924a14f 100644 --- a/linux/dev/include/linux/blk.h +++ b/linux/dev/include/linux/blk.h @@ -78,6 +78,7 @@ extern int hd_init(void); #endif #ifdef CONFIG_BLK_DEV_IDE extern int ide_init(void); +extern void ide_disable_base(unsigned base); #endif #ifdef CONFIG_BLK_DEV_XD extern int xd_init(void); @@ -391,8 +392,9 @@ static void end_request(int uptodate) { req->errors = 0; if (!uptodate) { - printk("end_request: I/O error, dev %s, sector %lu\n", - kdevname(req->rq_dev), req->sector); + if (!req->quiet) + printk("end_request: I/O error, dev %s, sector %lu\n", + kdevname(req->rq_dev), req->sector); #ifdef MACH for (bh = req->bh; bh; ) { diff --git a/linux/dev/include/linux/blkdev.h b/linux/dev/include/linux/blkdev.h index e9a40d7e..5bf0a288 100644 --- a/linux/dev/include/linux/blkdev.h +++ b/linux/dev/include/linux/blkdev.h @@ -23,6 +23,7 @@ struct request { kdev_t rq_dev; int cmd; /* READ or WRITE */ int errors; + int quiet; unsigned long sector; unsigned long nr_sectors; unsigned long current_nr_sectors; diff --git a/linux/dev/include/linux/fs.h b/linux/dev/include/linux/fs.h index 740ebb54..def2bc98 100644 --- a/linux/dev/include/linux/fs.h +++ b/linux/dev/include/linux/fs.h @@ -638,7 +638,7 @@ extern int nr_buffer_heads; #define NR_LIST 4 #ifdef MACH -extern inline void +static inline void mark_buffer_uptodate (struct buffer_head *bh, int on) { if (on) @@ -650,7 +650,7 @@ mark_buffer_uptodate (struct buffer_head *bh, int on) void mark_buffer_uptodate(struct buffer_head * bh, int on); #endif -extern inline void mark_buffer_clean(struct buffer_head * bh) +static inline void mark_buffer_clean(struct buffer_head * bh) { #ifdef MACH clear_bit (BH_Dirty, &bh->b_state); @@ -662,7 +662,7 @@ extern inline void mark_buffer_clean(struct buffer_head * bh) #endif } -extern inline void mark_buffer_dirty(struct buffer_head * bh, int flag) +static inline void mark_buffer_dirty(struct buffer_head * bh, int flag) { #ifdef MACH set_bit (BH_Dirty, &bh->b_state); @@ -733,7 +733,7 @@ extern struct file * get_empty_filp(void); extern int close_fp(struct file *filp); extern struct buffer_head * get_hash_table(kdev_t dev, int block, int size); extern struct buffer_head * getblk(kdev_t dev, int block, int size); -extern void ll_rw_block(int rw, int nr, struct buffer_head * bh[]); +extern void ll_rw_block(int rw, int nr, struct buffer_head * bh[], int quiet); extern void ll_rw_page(int rw, kdev_t dev, unsigned long nr, char * buffer); extern void ll_rw_swap_file(int rw, kdev_t dev, unsigned int *b, int nb, char *buffer); extern int is_read_only(kdev_t dev); diff --git a/linux/dev/include/linux/locks.h b/linux/dev/include/linux/locks.h index 72cf108d..ae063fba 100644 --- a/linux/dev/include/linux/locks.h +++ b/linux/dev/include/linux/locks.h @@ -20,13 +20,13 @@ extern struct buffer_head *reuse_list; */ extern void __wait_on_buffer(struct buffer_head *); -extern inline void wait_on_buffer(struct buffer_head * bh) +static inline void wait_on_buffer(struct buffer_head * bh) { if (test_bit(BH_Lock, &bh->b_state)) __wait_on_buffer(bh); } -extern inline void lock_buffer(struct buffer_head * bh) +static inline void lock_buffer(struct buffer_head * bh) { while (set_bit(BH_Lock, &bh->b_state)) __wait_on_buffer(bh); @@ -42,20 +42,20 @@ void unlock_buffer(struct buffer_head *); */ extern void __wait_on_super(struct super_block *); -extern inline void wait_on_super(struct super_block * sb) +static inline void wait_on_super(struct super_block * sb) { if (sb->s_lock) __wait_on_super(sb); } -extern inline void lock_super(struct super_block * sb) +static inline void lock_super(struct super_block * sb) { if (sb->s_lock) __wait_on_super(sb); sb->s_lock = 1; } -extern inline void unlock_super(struct super_block * sb) +static inline void unlock_super(struct super_block * sb) { sb->s_lock = 0; wake_up(&sb->s_wait); diff --git a/linux/dev/include/linux/mm.h b/linux/dev/include/linux/mm.h index cd061378..b0c3ab08 100644 --- a/linux/dev/include/linux/mm.h +++ b/linux/dev/include/linux/mm.h @@ -234,7 +234,7 @@ extern mem_map_t * mem_map; #define __get_dma_pages(priority, order) __get_free_pages((priority),(order),1) extern unsigned long __get_free_pages(int priority, unsigned long gfporder, int dma); -extern inline unsigned long get_free_page(int priority) +static inline unsigned long get_free_page(int priority) { unsigned long page; diff --git a/linux/dev/include/linux/types.h b/linux/dev/include/linux/types.h index 57bb25f4..b697d9ec 100644 --- a/linux/dev/include/linux/types.h +++ b/linux/dev/include/linux/types.h @@ -109,6 +109,15 @@ struct ustat { char f_fpack[6]; }; +/* stdint.h */ +typedef s8 int8_t; +typedef u8 uint8_t; +typedef s16 int16_t; +typedef u16 uint16_t; +typedef s32 int32_t; +typedef u32 uint32_t; +typedef s64 int64_t; +typedef u64 uint64_t; /* Yes, this is ugly. But that's why it is called glue code. */ |