diff options
Diffstat (limited to 'drivers/usb/mon/mon_text.c')
-rw-r--r-- | drivers/usb/mon/mon_text.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index 7a2346c53284..05cf2c9a8f84 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c | |||
@@ -50,7 +50,7 @@ struct mon_event_text { | |||
50 | 50 | ||
51 | #define SLAB_NAME_SZ 30 | 51 | #define SLAB_NAME_SZ 30 |
52 | struct mon_reader_text { | 52 | struct mon_reader_text { |
53 | kmem_cache_t *e_slab; | 53 | struct kmem_cache *e_slab; |
54 | int nevents; | 54 | int nevents; |
55 | struct list_head e_list; | 55 | struct list_head e_list; |
56 | struct mon_reader r; /* In C, parent class can be placed anywhere */ | 56 | struct mon_reader r; /* In C, parent class can be placed anywhere */ |
@@ -63,7 +63,7 @@ struct mon_reader_text { | |||
63 | char slab_name[SLAB_NAME_SZ]; | 63 | char slab_name[SLAB_NAME_SZ]; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static void mon_text_ctor(void *, kmem_cache_t *, unsigned long); | 66 | static void mon_text_ctor(void *, struct kmem_cache *, unsigned long); |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * mon_text_submit | 69 | * mon_text_submit |
@@ -147,7 +147,7 @@ static void mon_text_event(struct mon_reader_text *rp, struct urb *urb, | |||
147 | stamp = mon_get_timestamp(); | 147 | stamp = mon_get_timestamp(); |
148 | 148 | ||
149 | if (rp->nevents >= EVENT_MAX || | 149 | if (rp->nevents >= EVENT_MAX || |
150 | (ep = kmem_cache_alloc(rp->e_slab, SLAB_ATOMIC)) == NULL) { | 150 | (ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) { |
151 | rp->r.m_bus->cnt_text_lost++; | 151 | rp->r.m_bus->cnt_text_lost++; |
152 | return; | 152 | return; |
153 | } | 153 | } |
@@ -188,7 +188,7 @@ static void mon_text_error(void *data, struct urb *urb, int error) | |||
188 | struct mon_event_text *ep; | 188 | struct mon_event_text *ep; |
189 | 189 | ||
190 | if (rp->nevents >= EVENT_MAX || | 190 | if (rp->nevents >= EVENT_MAX || |
191 | (ep = kmem_cache_alloc(rp->e_slab, SLAB_ATOMIC)) == NULL) { | 191 | (ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) { |
192 | rp->r.m_bus->cnt_text_lost++; | 192 | rp->r.m_bus->cnt_text_lost++; |
193 | return; | 193 | return; |
194 | } | 194 | } |
@@ -450,7 +450,7 @@ const struct file_operations mon_fops_text = { | |||
450 | /* | 450 | /* |
451 | * Slab interface: constructor. | 451 | * Slab interface: constructor. |
452 | */ | 452 | */ |
453 | static void mon_text_ctor(void *mem, kmem_cache_t *slab, unsigned long sflags) | 453 | static void mon_text_ctor(void *mem, struct kmem_cache *slab, unsigned long sflags) |
454 | { | 454 | { |
455 | /* | 455 | /* |
456 | * Nothing to initialize. No, really! | 456 | * Nothing to initialize. No, really! |