[PATCH 3.18 101/151] axonram: Fix bug in direct_access

2015-03-03 Thread Greg Kroah-Hartman
3.18-stable review patch.  If anyone has any objections, please let me know.

--

From: Matthew Wilcox 

commit 91117a20245b59f70b563523edbf998a62fc6383 upstream.

The 'pfn' returned by axonram was completely bogus, and has been since
2008.

Signed-off-by: Matthew Wilcox 
Reviewed-by: Jan Kara 
Reviewed-by: Mathieu Desnoyers 
Signed-off-by: Jens Axboe 
Signed-off-by: Greg Kroah-Hartman 

---
 arch/powerpc/sysdev/axonram.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -156,7 +156,7 @@ axon_ram_direct_access(struct block_devi
}
 
*kaddr = (void *)(bank->ph_addr + offset);
-   *pfn = virt_to_phys(kaddr) >> PAGE_SHIFT;
+   *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT;
 
return 0;
 }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 3.18 101/151] axonram: Fix bug in direct_access

2015-03-03 Thread Greg Kroah-Hartman
3.18-stable review patch.  If anyone has any objections, please let me know.

--

From: Matthew Wilcox matthew.r.wil...@intel.com

commit 91117a20245b59f70b563523edbf998a62fc6383 upstream.

The 'pfn' returned by axonram was completely bogus, and has been since
2008.

Signed-off-by: Matthew Wilcox matthew.r.wil...@intel.com
Reviewed-by: Jan Kara j...@suse.cz
Reviewed-by: Mathieu Desnoyers mathieu.desnoy...@efficios.com
Signed-off-by: Jens Axboe ax...@fb.com
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org

---
 arch/powerpc/sysdev/axonram.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -156,7 +156,7 @@ axon_ram_direct_access(struct block_devi
}
 
*kaddr = (void *)(bank-ph_addr + offset);
-   *pfn = virt_to_phys(kaddr)  PAGE_SHIFT;
+   *pfn = virt_to_phys(*kaddr)  PAGE_SHIFT;
 
return 0;
 }


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/