diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
| commit | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (patch) | |
| tree | e0e70aa880b8c8f2c1a979438a523241f6193742 /mm/slab.c | |
| parent | 9f1da23b631f92393f58f664348ffc5faeaddeb3 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c index e6ef9bd5233..af5c5237e11 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1036,7 +1036,7 @@ static inline void free_alien_cache(struct array_cache **ac_ptr) #endif -static int __devinit cpuup_callback(struct notifier_block *nfb, +static int cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { long cpu = (long)hcpu; |