diff --git a/[refs] b/[refs] index f7430a8ed97a..1c04481014f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f8e0b31ad257bca9ff5dda9fdfdcc98d38d97f8 +refs/heads/master: e5f7787388da7562b955a36b46e909e500a5974b diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c index 68221ee9a870..cf374348d907 100644 --- a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c +++ b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c @@ -30,9 +30,6 @@ static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vm void **virt; unsigned long offset, sb_bindex; - if (!buf) - return VM_FAULT_OOM; - /* * Verify that faults are only done on the range of pages owned by the * reader.