diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 17:46:07 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 17:46:07 +0300 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /arch/tile/mm/init.c | |
| parent | a37933c37c14b64e81c7c9cc44a5d3f5e0c91412 (diff) | |
| parent | 136333d104bd3a62d783b0ac3d0f32ac0108c5d0 (diff) | |
| download | linux-stable-d20bbfab01802e195a50435940f7e4aa747c217c.tar.gz linux-stable-d20bbfab01802e195a50435940f7e4aa747c217c.tar.bz2 linux-stable-d20bbfab01802e195a50435940f7e4aa747c217c.zip | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'arch/tile/mm/init.c')
| -rw-r--r-- | arch/tile/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c index 4e10c4023028..7309988c9794 100644 --- a/arch/tile/mm/init.c +++ b/arch/tile/mm/init.c @@ -836,8 +836,7 @@ void __init mem_init(void) #endif #ifdef CONFIG_FLATMEM - if (!mem_map) - BUG(); + BUG_ON(!mem_map); #endif #ifdef CONFIG_HIGHMEM |