Update standard patch set to v6.14-pre-rc-w-ia64-2

from
https://github.com/johnny-mnemonic/linux-ia64/tree/v6.14-pre-rc-w-ia64-2

patches/standard/0001-Revert-Documentation-Drop-or-replace-remaining-menti.patch

@@ -1,7 +1,7 @@
-From f08f0e8614d0d43e69cc6a1a713ca5b2d50fafcb Mon Sep 17 00:00:00 2001
+From c1edf7a82c84a2c6f9466bd1c2ca275528fe725c Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Fri, 27 Oct 2023 13:11:28 +0200
-Subject: [PATCH 01/53] Revert "Documentation: Drop or replace remaining
+Subject: [PATCH 01/56] Revert "Documentation: Drop or replace remaining
  mentions of IA64"
 
 This reverts commit 944834901adc94b3a44d1dd153eb739a937e52d2.
@@ -181,7 +181,7 @@ index 0f714fc945ac..63a4c5deb156 100644
  =====
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 8fbb481db515..3413757a7ab3 100644
+index d0f6c055dfcc..a3c049795010 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -1513,7 +1513,7 @@
@@ -207,7 +207,7 @@ index 8fbb481db515..3413757a7ab3 100644
  			Forcefully enable Physical Address Extension (PAE).
  			Many Pentium M systems disable PAE but may have a
 diff --git a/Documentation/admin-guide/mm/memory-hotplug.rst b/Documentation/admin-guide/mm/memory-hotplug.rst
-index cb2c080f400c..4ffdc928a720 100644
+index 33c886f3d198..5f13935e2a29 100644
 --- a/Documentation/admin-guide/mm/memory-hotplug.rst
 +++ b/Documentation/admin-guide/mm/memory-hotplug.rst
 @@ -33,7 +33,7 @@ used to expose persistent memory, other performance-differentiated memory and

patches/standard/0002-Revert-lib-raid6-Drop-IA64-support.patch

@@ -1,7 +1,7 @@
-From 7ea00b49432f1d443c5d22b2d92efe3ef3a3aa03 Mon Sep 17 00:00:00 2001
+From f6f05a39207e5e718fab1069370a0287e9da4810 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Fri, 27 Oct 2023 13:11:38 +0200
-Subject: [PATCH 02/53] Revert "lib/raid6: Drop IA64 support"
+Subject: [PATCH 02/56] Revert "lib/raid6: Drop IA64 support"
 
 This reverts commit b089ea3cc30de85ea7e20aa66500feb4082dfbf7.
 ---

patches/standard/0003-Revert-Documentation-Drop-IA64-from-feature-descript.patch

@@ -1,7 +1,7 @@
-From 62cb07bc633f3d3df36d74c724d17ef293fb7bba Mon Sep 17 00:00:00 2001
+From 32a5b95af576808666ff983540778ccb2c686b01 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Fri, 27 Oct 2023 13:11:48 +0200
-Subject: [PATCH 03/53] Revert "Documentation: Drop IA64 from feature
+Subject: [PATCH 03/56] Revert "Documentation: Drop IA64 from feature
  descriptions"
 
 This reverts commit af1f459233d4edeef634f559539e7f4b64cb1d25.

patches/standard/0004-Revert-kernel-Drop-IA64-support-from-sig_fault-handl.patch

@@ -1,7 +1,7 @@
-From 8eeda053cf78a6b48499d1ed7144fec175027d30 Mon Sep 17 00:00:00 2001
+From 495609a12e577b4cd779dc6bed26eb2736c22374 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Fri, 27 Oct 2023 13:11:55 +0200
-Subject: [PATCH 04/53] Revert "kernel: Drop IA64 support from sig_fault
+Subject: [PATCH 04/56] Revert "kernel: Drop IA64 support from sig_fault
  handlers"
 
 This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0.

patches/standard/0005-Revert-arch-Remove-Itanium-IA-64-architecture.patch

@@ -1,7 +1,7 @@
-From 3bdccfc046dcdc8dd2f814c1c039294c5ccc2a2f Mon Sep 17 00:00:00 2001
+From faaab207089c5778130692b62000164f884bb8aa Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Fri, 27 Oct 2023 13:13:25 +0200
-Subject: [PATCH 05/53] Revert "arch: Remove Itanium (IA-64) architecture"
+Subject: [PATCH 05/56] Revert "arch: Remove Itanium (IA-64) architecture"
 
 This reverts commit cf8e8658100d4eae80ce9b21f7a81cb024dd5057.
 ---
