Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b640f042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'topic/slab/earlyboot' of... 

Merge branch 'topic/slab/earlyboot' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'topic/slab/earlyboot' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  vgacon: use slab allocator instead of the bootmem allocator
  irq: use kcalloc() instead of the bootmem allocator
  sched: use slab in cpupri_init()
  sched: use alloc_cpumask_var() instead of alloc_bootmem_cpumask_var()
  memcg: don't use bootmem allocator in setup code
  irq/cpumask: make memoryless node zero happy
  x86: remove some alloc_bootmem_cpumask_var calling
  vt: use kzalloc() instead of the bootmem allocator
  sched: use kzalloc() instead of the bootmem allocator
  init: introduce mm_init()
  vmalloc: use kzalloc() instead of alloc_bootmem()
  slab: setup allocators earlier in the boot sequence
  bootmem: fix slab fallback on numa
  bootmem: use slab if bootmem is no longer available
parents 871fa907 b8ec7573

arch/x86/kernel/apic/io_apic.c

+4 −2
Original line number Diff line number Diff line
@@ -177,16 +177,18 @@ int __init arch_early_irq_init(void) 
	struct irq_cfg *cfg;

	struct irq_desc *desc;

	int count;

	int node;

	int i;



	cfg = irq_cfgx;

	count = ARRAY_SIZE(irq_cfgx);

	node= cpu_to_node(boot_cpu_id);



	for (i = 0; i < count; i++) {

		desc = irq_to_desc(i);

		desc->chip_data = &cfg[i];

		alloc_bootmem_cpumask_var(&cfg[i].domain);

		alloc_bootmem_cpumask_var(&cfg[i].old_domain);

		alloc_cpumask_var_node(&cfg[i].domain, GFP_NOWAIT, node);

		alloc_cpumask_var_node(&cfg[i].old_domain, GFP_NOWAIT, node);

		if (i < NR_IRQS_LEGACY)

			cpumask_setall(cfg[i].domain);

	}

drivers/char/vt.c

+2 −6
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
#include <linux/timer.h>

#include <linux/interrupt.h>

#include <linux/workqueue.h>

#include <linux/bootmem.h>

#include <linux/pm.h>

#include <linux/font.h>

#include <linux/bitops.h>
@@ -2875,14 +2874,11 @@ static int __init con_init(void) 
		mod_timer(&console_timer, jiffies + blankinterval);

	}



	/*

	 * kmalloc is not running yet - we use the bootmem allocator.

	 */

	for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) {

		vc_cons[currcons].d = vc = alloc_bootmem(sizeof(struct vc_data));

		vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT);

		INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);

		visual_init(vc, currcons, 1);

		vc->vc_screenbuf = (unsigned short *)alloc_bootmem(vc->vc_screenbuf_size);

		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);

		vc->vc_kmalloced = 0;

		vc_init(vc, vc->vc_rows, vc->vc_cols,

			currcons || !vc->vc_sw->con_save_screen);

drivers/video/console/vgacon.c

+2 −3
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static inline void vga_set_mem_top(struct vc_data *c) 
}



#ifdef CONFIG_VGACON_SOFT_SCROLLBACK

#include <linux/bootmem.h>

#include <linux/slab.h>

/* software scrollback */

static void *vgacon_scrollback;

static int vgacon_scrollback_tail;
@@ -210,8 +210,7 @@ static void vgacon_scrollback_init(int pitch) 
 */

static void __init_refok vgacon_scrollback_startup(void)

{

	vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE

					  * 1024);

	vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT);

	vgacon_scrollback_init(vga_video_num_columns * 2);

}

include/linux/irq.h

+7 −11
Original line number Diff line number Diff line
@@ -432,21 +432,17 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry); 
static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

							bool boot)

{

#ifdef CONFIG_CPUMASK_OFFSTACK

	if (boot) {

		alloc_bootmem_cpumask_var(&desc->affinity);

	gfp_t gfp = GFP_ATOMIC;



#ifdef CONFIG_GENERIC_PENDING_IRQ

		alloc_bootmem_cpumask_var(&desc->pending_mask);

#endif

		return true;

	}

	if (boot)

		gfp = GFP_NOWAIT;



	if (!alloc_cpumask_var_node(&desc->affinity, GFP_ATOMIC, node))

#ifdef CONFIG_CPUMASK_OFFSTACK

	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))

		return false;



#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (!alloc_cpumask_var_node(&desc->pending_mask, GFP_ATOMIC, node)) {

	if (!alloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {

		free_cpumask_var(desc->affinity);

		return false;

	}

init/main.c

+27 −14
Original line number Diff line number Diff line
@@ -533,6 +533,16 @@ void __init __weak thread_info_cache_init(void) 
{

}



/*

 * Set up kernel memory allocators

 */

static void __init mm_init(void)

{

	mem_init();

	kmem_cache_init();

	vmalloc_init();

}



asmlinkage void __init start_kernel(void)

{

	char * command_line;
@@ -574,6 +584,23 @@ asmlinkage void __init start_kernel(void) 
	setup_nr_cpu_ids();

	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */



	build_all_zonelists();

	page_alloc_init();



	printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);

	parse_early_param();

	parse_args("Booting kernel", static_command_line, __start___param,

		   __stop___param - __start___param,

		   &unknown_bootoption);

	/*

	 * These use large bootmem allocations and must precede

	 * kmem_cache_init()

	 */

	pidhash_init();

	vfs_caches_init_early();

	sort_main_extable();

	trap_init();

	mm_init();

	/*

	 * Set up the scheduler prior starting any interrupts (such as the

	 * timer interrupt). Full topology setup happens at smp_init()
@@ -585,25 +612,15 @@ asmlinkage void __init start_kernel(void) 
	 * fragile until we cpu_idle() for the first time.

	 */

	preempt_disable();

	build_all_zonelists();

	page_alloc_init();

	printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);

	parse_early_param();

	parse_args("Booting kernel", static_command_line, __start___param,

		   __stop___param - __start___param,

		   &unknown_bootoption);

	if (!irqs_disabled()) {

		printk(KERN_WARNING "start_kernel(): bug: interrupts were "

				"enabled *very* early, fixing it\n");

		local_irq_disable();

	}

	sort_main_extable();

	trap_init();

	rcu_init();

	/* init some links before init_ISA_irqs() */

	early_irq_init();

	init_IRQ();

	pidhash_init();

	init_timers();

	hrtimers_init();

	softirq_init();
@@ -645,14 +662,10 @@ asmlinkage void __init start_kernel(void) 
		initrd_start = 0;

	}

#endif

	vmalloc_init();

	vfs_caches_init_early();

	cpuset_init_early();

	page_cgroup_init();

	mem_init();

	enable_debug_pagealloc();

	cpu_hotplug_init();

	kmem_cache_init();

	kmemtrace_init();

	debug_objects_mem_init();

	idr_init_cache();