diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
| commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
| tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /net/dccp/ccids/lib/loss_interval.h | |
| parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
| parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'net/dccp/ccids/lib/loss_interval.h')
| -rw-r--r-- | net/dccp/ccids/lib/loss_interval.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/lib/loss_interval.h b/net/dccp/ccids/lib/loss_interval.h index 13ad47ba1420..417d9d82df3e 100644 --- a/net/dccp/ccids/lib/loss_interval.h +++ b/net/dccp/ccids/lib/loss_interval.h | |||
| @@ -36,7 +36,7 @@ struct dccp_li_hist_entry { | |||
| 36 | 36 | ||
| 37 | static inline struct dccp_li_hist_entry * | 37 | static inline struct dccp_li_hist_entry * |
| 38 | dccp_li_hist_entry_new(struct dccp_li_hist *hist, | 38 | dccp_li_hist_entry_new(struct dccp_li_hist *hist, |
| 39 | const unsigned int __nocast prio) | 39 | const gfp_t prio) |
| 40 | { | 40 | { |
| 41 | return kmem_cache_alloc(hist->dccplih_slab, prio); | 41 | return kmem_cache_alloc(hist->dccplih_slab, prio); |
| 42 | } | 42 | } |