@@ -354,12 +354,12 @@ This reverts commit cf8e8658100d4eae80ce9b21f7a81cb024dd5057.
  lib/Kconfig.debug                             |    2 +-
  lib/decompress_unxz.c                         |    3 +
  lib/xz/Kconfig                                |    5 +
- mm/mmap.c                                     |    6 +-
+ mm/vma.c                                      |    4 +-
  tools/arch/ia64/include/asm/barrier.h         |   59 +
  .../arch/ia64/include/uapi/asm/bitsperlong.h  |    9 +
  tools/arch/ia64/include/uapi/asm/mman.h       |    7 +
  usr/include/Makefile                          |    6 +
- 354 files changed, 64954 insertions(+), 41 deletions(-)
+ 354 files changed, 64953 insertions(+), 40 deletions(-)
  create mode 100644 Documentation/arch/ia64/aliasing.rst
  create mode 100644 Documentation/arch/ia64/efirtc.rst
  create mode 100644 Documentation/arch/ia64/err_inject.rst
@@ -3010,10 +3010,10 @@ index e1b0eeabbb5e..59fd6ed5e3f1 100644
    This option sets ``possible_cpus`` bits in ``cpu_possible_mask``.
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4cb247c28437..046821cc516d 100644
+index feed152470f6..6d7cae4565a0 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -10972,6 +10972,12 @@ F:	drivers/i3c/
+@@ -10976,6 +10976,12 @@ F:	drivers/i3c/
  F:	include/dt-bindings/i3c/
  F:	include/linux/i3c/
 
@@ -3026,7 +3026,7 @@ index 4cb247c28437..046821cc516d 100644
  IBM Operation Panel Input Driver
  M:	Eddie James <eajames@linux.ibm.com>
  L:	linux-input@vger.kernel.org
-@@ -17881,6 +17887,11 @@ S:	Maintained
+@@ -17900,6 +17906,11 @@ S:	Maintained
  F:	drivers/leds/leds-pca9532.c
  F:	include/linux/leds-pca9532.h
 
@@ -67995,7 +67995,7 @@ index 053c57e61869..9ca550056150 100644
   * We play games with efi_enabled so that the compiler will, if
   * possible, remove EFI-related code altogether.
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 21428d897d76..e3b55451452d 100644
+index 7b1068ddcbb7..044ed74c9ded 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -388,6 +388,8 @@ extern unsigned int kobjsize(const void *objp);
@@ -68021,10 +68021,10 @@ index bfb85fd13e1f..e4597d7edbcf 100644
  #else
  #define __moduleparam_const const
 diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
-index d36c857dd249..fed9d6b9946c 100644
+index 72fbfe3caeaf..e93cafecbf58 100644
 --- a/include/trace/events/mmflags.h
 +++ b/include/trace/events/mmflags.h
-@@ -196,7 +196,7 @@ IF_HAVE_PG_ARCH_3(arch_3)
+@@ -197,7 +197,7 @@ IF_HAVE_PG_ARCH_3(arch_3)
  #define __VM_ARCH_SPECIFIC_1 {VM_PAT,     "pat"           }
  #elif defined(CONFIG_PPC64)
  #define __VM_ARCH_SPECIFIC_1 {VM_SAO,     "sao"           }
@@ -68034,10 +68034,10 @@ index d36c857dd249..fed9d6b9946c 100644
  #elif !defined(CONFIG_MMU)
  #define __VM_ARCH_SPECIFIC_1 {VM_MAPPED_COPY,"mappedcopy"	}
 diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 0509a9733745..18af2c7578b6 100644
+index 07455d25329c..f8347db51671 100644
 --- a/kernel/cpu.c
 +++ b/kernel/cpu.c
-@@ -1701,6 +1701,9 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target)
+@@ -1702,6 +1702,9 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target)
  	if (!cpu_possible(cpu)) {
  		pr_err("can't online cpu %d because it is not configured as may-hotadd at boot time\n",
  		       cpu);
@@ -68048,10 +68048,10 @@ index 0509a9733745..18af2c7578b6 100644
  	}
 
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 2fa2a3582925..9f668e2516c5 100644
+index cba5ede2c639..471748258635 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -3036,7 +3036,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs)
+@@ -3037,7 +3037,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs)
  		if (!access_ok((void __user *)kargs->stack, kargs->stack_size))
  			return false;
 
