diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
| commit | 9a375e93f88269bb770fb2eaa57554c975449c88 (patch) | |
| tree | 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /mm/slab.c | |
| parent | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into max-sect
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1036,7 +1036,7 @@ static inline void free_alien_cache(struct array_cache **ac_ptr) | |||
| 1036 | 1036 | ||
| 1037 | #endif | 1037 | #endif |
| 1038 | 1038 | ||
| 1039 | static int __devinit cpuup_callback(struct notifier_block *nfb, | 1039 | static int cpuup_callback(struct notifier_block *nfb, |
| 1040 | unsigned long action, void *hcpu) | 1040 | unsigned long action, void *hcpu) |
| 1041 | { | 1041 | { |
| 1042 | long cpu = (long)hcpu; | 1042 | long cpu = (long)hcpu; |