aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-02-25 10:04:03 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-25 10:38:34 -0500
commit34754b69a6f87aa6aa2860525a82f12532f83afd (patch)
tree2f5234670238c3cf1139d09545fd25140f49c003 /mm
parent95108fa34a83ffd97e0af959e4b28d7c62008781 (diff)
x86: make vmap yell louder when it is used under irqs_disabled()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 4dd2636d0b92..f83a70167b99 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1257,6 +1257,7 @@ EXPORT_SYMBOL(vfree);
1257void vunmap(const void *addr) 1257void vunmap(const void *addr)
1258{ 1258{
1259 BUG_ON(in_interrupt()); 1259 BUG_ON(in_interrupt());
1260 might_sleep();
1260 __vunmap(addr, 0); 1261 __vunmap(addr, 0);
1261} 1262}
1262EXPORT_SYMBOL(vunmap); 1263EXPORT_SYMBOL(vunmap);
@@ -1276,6 +1277,8 @@ void *vmap(struct page **pages, unsigned int count,
1276{ 1277{
1277 struct vm_struct *area; 1278 struct vm_struct *area;
1278 1279
1280 might_sleep();
1281
1279 if (count > num_physpages) 1282 if (count > num_physpages)
1280 return NULL; 1283 return NULL;
1281 1284