@@ -68061,10 +68061,10 @@ index 2fa2a3582925..9f668e2516c5 100644
  #endif
  	}
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 901170708e2a..2ff5acba784c 100644
+index 9142a0394d46..6524829ffe2b 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -8860,9 +8860,9 @@ void normalize_rt_tasks(void)
+@@ -8868,9 +8868,9 @@ void normalize_rt_tasks(void)
 
  #endif /* CONFIG_MAGIC_SYSRQ */
 
@@ -68076,7 +68076,7 @@ index 901170708e2a..2ff5acba784c 100644
   *
   * They can only be called when the whole system has been
   * stopped - every CPU needs to be quiescent, and no scheduling
-@@ -8884,7 +8884,30 @@ struct task_struct *curr_task(int cpu)
+@@ -8892,7 +8892,30 @@ struct task_struct *curr_task(int cpu)
  	return cpu_curr(cpu);
  }
 
@@ -68129,7 +68129,7 @@ index 7ae7a4136855..aa28a912e9ad 100644
  	{
  		.procname	= "max_lock_depth",
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 5f1874622175..ecdc0021d67d 100644
+index 101d6482ed5a..29af62ddb76e 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
 @@ -781,7 +781,7 @@ config SHRINKER_DEBUG
@@ -68171,11 +68171,11 @@ index 20aa459bfb3e..8968e2b8a12e 100644
  config XZ_DEC_ARM
  	bool "ARM BCJ filter decoder" if EXPERT
  	default y
-diff --git a/mm/mmap.c b/mm/mmap.c
-index aec208f90337..880ae9edd306 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -1028,9 +1028,9 @@ static int acct_stack_growth(struct vm_area_struct *vma,
+diff --git a/mm/vma.c b/mm/vma.c
+index af1d549b179c..d3343ae68509 100644
+--- a/mm/vma.c
++++ b/mm/vma.c
+@@ -2772,9 +2772,9 @@ static int acct_stack_growth(struct vm_area_struct *vma,
  	return 0;
  }
 
@@ -68186,16 +68186,7 @@ index aec208f90337..880ae9edd306 100644
 + * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
   * vma is the last one with address > vma->vm_end.  Have to extend vma.
   */
- static int expand_upwards(struct vm_area_struct *vma, unsigned long address)
-@@ -1113,7 +1113,7 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address)
- 	validate_mm(mm);
- 	return error;
- }
--#endif /* CONFIG_STACK_GROWSUP */
-+#endif /* CONFIG_STACK_GROWSUP || CONFIG_IA64 */
-
- /*
-  * vma is the first one with address < vma->vm_start.  Have to extend vma.
+ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 diff --git a/tools/arch/ia64/include/asm/barrier.h b/tools/arch/ia64/include/asm/barrier.h
 new file mode 100644
 index 000000000000..6fffe5682713

patches/standard/0006-ia64-Use-generic-lock-bitops.patch

@@ -1,7 +1,7 @@
-From 0b895227e1e0065dd705ec15a497aff4f34a0361 Mon Sep 17 00:00:00 2001
+From 20581c831116db6b852e237f971f2972e2417dac Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Tue, 31 Oct 2023 19:49:13 +0100
-Subject: [PATCH 06/53] ia64: Use generic lock bitops
+Subject: [PATCH 06/56] ia64: Use generic lock bitops
 
 ia64 is missing the function xor_unlock_is_negative_byte. Resolve this
 by including asm-generic/bitops/lock.h and removing clear_bit_unlock

patches/standard/0007-ia64-Remove-unused-syscall_lookup_dcookie.patch

@@ -1,7 +1,7 @@
-From 2418cdc00a04508e52bd3b7652b511d8965eb2eb Mon Sep 17 00:00:00 2001
+From c8cba66d99aa46cfb27f660b9c40729d01b43874 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Tue, 31 Oct 2023 19:51:09 +0100
-Subject: [PATCH 07/53] ia64: Remove unused syscall_lookup_dcookie
+Subject: [PATCH 07/56] ia64: Remove unused syscall_lookup_dcookie
 
 lookup_dcookie was removed on other architectures after ia64 was
 dropped.

patches/standard/0008-ia64-Correct-parse_crashkernel-argument-count.patch

@@ -1,7 +1,7 @@
-From 4b39fcd29845db35dbdb54389ec174fcf8314c0e Mon Sep 17 00:00:00 2001
+From 2dc143cc04825e2c0e3b31489942b71edc795ae6 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Tue, 31 Oct 2023 19:49:39 +0100
-Subject: [PATCH 08/53] ia64: Correct parse_crashkernel argument count
+Subject: [PATCH 08/56] ia64: Correct parse_crashkernel argument count
 
 New function has two more parameters crash_size and crash_base;
 fix build by passing NULL to them.

patches/standard/0009-ia64-Reserve-map_shadow_stack-syscall-number.patch

@@ -1,7 +1,7 @@
-From 25e32fa2a0018a9ab78049b8b82d035504243f1e Mon Sep 17 00:00:00 2001
+From 6a7ade18509f2510ffa9c63d3624969a87933892 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 9 Nov 2023 17:18:24 +0100
-Subject: [PATCH 09/53] ia64: Reserve map_shadow_stack() syscall number
+Subject: [PATCH 09/56] ia64: Reserve map_shadow_stack() syscall number
 
 map_shadow_stack was introducted after ia64 was removed from
 the kernel hence it was not added to ia64 syscall table.

patches/standard/0010-ia64-Add-futex_wake-syscall.patch

@@ -1,7 +1,7 @@
-From def1aa938d09d1046b14a2ad17cd5589f5a24c71 Mon Sep 17 00:00:00 2001
+From a427b67719bde79689e91ddb6de4357076ca3a4f Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 9 Nov 2023 17:24:02 +0100
-Subject: [PATCH 10/53] ia64: Add futex_wake() syscall
+Subject: [PATCH 10/56] ia64: Add futex_wake() syscall
 
 futex_wake() was added after ia64 was removed from the kernel.
 

patches/standard/0011-ia64-Add-futex_wait-syscall.patch

@@ -1,7 +1,7 @@
-From c6d852374206358ec4cdd0b9cf90af5697d98d85 Mon Sep 17 00:00:00 2001
+From 798b70db1f1394a7c05967505ee23c01843592cf Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 9 Nov 2023 17:31:05 +0100
-Subject: [PATCH 11/53] ia64: Add futex_wait() syscall
+Subject: [PATCH 11/56] ia64: Add futex_wait() syscall
 
 futex_wait() was added after ia64 was removed from the kernel.
 

patches/standard/0012-ia64-Add-futex_requeue-syscall.patch

@@ -1,7 +1,7 @@
-From 75c06acef2dd6a1aa170edcacc1ca4df0810e491 Mon Sep 17 00:00:00 2001
+From 65aa87fbf33e1d53f3943b71456294793a8973bd Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 9 Nov 2023 17:32:42 +0100
-Subject: [PATCH 12/53] ia64: Add futex_requeue() syscall
+Subject: [PATCH 12/56] ia64: Add futex_requeue() syscall
 
 futex_requeue() was added after ia64 was removed from the kernel.
 

patches/standard/0013-ia64-Remove-sentinel-element.patch

@@ -1,7 +1,7 @@
-From 493a3944bd7f059a2baffb4e1d026e6fe35347c0 Mon Sep 17 00:00:00 2001
+From 8a07a5cb1078fede16f4f712c5c195d08ef9c3cc Mon Sep 17 00:00:00 2001
 From: Johnny Mnemonic <jm@machine-hall.org>
 Date: Mon, 13 Nov 2023 22:54:43 +0100
-Subject: [PATCH 13/53] ia64: Remove sentinel element
+Subject: [PATCH 13/56] ia64: Remove sentinel element
 
 See 426ee5196d1821d70192923e70c0f8347faade47.
 ---

patches/standard/0014-Revert-linux-export-clean-up-the-IA-64-KSYM_FUNC-mac.patch

@@ -1,7 +1,7 @@
-From 6962e738ad0347e28213ed0e349c9cc7c94eb8b8 Mon Sep 17 00:00:00 2001
+From d943d744674cb1e409e19abe7e37b3cae12c631b Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Mon, 20 Nov 2023 17:08:57 +0100
-Subject: [PATCH 14/53] Revert "linux/export: clean up the IA-64 KSYM_FUNC
+Subject: [PATCH 14/56] Revert "linux/export: clean up the IA-64 KSYM_FUNC
  macro"
 
 This reverts commit 9e0be3f50c0e8517d0238b62409c20bcb8cd8785.

patches/standard/0015-ia64-set-nid-of-all-reserved-memblocks-to-0-at-setup.patch

@@ -1,7 +1,7 @@
-From 99b11654b30383954503d81e186f03ded5c73108 Mon Sep 17 00:00:00 2001
+From 947eb8b4e872b9250a2d231863df9da16ec5b1b4 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Tue, 21 Nov 2023 16:40:42 +0100
-Subject: [PATCH 15/53] ia64: set nid of all reserved memblocks to 0 at setup
+Subject: [PATCH 15/56] ia64: set nid of all reserved memblocks to 0 at setup
 
 Kernel panic was reported on HP Integrity rx6600 servers after commit
 61167ad5fecde ("mm: pass nid to reserve_bootmem_region()"):

patches/standard/0016-ia64-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch

@@ -1,7 +1,7 @@
-From 39047ce90f0b3d2e07cbbbd3cb677242f5e1aa31 Mon Sep 17 00:00:00 2001
+From 20fa72f0838279b38d123c8fd1ea964d19337402 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 11 Jan 2024 13:37:09 +0100
-Subject: [PATCH 16/53] ia64: rename MAX_ORDER to MAX_PAGE_ORDER
+Subject: [PATCH 16/56] ia64: rename MAX_ORDER to MAX_PAGE_ORDER
 
 MAX_ORDER was renamed to MAX_PAGE_ORDER in commit 5e0a760b44417
 ("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER"). Rename it also

patches/standard/0017-Revert-mm-remove-unnecessary-ia64-code-and-comment.patch

@@ -1,7 +1,7 @@
-From d47a40b721035a13688277d948dedaeeab251264 Mon Sep 17 00:00:00 2001
+From 9e1f9834f7a9036216dcbecf791a3879ec9616b2 Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Thu, 11 Jan 2024 14:21:54 +0100
-Subject: [PATCH 17/53] Revert "mm: remove unnecessary ia64 code and comment"
+Subject: [PATCH 17/56] Revert "mm: remove unnecessary ia64 code and comment"
 
 This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f.
 ---
@@ -12,10 +12,10 @@ This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f.
  4 files changed, 42 insertions(+), 22 deletions(-)
 
 diff --git a/mm/Kconfig b/mm/Kconfig
-index 84000b016808..e67060d4795c 100644
+index 1b501db06417..9273c11bb744 100644
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
-@@ -749,7 +749,7 @@ config DEFAULT_MMAP_MIN_ADDR
+@@ -792,7 +792,7 @@ config DEFAULT_MMAP_MIN_ADDR
  	  from userspace allocation.  Keeping a user from writing to low pages
  	  can help reduce the impact of kernel NULL pointer bugs.
 
@@ -25,7 +25,7 @@ index 84000b016808..e67060d4795c 100644
  	  On arm and other archs it should not be higher than 32768.
  	  Programs which use vm86 functionality or have some need to map
 diff --git a/mm/memory.c b/mm/memory.c
-index f8bebec145f5..bb003b8d1424 100644
+index 539c0f7c6d54..0b747ae8bdec 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -124,7 +124,9 @@ static __always_inline bool vmf_orig_pte_uffd_wp(struct vm_fault *vmf)
@@ -40,7 +40,7 @@ index f8bebec145f5..bb003b8d1424 100644
  void *high_memory;
  EXPORT_SYMBOL(high_memory);
 diff --git a/mm/mm_init.c b/mm/mm_init.c
-index 24b68b425afb..0079253122a5 100644
+index 2630cc30147e..0edf97e10d8c 100644
 --- a/mm/mm_init.c
 +++ b/mm/mm_init.c
 @@ -1485,7 +1485,8 @@ void __init set_pageblock_order(void)
@@ -53,7 +53,7 @@ index 24b68b425afb..0079253122a5 100644
  	 */
  	pageblock_order = order;
  }
-@@ -1603,8 +1604,8 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align,
+@@ -1607,8 +1608,8 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align,
  #ifdef CONFIG_FLATMEM
  static void __init alloc_node_mem_map(struct pglist_data *pgdat)
  {
@@ -64,7 +64,7 @@ index 24b68b425afb..0079253122a5 100644
 
  	/* Skip empty nodes */
  	if (!pgdat->node_spanned_pages)
-@@ -1612,25 +1613,34 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat)
+@@ -1616,25 +1617,34 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat)
 
  	start = pgdat->node_start_pfn & ~(MAX_ORDER_NR_PAGES - 1);
  	offset = pgdat->node_start_pfn - start;