summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-17 07:33:02 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-17 07:33:02 -0800
commitd62cdc2aca6c5027059b803010531ae08bad93f2 (patch)
tree114cadf82cf7ee5d2cfc3381d10d4b8e8ab3dd5d /drivers/soc
parent56b4a5d4694960cc117b179b5a95fb30d621d243 (diff)
parent8cb928e04e3974f45e4b3d9d9b792d09d0bb97ad (diff)
Merge "soc: qcom: ramdump: Remove page alignment during ramdump collection"
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/qcom/ramdump.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/soc/qcom/ramdump.c b/drivers/soc/qcom/ramdump.c
index 08499c549b47..c712ed392b0b 100644
--- a/drivers/soc/qcom/ramdump.c
+++ b/drivers/soc/qcom/ramdump.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -326,13 +326,7 @@ static int _do_ramdump(void *handle, struct ramdump_segment *segments,
if (rd_dev->complete_ramdump) {
for (i = 0; i < nsegments-1; i++)
segments[i].size =
- PAGE_ALIGN(segments[i+1].address - segments[i].address);
-
- segments[nsegments-1].size =
- PAGE_ALIGN(segments[nsegments-1].size);
- } else {
- for (i = 0; i < nsegments; i++)
- segments[i].size = PAGE_ALIGN(segments[i].size);
+ segments[i + 1].address - segments[i].address;
}
rd_dev->segments = segments;