]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
vt: drop bootmem/slab memory distinction
authorJohannes Weiner <hannes@cmpxchg.org>
Thu, 16 Jul 2009 15:06:09 +0000 (16:06 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2009 16:19:16 +0000 (09:19 -0700)
commit5c9228f0cfb09a098a8a380116b42ae099e967b6
treef3306b2a1e53309b876d5d2543ad6fa85ae66caf
parentff5392d77bbb0746d1a034e955231f03ffc30b61
vt: drop bootmem/slab memory distinction

Bootmem is not used for the vt screen buffer anymore as slab is now
available at the time the console is initialized.

Get rid of the now superfluous distinction between slab and bootmem,
it's always slab.

This also fixes a kmalloc leak which Catalin described thusly:

Commit a5f4f52e ("vt: use kzalloc() instead of the bootmem allocator")
replaced the alloc_bootmem() with kzalloc() but didn't set vc_kmalloced to
1 and the memory block is later leaked.  The corresponding kmemleak trace:

unreferenced object 0xdf828000 (size 8192):
  comm "swapper", pid 0, jiffies 4294937296
  backtrace:
    [<c006d473>] __save_stack_trace+0x17/0x1c
    [<c000d869>] log_early+0x55/0x84
    [<c01cfa4b>] kmemleak_alloc+0x33/0x3c
    [<c006c013>] __kmalloc+0xd7/0xe4
    [<c00108c7>] con_init+0xbf/0x1b8
    [<c0010149>] console_init+0x11/0x20
    [<c0008797>] start_kernel+0x137/0x1e4

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/vt.c
include/linux/console_struct.h