Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fd4f2df24bc23e6b8fc069765b425c7dacf52347

Authored by Al Viro
Committed by Linus Torvalds
1 parent 6daa0e2862
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] gfp_t: lib/* 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 8 changed files with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -71,7 +71,7 @@
71 71 */
72 72  
73 73 void *idr_find(struct idr *idp, int id);
74   -int idr_pre_get(struct idr *idp, unsigned gfp_mask);
  74 +int idr_pre_get(struct idr *idp, gfp_t gfp_mask);
75 75 int idr_get_new(struct idr *idp, void *ptr, int *id);
76 76 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
77 77 void idr_remove(struct idr *idp, int id);
include/linux/kobject.h
Diff comments   View file @ fd4f2df
... ... @@ -65,7 +65,7 @@
65 65 extern struct kobject * kobject_get(struct kobject *);
66 66 extern void kobject_put(struct kobject *);
67 67  
68   -extern char * kobject_get_path(struct kobject *, int);
  68 +extern char * kobject_get_path(struct kobject *, gfp_t);
69 69  
70 70 struct kobj_type {
71 71 void (*release)(struct kobject *);
include/linux/radix-tree.h
Diff comments   View file @ fd4f2df
... ... @@ -24,7 +24,7 @@
24 24  
25 25 struct radix_tree_root {
26 26 unsigned int height;
27   - unsigned int gfp_mask;
  27 + gfp_t gfp_mask;
28 28 struct radix_tree_node *rnode;
29 29 };
30 30  
include/linux/textsearch.h
Diff comments   View file @ fd4f2df
... ... @@ -40,7 +40,7 @@
40 40 struct ts_ops
41 41 {
42 42 const char *name;
43   - struct ts_config * (*init)(const void *, unsigned int, int);
  43 + struct ts_config * (*init)(const void *, unsigned int, gfp_t);
44 44 unsigned int (*find)(struct ts_config *,
45 45 struct ts_state *);
46 46 void (*destroy)(struct ts_config *);
... ... @@ -148,7 +148,7 @@
148 148 extern int textsearch_register(struct ts_ops *);
149 149 extern int textsearch_unregister(struct ts_ops *);
150 150 extern struct ts_config *textsearch_prepare(const char *, const void *,
151   - unsigned int, int, int);
  151 + unsigned int, gfp_t, int);
152 152 extern void textsearch_destroy(struct ts_config *conf);
153 153 extern unsigned int textsearch_find_continuous(struct ts_config *,
154 154 struct ts_state *,
... ... @@ -72,7 +72,7 @@
72 72 * If the system is REALLY out of memory this function returns 0,
73 73 * otherwise 1.
74 74 */
75   -int idr_pre_get(struct idr *idp, unsigned gfp_mask)
  75 +int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
76 76 {
77 77 while (idp->id_free_cnt < IDR_FREE_MAX) {
78 78 struct idr_layer *new;
... ... @@ -100,7 +100,7 @@
100 100 * @kobj: kobject in question, with which to build the path
101 101 * @gfp_mask: the allocation type used to allocate the path
102 102 */
103   -char *kobject_get_path(struct kobject *kobj, int gfp_mask)
  103 +char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
104 104 {
105 105 char *path;
106 106 int len;
lib/kobject_uevent.c
Diff comments   View file @ fd4f2df
... ... @@ -62,7 +62,7 @@
62 62 * @gfp_mask:
63 63 */
64 64 static int send_uevent(const char *signal, const char *obj,
65   - char **envp, int gfp_mask)
  65 + char **envp, gfp_t gfp_mask)
66 66 {
67 67 struct sk_buff *skb;
68 68 char *pos;
... ... @@ -98,7 +98,7 @@
98 98 }
99 99  
100 100 static int do_kobject_uevent(struct kobject *kobj, enum kobject_action action,
101   - struct attribute *attr, int gfp_mask)
  101 + struct attribute *attr, gfp_t gfp_mask)
102 102 {
103 103 char *path;
104 104 char *attrpath;
... ... @@ -254,7 +254,7 @@
254 254 * parameters or a ERR_PTR().
255 255 */
256 256 struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
257   - unsigned int len, int gfp_mask, int flags)
  257 + unsigned int len, gfp_t gfp_mask, int flags)
258 258 {
259 259 int err = -ENOENT;
260 260 struct ts_config *conf;