Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Allow removal of slab caches during boot Revert "slub: Allow removal of slab caches during boot" slub numa: Fix rare allocation from unexpected node slab: use deferable timers for its periodic housekeeping slub: Use kmem_cache flags to detect if slab is in debugging mode. slub: Allow removal of slab caches during boot slub: Check kasprintf results in kmem_cache_init() SLUB: Constants need UL slub: Use a constant for a unspecified node. SLOB: Free objects to their own list slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING
This commit is contained in:
@@ -860,7 +860,7 @@ static void __cpuinit start_cpu_timer(int cpu)
|
||||
*/
|
||||
if (keventd_up() && reap_work->work.func == NULL) {
|
||||
init_reap_node(cpu);
|
||||
INIT_DELAYED_WORK(reap_work, cache_reap);
|
||||
INIT_DELAYED_WORK_DEFERRABLE(reap_work, cache_reap);
|
||||
schedule_delayed_work_on(cpu, reap_work,
|
||||
__round_jiffies_relative(HZ, cpu));
|
||||
}
|
||||
|
Reference in New Issue
Block a user