diff --git a/[refs] b/[refs] index ec1538849d4b..7fbadcc6c6d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44bc9dc729e33a4ec6ebed4d0b6c08e8d20b42cf +refs/heads/master: a34b50ddc265bae058c66661b096ef6384c5a8b1 diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h index 776b641f37e3..a3963ba23a6d 100644 --- a/trunk/include/linux/mm.h +++ b/trunk/include/linux/mm.h @@ -1320,7 +1320,6 @@ int vmemmap_populate(struct page *start_page, unsigned long pages, int node); void vmemmap_populate_print_last(void); extern void *alloc_locked_buffer(size_t size); -extern void free_locked_buffer(void *buffer, size_t size); extern void refund_locked_buffer_memory(struct mm_struct *mm, size_t size); #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c index 749383b442c7..28be15ead9c1 100644 --- a/trunk/mm/mlock.c +++ b/trunk/mm/mlock.c @@ -671,9 +671,3 @@ void refund_locked_buffer_memory(struct mm_struct *mm, size_t size) up_write(&mm->mmap_sem); } - -void free_locked_buffer(void *buffer, size_t size) -{ - refund_locked_buffer_memory(current->mm, size); - kfree(buffer); -}