Merge "SSR: Make smem ramdump devices unique" into msm-3.4
diff --git a/arch/arm/mach-msm/gss-8064.c b/arch/arm/mach-msm/gss-8064.c
index e65f2d2..b9b877a 100644
--- a/arch/arm/mach-msm/gss-8064.c
+++ b/arch/arm/mach-msm/gss-8064.c
@@ -243,7 +243,7 @@
goto out;
}
- gss_data.smem_ramdump_dev = create_ramdump_device("smem");
+ gss_data.smem_ramdump_dev = create_ramdump_device("smem-gss");
if (!gss_data.smem_ramdump_dev) {
pr_err("%s: Unable to create smem ramdump device. (%d)\n",
diff --git a/arch/arm/mach-msm/modem-8960.c b/arch/arm/mach-msm/modem-8960.c
index 5d02bda..a7f3a47 100644
--- a/arch/arm/mach-msm/modem-8960.c
+++ b/arch/arm/mach-msm/modem-8960.c
@@ -336,7 +336,7 @@
goto out;
}
- smem_ramdump_dev = create_ramdump_device("smem");
+ smem_ramdump_dev = create_ramdump_device("smem-modem");
if (!smem_ramdump_dev) {
pr_err("%s: Unable to create smem ramdump device. (%d)\n",
diff --git a/arch/arm/mach-msm/msm_dsps.c b/arch/arm/mach-msm/msm_dsps.c
index edadfac..200d717 100644
--- a/arch/arm/mach-msm/msm_dsps.c
+++ b/arch/arm/mach-msm/msm_dsps.c
@@ -574,7 +574,7 @@
drv->smem_ramdump_segments[0].address = drv->pdata->smem_start;
drv->smem_ramdump_segments[0].size = drv->pdata->smem_size;
- drv->smem_ramdump_dev = create_ramdump_device("smem");
+ drv->smem_ramdump_dev = create_ramdump_device("smem-dsps");
if (!drv->smem_ramdump_dev) {
pr_err("%s: create_ramdump_device(\"smem\") fail\n",
__func__);