2 files changed, 49 insertions, 1 deletions

diff --git a/mm/bounce.c b/mm/bounce.c
index 06722c403058..bf0cf7c8387b 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -14,6 +14,7 @@
 #include <linux/hash.h>
 #include <linux/highmem.h>
 #include <linux/blktrace_api.h>
+#include <trace/block.h>
 #include <asm/tlbflush.h>
 
 #define POOL_SIZE       64
@@ -21,6 +22,8 @@
 
 static mempool_t *page_pool, *isa_page_pool;
 
+DEFINE_TRACE(block_bio_bounce);
+
 #ifdef CONFIG_HIGHMEM
 static __init int init_emergency_pool(void)
 {
@@ -222,7 +225,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
         if (!bio)
                 return;
 
-        blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
+        trace_block_bio_bounce(q, *bio_orig);
 
         /*
          * at least one page was bounced, fill in possible non-highmem
diff --git a/mm/mlock.c b/mm/mlock.c
index 1ada366570cb..3035a56e7616 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -667,3 +667,48 @@ void user_shm_unlock(size_t size, struct user_struct *user)
         spin_unlock(&shmlock_user_lock);
         free_uid(user);
 }
+
+void *alloc_locked_buffer(size_t size)
+{
+        unsigned long rlim, vm, pgsz;
+        void *buffer = NULL;
+
+        pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT;
+
+        down_write(&current->mm->mmap_sem);
+
+        rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
+        vm   = current->mm->total_vm + pgsz;
+        if (rlim < vm)
+                goto out;
+
+        rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+        vm   = current->mm->locked_vm + pgsz;
+        if (rlim < vm)
+                goto out;
+
+        buffer = kzalloc(size, GFP_KERNEL);
+        if (!buffer)
+                goto out;
+
+        current->mm->total_vm  += pgsz;
+        current->mm->locked_vm += pgsz;
+
+ out:
+        up_write(&current->mm->mmap_sem);
+        return buffer;
+}
+
+void free_locked_buffer(void *buffer, size_t size)
+{
+        unsigned long pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT;
+
+        down_write(&current->mm->mmap_sem);
+
+        current->mm->total_vm  -= pgsz;
+        current->mm->locked_vm -= pgsz;
+
+        up_write(&current->mm->mmap_sem);
+
+        kfree(buffer);
+}