On 05/18/2012 10:57 PM, Andrey Konovalov wrote:
> Samsung LT's topics:
> topic/base topic/core topic/bl topic/dt topic/fb topic/pd topic/s2ram
> topic/asv_cpufreq topic/led topic/dummy_reg topic/gadget topic/touch
> topic/wlan topic/audio topic/hdmi topic/mfc topic/mali
> topic/cma_origen topic/android_config topic/ubuntu_config
>
Attached patch fixes kernel panic while booting Android on Origen board
using linux-linaro kernel. Since this is touching the core file, I would
like to know if there are any objections to this.
Andrey,
If it is ok, you may either apply the patch or merge [1].
[1] git://git.linaro.org/landing-teams/working/samsung/kernel.git
(llt/umm_fixes)
>>>
drivers/media/video/videobuf2-dma-contig.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/videobuf2-dma-contig.c
b/drivers/media/video/videobuf2-dma-contig.c
index 266ae7d..57e643b 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/drivers/media/video/videobuf2-dma-contig.c
@@ -273,6 +273,9 @@ static struct vm_area_struct *vb2_dc_get_user_vma(
static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
int n_pages, struct vm_area_struct *vma, int write)
{
+ if (vma->vm_mm == NULL)
+ vma->vm_mm = current->mm;
+
if (vma_is_io(vma)) {
unsigned int i;
--
Tushar Behera
>From c579b4d6b17a6fb1b15cc681268db54e5b73afaf Mon Sep 17 00:00:00 2001
From: Sachin Kamat <[email protected]>
Date: Mon, 21 May 2012 13:51:19 +0530
Subject: [PATCH] VB2-DC: Fix Null pointer related kernel boot crash
vma->vm_mm should point to the proper mm structure. But the pointer is
NULL here. Explicitly setting it to current->mm to avoid kernel crash
during bootup.
Signed-off-by: Ritesh Kumar Solanki <[email protected]>
Signed-off-by: Sachin Kamat <[email protected]>
Signed-off-by: Tushar Behera <[email protected]>
---
drivers/media/video/videobuf2-dma-contig.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c
index 266ae7d..57e643b 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/drivers/media/video/videobuf2-dma-contig.c
@@ -273,6 +273,9 @@ static struct vm_area_struct *vb2_dc_get_user_vma(
static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
int n_pages, struct vm_area_struct *vma, int write)
{
+ if (vma->vm_mm == NULL)
+ vma->vm_mm = current->mm;
+
if (vma_is_io(vma)) {
unsigned int i;
--
1.7.4.1
_______________________________________________
linaro-dev mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/linaro-dev