2 files changed, 8 insertions, 10 deletions

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 600ac57e2777..7288e38e1757 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -268,14 +268,12 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
  */
 static inline int parse_lineno(const char *str, unsigned int *val)
 {
-        char *end = NULL;
         BUG_ON(str == NULL);
         if (*str == '\0') {
                 *val = 0;
                 return 0;
         }
-        *val = simple_strtoul(str, &end, 10);
-        if (end == NULL || end == str || *end != '\0') {
+        if (kstrtouint(str, 10, val) < 0) {
                 pr_err("bad line-number: %s\n", str);
                 return -EINVAL;
         }
@@ -348,14 +346,14 @@ static int ddebug_parse_query(char *words[], int nwords,
                         }
                         if (last)
                                 *last++ = '\0';
-                        if (parse_lineno(first, &query->first_lineno) < 0) {
-                                pr_err("line-number is <0\n");
+                        if (parse_lineno(first, &query->first_lineno) < 0)
                                 return -EINVAL;
-                        }
                         if (last) {
                                 /* range <first>-<last> */
-                                if (parse_lineno(last, &query->last_lineno)
-                                    < query->first_lineno) {
+                                if (parse_lineno(last, &query->last_lineno) < 0)
+                                        return -EINVAL;
+
+                                if (query->last_lineno < query->first_lineno) {
                                         pr_err("last-line:%d < 1st-line:%d\n",
                                                 query->last_lineno,
                                                 query->first_lineno);
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 2e1c102759ce..b604b831f4d1 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -172,7 +172,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
         /*
          * Get the overflow emergency buffer
          */
-        v_overflow_buffer = memblock_virt_alloc_nopanic(
+        v_overflow_buffer = memblock_virt_alloc_low_nopanic(
                                                 PAGE_ALIGN(io_tlb_overflow),
                                                 PAGE_SIZE);
         if (!v_overflow_buffer)
@@ -220,7 +220,7 @@ swiotlb_init(int verbose)
         bytes = io_tlb_nslabs << IO_TLB_SHIFT;
 
         /* Get IO TLB memory from the low pages */
-        vstart = memblock_virt_alloc_nopanic(PAGE_ALIGN(bytes), PAGE_SIZE);
+        vstart = memblock_virt_alloc_low_nopanic(PAGE_ALIGN(bytes), PAGE_SIZE);
         if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose))
                 return;