diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 13:50:52 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 13:50:52 -0700 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /include/linux/textsearch.h | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
| download | kernel_samsung_smdk4412-cff6bf970965c98c62007fc8a36527fd147fe233.zip kernel_samsung_smdk4412-cff6bf970965c98c62007fc8a36527fd147fe233.tar.gz kernel_samsung_smdk4412-cff6bf970965c98c62007fc8a36527fd147fe233.tar.bz2 | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/textsearch.h')
| -rw-r--r-- | include/linux/textsearch.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h index 941f45a..515046d 100644 --- a/include/linux/textsearch.h +++ b/include/linux/textsearch.h @@ -158,7 +158,8 @@ extern unsigned int textsearch_find_continuous(struct ts_config *, #define TS_PRIV_ALIGNTO 8 #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) -static inline struct ts_config *alloc_ts_config(size_t payload, int gfp_mask) +static inline struct ts_config *alloc_ts_config(size_t payload, + gfp_t gfp_mask) { struct ts_config *conf; |