Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd4f2df2 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: lib/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6daa0e28

include/linux/idr.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct idr { 
 */



void *idr_find(struct idr *idp, int id);

int idr_pre_get(struct idr *idp, unsigned gfp_mask);

int idr_pre_get(struct idr *idp, gfp_t gfp_mask);

int idr_get_new(struct idr *idp, void *ptr, int *id);

int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);

void idr_remove(struct idr *idp, int id);

include/linux/kobject.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ extern void kobject_unregister(struct kobject *); 
extern struct kobject * kobject_get(struct kobject *);

extern void kobject_put(struct kobject *);



extern char * kobject_get_path(struct kobject *, int);

extern char * kobject_get_path(struct kobject *, gfp_t);



struct kobj_type {

	void (*release)(struct kobject *);

include/linux/radix-tree.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


struct radix_tree_root {

	unsigned int		height;

	unsigned int		gfp_mask;

	gfp_t			gfp_mask;

	struct radix_tree_node	*rnode;

};

include/linux/textsearch.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct ts_state 
struct ts_ops

{

	const char		*name;

	struct ts_config *	(*init)(const void *, unsigned int, int);

	struct ts_config *	(*init)(const void *, unsigned int, gfp_t);

	unsigned int		(*find)(struct ts_config *,

					struct ts_state *);

	void			(*destroy)(struct ts_config *);
@@ -148,7 +148,7 @@ static inline unsigned int textsearch_get_pattern_len(struct ts_config *conf) 
extern int textsearch_register(struct ts_ops *);

extern int textsearch_unregister(struct ts_ops *);

extern struct ts_config *textsearch_prepare(const char *, const void *,

					    unsigned int, int, int);

					    unsigned int, gfp_t, int);

extern void textsearch_destroy(struct ts_config *conf);

extern unsigned int textsearch_find_continuous(struct ts_config *,

					       struct ts_state *,

lib/idr.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void free_layer(struct idr *idp, struct idr_layer *p) 
 * If the system is REALLY out of memory this function returns 0,

 * otherwise 1.

 */

int idr_pre_get(struct idr *idp, unsigned gfp_mask)

int idr_pre_get(struct idr *idp, gfp_t gfp_mask)

{

	while (idp->id_free_cnt < IDR_FREE_MAX) {

		struct idr_layer *new;