2 files changed, 2 insertions, 4 deletions

diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h
index e0a899a1a8a6..5a84b3a50741 100644
--- a/arch/ia64/include/asm/processor.h
+++ b/arch/ia64/include/asm/processor.h
@@ -319,7 +319,7 @@ struct thread_struct {
         regs->loadrs = 0;                                                                       \
         regs->r8 = get_dumpable(current->mm);   /* set "don't zap registers" flag */            \
         regs->r12 = new_sp - 16;        /* allocate 16 byte scratch area */                     \
-        if (unlikely(!get_dumpable(current->mm))) {                                                     \
+        if (unlikely(get_dumpable(current->mm) != SUID_DUMP_USER)) {    \
                 /*                                                                              \
                  * Zap scratch regs to avoid leaking bits between processes with different      \
                  * uid/privileges.                                                              \
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index b6f7f43424ec..88504abf5704 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -357,9 +357,7 @@ int vmemmap_find_next_valid_pfn(int node, int i)
 
         end_address = (unsigned long) &vmem_map[pgdat->node_start_pfn + i];
         end_address = PAGE_ALIGN(end_address);
-
-        stop_address = (unsigned long) &vmem_map[
-                pgdat->node_start_pfn + pgdat->node_spanned_pages];
+        stop_address = (unsigned long) &vmem_map[pgdat_end_pfn(pgdat)];
 
         do {
                 pgd_t *pgd;