diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-03 18:16:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-03 18:16:25 -0800 |
| commit | 5370f2ff116982cd477937eb26b1b47fcf07c6ab (patch) | |
| tree | 3951951f489f733aa814d2554de4a59b01cc6330 /include | |
| parent | 46ea8f0c270d757c8c17e51dd518978a7895c10e (diff) | |
| parent | 02a4eb10c0be4062858ecf3482c15439bc855e0d (diff) | |
Merge AFS fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/rxrpc/call.h | 4 | ||||
| -rw-r--r-- | include/rxrpc/peer.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h index 0ae39ad9c612..5afe044b3f46 100644 --- a/include/rxrpc/call.h +++ b/include/rxrpc/call.h @@ -153,7 +153,7 @@ do { (CALL)->app_scr_alloc = (CALL)->app_scratch; } while(0) (CALL)->app_scr_alloc += (SIZE); \ if ((SIZE)>RXRPC_CALL_SCRATCH_SIZE || \ (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ - printk("rxrpc_call_alloc_scratch(%p,%u)\n",(CALL),(SIZE)); \ + printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),(size_t)(SIZE)); \ BUG(); \ } \ ptr; \ @@ -167,7 +167,7 @@ do { (CALL)->app_scr_alloc = (CALL)->app_scratch; } while(0) (CALL)->app_scr_alloc += size; \ if (size>RXRPC_CALL_SCRATCH_SIZE || \ (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ - printk("rxrpc_call_alloc_scratch(%p,%u)\n",(CALL),size); \ + printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),size); \ BUG(); \ } \ ptr; \ diff --git a/include/rxrpc/peer.h b/include/rxrpc/peer.h index 9f09bc95a40f..0ab2730541ed 100644 --- a/include/rxrpc/peer.h +++ b/include/rxrpc/peer.h @@ -57,8 +57,8 @@ struct rxrpc_peer /* calculated RTT cache */ #define RXRPC_RTT_CACHE_SIZE 32 suseconds_t rtt; /* current RTT estimate (in uS) */ - unsigned short rtt_point; /* next entry at which to insert */ - unsigned short rtt_usage; /* amount of cache actually used */ + unsigned rtt_point; /* next entry at which to insert */ + unsigned rtt_usage; /* amount of cache actually used */ suseconds_t rtt_cache[RXRPC_RTT_CACHE_SIZE]; /* calculated RTT cache */ }; |