From db585c332c70ef1ac07d1fd0b684e6c411b58c77 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Mon, 2 Dec 2024 10:45:35 +0100 Subject: [PATCH] Update standard patch set to v6.13-rc1-w-ia64 from https://github.com/johnny-mnemonic/linux-ia64/tree/v6.13-rc1-w-ia64 Also drop extra patch now in standard patch set. --- ...e2f50261cd2f654d931eeb933c370a3a7d7a.patch | 20 ----- ...tion-Drop-or-replace-remaining-menti.patch | 22 ++--- ...2-Revert-lib-raid6-Drop-IA64-support.patch | 4 +- ...tion-Drop-IA64-from-feature-descript.patch | 6 +- ...op-IA64-support-from-sig_fault-handl.patch | 6 +- ...ch-Remove-Itanium-IA-64-architecture.patch | 30 +++---- .../0006-ia64-Use-generic-lock-bitops.patch | 4 +- ...Remove-unused-syscall_lookup_dcookie.patch | 4 +- ...ect-parse_crashkernel-argument-count.patch | 4 +- ...erve-map_shadow_stack-syscall-number.patch | 4 +- .../0010-ia64-Add-futex_wake-syscall.patch | 4 +- .../0011-ia64-Add-futex_wait-syscall.patch | 4 +- .../0012-ia64-Add-futex_requeue-syscall.patch | 4 +- .../0013-ia64-Remove-sentinel-element.patch | 4 +- ...ort-clean-up-the-IA-64-KSYM_FUNC-mac.patch | 4 +- ...all-reserved-memblocks-to-0-at-setup.patch | 4 +- ...4-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch | 4 +- ...ve-unnecessary-ia64-code-and-comment.patch | 12 +-- ...h-remove-ARCH_THREAD_STACK_ALLOCATOR.patch | 8 +- ...ch-remove-ARCH_TASK_STRUCT_ALLOCATOR.patch | 14 ++-- ...rch-remove-ARCH_TASK_STRUCT_ON_STACK.patch | 8 +- ...vert-tty-deprecate-tty_write_message.patch | 6 +- ...ve-the-IA64-specific-vma-expansion-i.patch | 4 +- ...ert-hpet-remove-hpets-hp_clocksource.patch | 4 +- ...ange-alloc_pages-name-in-dma_map_ops.patch | 4 +- ...A-early-use-of-cpu_to_node-returns-0.patch | 4 +- ...move-guard-around-pgd_offset_k-macro.patch | 4 +- ...-Squash-acpi_numa_memory_affinity_in.patch | 4 +- ...-Remove-architecture-dependent-remai.patch | 6 +- ...d-vtime-Do-not-include-asm-vtime.h-h.patch | 4 +- .../0030-ia64-fix-Python-string-escapes.patch | 4 +- ...-dma-mapping-clearly-mark-DMA-ops-as.patch | 4 +- ...tially-revert-x86-remove-PG_uncached.patch | 4 +- ...rch_get_unmapped_area-take-vm_flags-.patch | 4 +- ...e-unused-declaration-efi_initialize_.patch | 4 +- ...-asm-unaligned.h-to-linux-unaligned..patch | 4 +- ...ence-warning-due-to-redefinition-of-.patch | 4 +- ...karound-Wmissing-prototypes-warnings.patch | 4 +- ...ove-unused-__HAVE_THREAD_FUNCTIONS-h.patch | 8 +- ...generic-provide-generic-page_to_phys.patch | 4 +- ...-define-CONFIG_PAGE_SIZE_-KB-on-all-.patch | 4 +- ...emove-unused-hugepage-for-vma_alloc_.patch | 4 +- ...sm-generic-introduce-text-patching.h.patch | 4 +- ...rop-hugetlb_get_unmapped_area-_-func.patch | 4 +- .../0044-ia64-disable-build-time-check.patch | 80 +++++++++++++++++++ 45 files changed, 207 insertions(+), 147 deletions(-) delete mode 100644 patches/extra/0001-ia64-workaround-0c3ce2f50261cd2f654d931eeb933c370a3a7d7a.patch create mode 100644 patches/standard/0044-ia64-disable-build-time-check.patch diff --git a/patches/extra/0001-ia64-workaround-0c3ce2f50261cd2f654d931eeb933c370a3a7d7a.patch b/patches/extra/0001-ia64-workaround-0c3ce2f50261cd2f654d931eeb933c370a3a7d7a.patch deleted file mode 100644 index 31ad5c8..0000000 --- a/patches/extra/0001-ia64-workaround-0c3ce2f50261cd2f654d931eeb933c370a3a7d7a.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c -index 3f7a203d35c6..30628540f500 100644 ---- a/mm/page_frag_cache.c -+++ b/mm/page_frag_cache.c -@@ -23,7 +23,14 @@ - static unsigned long encoded_page_create(struct page *page, unsigned int order, - bool pfmemalloc) - { -- BUILD_BUG_ON(PAGE_FRAG_CACHE_MAX_ORDER > PAGE_FRAG_CACHE_ORDER_MASK); -+// DEBUG -+#define XSTR(x) STR(x) -+#define STR(x) #x -+ -+#pragma message "PAGE_FRAG_CACHE_MAX_ORDER = " XSTR(PAGE_FRAG_CACHE_MAX_ORDER) -+#pragma message "PAGE_FRAG_CACHE_ORDER_MASK = " XSTR(PAGE_FRAG_CACHE_ORDER_MASK) -+// DEBUG -+ //BUILD_BUG_ON(PAGE_FRAG_CACHE_MAX_ORDER > PAGE_FRAG_CACHE_ORDER_MASK); - BUILD_BUG_ON(PAGE_FRAG_CACHE_PFMEMALLOC_BIT >= PAGE_SIZE); - - return (unsigned long)page_address(page) | diff --git a/patches/standard/0001-Revert-Documentation-Drop-or-replace-remaining-menti.patch b/patches/standard/0001-Revert-Documentation-Drop-or-replace-remaining-menti.patch index 1128aa3..547567f 100644 --- a/patches/standard/0001-Revert-Documentation-Drop-or-replace-remaining-menti.patch +++ b/patches/standard/0001-Revert-Documentation-Drop-or-replace-remaining-menti.patch @@ -1,7 +1,7 @@ -From 2486e8435cf74b76cdca6ce8fe1dc7e77b517b5d Mon Sep 17 00:00:00 2001 +From d651b97d2b8d6fa90389edc22fd15964bccaaefc Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:28 +0200 -Subject: [PATCH 01/43] Revert "Documentation: Drop or replace remaining +Subject: [PATCH 01/44] 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 a4736ee87b1a..0e388784ce72 100644 +index dc663c0ca670..c614f9b7e72a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1503,7 +1503,7 @@ @@ -220,10 +220,10 @@ index cb2c080f400c..4ffdc928a720 100644 Memory Hot(Un)Plug Granularity ------------------------------ diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst -index f8bc1630eba0..a710c59b75df 100644 +index b2b36d0c3094..d1ccc6d21c08 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst -@@ -454,8 +454,8 @@ ignore-unaligned-usertrap +@@ -463,8 +463,8 @@ ignore-unaligned-usertrap On architectures where unaligned accesses cause traps, and where this feature is supported (``CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN``; @@ -234,7 +234,7 @@ index f8bc1630eba0..a710c59b75df 100644 = ============================================================= 0 Log all unaligned accesses. -@@ -463,7 +463,10 @@ unaligned traps are logged. +@@ -472,7 +472,10 @@ unaligned traps are logged. setting. = ============================================================= @@ -246,7 +246,7 @@ index f8bc1630eba0..a710c59b75df 100644 io_uring_disabled ================= -@@ -1563,6 +1566,22 @@ See Documentation/admin-guide/kernel-parameters.rst and +@@ -1572,6 +1575,22 @@ See Documentation/admin-guide/kernel-parameters.rst and Documentation/trace/boottime-trace.rst. @@ -313,7 +313,7 @@ index cb3d3228dfc8..981ad4f89fd3 100644 At least LSI FW643e and FW643e2 controllers are known to support access to physical addresses above 4 GB, but this feature is currently not enabled by diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst -index 7964e0c245ae..8e950c8d1b0e 100644 +index d36519f194dc..a348d4becaae 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -53,7 +53,7 @@ knowledge about the kernel Makefiles, plus detailed knowledge about the @@ -425,10 +425,10 @@ index b2ac3c743a3a..ce3f39d9b3cb 100644 sparc - 在这一点上，IRQ是开着的（？），把local_irq_save改为_disable。 - 待办事项: 需要第二个CPU来禁用抢占 (参考 #1) diff --git a/Makefile b/Makefile -index 68a8faff2543..e028bf75e596 100644 +index 93ab62cef244..5a6a4d92e6db 100644 --- a/Makefile +++ b/Makefile -@@ -366,7 +366,7 @@ include $(srctree)/scripts/subarch.include +@@ -391,7 +391,7 @@ include $(srctree)/scripts/subarch.include # When performing cross compilation for other architectures ARCH shall be set # to the target architecture. (See arch/* for the possibilities). # ARCH can be set during invocation of make: @@ -437,7 +437,7 @@ index 68a8faff2543..e028bf75e596 100644 # Another way is to have ARCH set in the environment. # The default ARCH is the host where make is executed. -@@ -374,7 +374,7 @@ include $(srctree)/scripts/subarch.include +@@ -399,7 +399,7 @@ include $(srctree)/scripts/subarch.include # during compilation. Only gcc and related bin-utils executables # are prefixed with $(CROSS_COMPILE). # CROSS_COMPILE can be set on the command line diff --git a/patches/standard/0002-Revert-lib-raid6-Drop-IA64-support.patch b/patches/standard/0002-Revert-lib-raid6-Drop-IA64-support.patch index 3ceaf55..49219be 100644 --- a/patches/standard/0002-Revert-lib-raid6-Drop-IA64-support.patch +++ b/patches/standard/0002-Revert-lib-raid6-Drop-IA64-support.patch @@ -1,7 +1,7 @@ -From 970297140f122e56c576cb6c9a29f5ab3cb716dd Mon Sep 17 00:00:00 2001 +From 88438544c7035a004fb26098e60374174dd48258 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:38 +0200 -Subject: [PATCH 02/43] Revert "lib/raid6: Drop IA64 support" +Subject: [PATCH 02/44] Revert "lib/raid6: Drop IA64 support" This reverts commit b089ea3cc30de85ea7e20aa66500feb4082dfbf7. --- diff --git a/patches/standard/0003-Revert-Documentation-Drop-IA64-from-feature-descript.patch b/patches/standard/0003-Revert-Documentation-Drop-IA64-from-feature-descript.patch index 2d4fd68..926f281 100644 --- a/patches/standard/0003-Revert-Documentation-Drop-IA64-from-feature-descript.patch +++ b/patches/standard/0003-Revert-Documentation-Drop-IA64-from-feature-descript.patch @@ -1,7 +1,7 @@ -From 9cd0cbd8297525422c0589e08df75a6ab20a9fda Mon Sep 17 00:00:00 2001 +From 6fe39711a10e040fd4771336e0896cfe04c96a80 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:48 +0200 -Subject: [PATCH 03/43] Revert "Documentation: Drop IA64 from feature +Subject: [PATCH 03/44] Revert "Documentation: Drop IA64 from feature descriptions" This reverts commit af1f459233d4edeef634f559539e7f4b64cb1d25. @@ -326,7 +326,7 @@ index b286a5fff283..5deb845477e4 100644 | m68k: | TODO | | microblaze: | TODO | diff --git a/Documentation/features/locking/queued-spinlocks/arch-support.txt b/Documentation/features/locking/queued-spinlocks/arch-support.txt -index 22f2990392ff..2d3961bfef5d 100644 +index cf26042480e2..963ee9c75752 100644 --- a/Documentation/features/locking/queued-spinlocks/arch-support.txt +++ b/Documentation/features/locking/queued-spinlocks/arch-support.txt @@ -12,6 +12,7 @@ diff --git a/patches/standard/0004-Revert-kernel-Drop-IA64-support-from-sig_fault-handl.patch b/patches/standard/0004-Revert-kernel-Drop-IA64-support-from-sig_fault-handl.patch index 8b0e3b5..7d17244 100644 --- a/patches/standard/0004-Revert-kernel-Drop-IA64-support-from-sig_fault-handl.patch +++ b/patches/standard/0004-Revert-kernel-Drop-IA64-support-from-sig_fault-handl.patch @@ -1,7 +1,7 @@ -From 2800672e91d0b37153e838ba658c4b8c62c49f93 Mon Sep 17 00:00:00 2001 +From 2b17e7f63f8c8070d2e376a1113ca342c02241b8 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:55 +0200 -Subject: [PATCH 04/43] Revert "kernel: Drop IA64 support from sig_fault +Subject: [PATCH 04/44] Revert "kernel: Drop IA64 support from sig_fault handlers" This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0. @@ -57,7 +57,7 @@ index 5a1ca43b5fc6..013f2c5ccae6 100644 #define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \ sizeof(short) : __alignof__(void *)) diff --git a/kernel/signal.c b/kernel/signal.c -index 98b65cb35830..7979ed929b90 100644 +index 989b1cc9116a..76e1b3496d07 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1685,8 +1685,9 @@ void force_sigsegv(int sig) diff --git a/patches/standard/0005-Revert-arch-Remove-Itanium-IA-64-architecture.patch b/patches/standard/0005-Revert-arch-Remove-Itanium-IA-64-architecture.patch index 37151d1..a3036aa 100644 --- a/patches/standard/0005-Revert-arch-Remove-Itanium-IA-64-architecture.patch +++ b/patches/standard/0005-Revert-arch-Remove-Itanium-IA-64-architecture.patch @@ -1,7 +1,7 @@ -From c7004280fce66a07f9af6ccce3a7f486a16bb940 Mon Sep 17 00:00:00 2001 +From db311960bb2067c3b1ef373e21485efd933d47d5 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:13:25 +0200 -Subject: [PATCH 05/43] Revert "arch: Remove Itanium (IA-64) architecture" +Subject: [PATCH 05/44] Revert "arch: Remove Itanium (IA-64) architecture" This reverts commit cf8e8658100d4eae80ce9b21f7a81cb024dd5057. --- @@ -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 e7f017097701..dad90e09350c 100644 +index 1e930c7a58b1..a0fee9e1a145 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -10840,6 +10840,12 @@ F: drivers/i3c/ +@@ -10904,6 +10904,12 @@ F: drivers/i3c/ F: include/dt-bindings/i3c/ F: include/linux/i3c/ @@ -3026,7 +3026,7 @@ index e7f017097701..dad90e09350c 100644 IBM Operation Panel Input Driver M: Eddie James L: linux-input@vger.kernel.org -@@ -17693,6 +17699,11 @@ S: Maintained +@@ -17784,6 +17790,11 @@ S: Maintained F: drivers/leds/leds-pca9532.c F: include/linux/leds-pca9532.h @@ -67337,7 +67337,7 @@ index e40413609f53..1a6acd27438d 100644 select CEC_CORE select CEC_NOTIFIER diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 902c306bc972..9e94808af225 100644 +index 09cbe3f0ab1e..efba2b6c019a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -176,7 +176,7 @@ config ENCLOSURE_SERVICES @@ -67800,7 +67800,7 @@ index 2f03a7080d96..fff522d347e3 100644 } diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c -index 01dfec115942..8a7bca674c86 100644 +index 9cc8db10a8d6..edd8620b7f9a 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -17152,7 +17152,7 @@ static u32 tg3_calc_dma_bndry(struct tg3 *tp, u32 val) @@ -67852,10 +67852,10 @@ index 78748e8d2dba..feca96fc4255 100644 u64 size = screen_info.lfb_size; struct resource *r; diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig -index 1eb20350fcf4..281c74c696b6 100644 +index 55d26d16df9b..5b1cc009b977 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig -@@ -223,7 +223,7 @@ config SERIAL_8250_EXTENDED +@@ -224,7 +224,7 @@ config SERIAL_8250_EXTENDED config SERIAL_8250_MANY_PORTS bool "Support more than 4 legacy serial ports" @@ -67943,7 +67943,7 @@ index 052d0e888c27..c14852362fce 100644 #define __compat_packed __attribute__((packed)) #else diff --git a/include/linux/acpi.h b/include/linux/acpi.h -index 7dd24acd9ffe..79e00a91ab34 100644 +index 05f39fbfa485..a78b14855105 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -238,7 +238,10 @@ acpi_table_parse_cedt(enum acpi_cedt_type id, @@ -68004,7 +68004,7 @@ index e5815867aba9..69171c10e1fe 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 2bbf73eb53e7..38ee2e46a285 100644 +index c39c4945946c..5721a9e0d109 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -387,6 +387,8 @@ extern unsigned int kobjsize(const void *objp); @@ -68043,7 +68043,7 @@ index bb8a59c6caa2..6f9c3dceff32 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 6e34b52cb5ce..b50b418bea0d 100644 +index b605334f8ee6..5099581f054d 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1701,6 +1701,9 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target) @@ -68057,10 +68057,10 @@ index 6e34b52cb5ce..b50b418bea0d 100644 } diff --git a/kernel/fork.c b/kernel/fork.c -index f253e81d0c28..f6cbb8242d54 100644 +index 1450b461d196..a607df190172 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -3020,7 +3020,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs) +@@ -3040,7 +3040,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs) if (!access_ok((void __user *)kargs->stack, kargs->stack_size)) return false; @@ -68138,7 +68138,7 @@ index 5c9202cb8f59..773521055694 100644 { .procname = "max_lock_depth", diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 5d9eca035d47..5850d0bd3f9f 100644 +index f3d723705879..f9dc9380659f 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -781,7 +781,7 @@ config SHRINKER_DEBUG diff --git a/patches/standard/0006-ia64-Use-generic-lock-bitops.patch b/patches/standard/0006-ia64-Use-generic-lock-bitops.patch index c28e0de..6b89135 100644 --- a/patches/standard/0006-ia64-Use-generic-lock-bitops.patch +++ b/patches/standard/0006-ia64-Use-generic-lock-bitops.patch @@ -1,7 +1,7 @@ -From 66c55fbad774321d61706bb46497345d2fc79332 Mon Sep 17 00:00:00 2001 +From 56b1914781df20125bbfb5034fcac7c80437c2ad Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:49:13 +0100 -Subject: [PATCH 06/43] ia64: Use generic lock bitops +Subject: [PATCH 06/44] 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 diff --git a/patches/standard/0007-ia64-Remove-unused-syscall_lookup_dcookie.patch b/patches/standard/0007-ia64-Remove-unused-syscall_lookup_dcookie.patch index 41b7df5..c14c32d 100644 --- a/patches/standard/0007-ia64-Remove-unused-syscall_lookup_dcookie.patch +++ b/patches/standard/0007-ia64-Remove-unused-syscall_lookup_dcookie.patch @@ -1,7 +1,7 @@ -From 8bd8d061e174d5baf50018e643bd7e5b8b6b999c Mon Sep 17 00:00:00 2001 +From 4d763de9719fddc24b703acba941feff63ec9b32 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:51:09 +0100 -Subject: [PATCH 07/43] ia64: Remove unused syscall_lookup_dcookie +Subject: [PATCH 07/44] ia64: Remove unused syscall_lookup_dcookie lookup_dcookie was removed on other architectures after ia64 was dropped. diff --git a/patches/standard/0008-ia64-Correct-parse_crashkernel-argument-count.patch b/patches/standard/0008-ia64-Correct-parse_crashkernel-argument-count.patch index bd8632c..23fbf31 100644 --- a/patches/standard/0008-ia64-Correct-parse_crashkernel-argument-count.patch +++ b/patches/standard/0008-ia64-Correct-parse_crashkernel-argument-count.patch @@ -1,7 +1,7 @@ -From 52232e0370562f8e6b98b6e300d76931c9514ba9 Mon Sep 17 00:00:00 2001 +From 86f269cadf4788f31707a9e9bade61786a22eee0 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:49:39 +0100 -Subject: [PATCH 08/43] ia64: Correct parse_crashkernel argument count +Subject: [PATCH 08/44] ia64: Correct parse_crashkernel argument count New function has two more parameters crash_size and crash_base; fix build by passing NULL to them. diff --git a/patches/standard/0009-ia64-Reserve-map_shadow_stack-syscall-number.patch b/patches/standard/0009-ia64-Reserve-map_shadow_stack-syscall-number.patch index df060a2..6403d9d 100644 --- a/patches/standard/0009-ia64-Reserve-map_shadow_stack-syscall-number.patch +++ b/patches/standard/0009-ia64-Reserve-map_shadow_stack-syscall-number.patch @@ -1,7 +1,7 @@ -From fd4e53f8cc5be5eaabda5fcb971eb7047a69898b Mon Sep 17 00:00:00 2001 +From 315bd1d7bcbb4e0ede7c5523ec4cea15134fa6c7 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:18:24 +0100 -Subject: [PATCH 09/43] ia64: Reserve map_shadow_stack() syscall number +Subject: [PATCH 09/44] 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. diff --git a/patches/standard/0010-ia64-Add-futex_wake-syscall.patch b/patches/standard/0010-ia64-Add-futex_wake-syscall.patch index 5e5001f..fa9347d 100644 --- a/patches/standard/0010-ia64-Add-futex_wake-syscall.patch +++ b/patches/standard/0010-ia64-Add-futex_wake-syscall.patch @@ -1,7 +1,7 @@ -From 4ecffeead698c2511fa20ba7ba260400c28307a7 Mon Sep 17 00:00:00 2001 +From 9c18f42de22a0be6b64dde5092ee0309ed9b92bb Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:24:02 +0100 -Subject: [PATCH 10/43] ia64: Add futex_wake() syscall +Subject: [PATCH 10/44] ia64: Add futex_wake() syscall futex_wake() was added after ia64 was removed from the kernel. diff --git a/patches/standard/0011-ia64-Add-futex_wait-syscall.patch b/patches/standard/0011-ia64-Add-futex_wait-syscall.patch index a7bdc42..f6d65af 100644 --- a/patches/standard/0011-ia64-Add-futex_wait-syscall.patch +++ b/patches/standard/0011-ia64-Add-futex_wait-syscall.patch @@ -1,7 +1,7 @@ -From 5871eb266c060aad8979784d2843353c3440d84c Mon Sep 17 00:00:00 2001 +From a9d407d819d5b07b460974945b8dd4188193a298 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:31:05 +0100 -Subject: [PATCH 11/43] ia64: Add futex_wait() syscall +Subject: [PATCH 11/44] ia64: Add futex_wait() syscall futex_wait() was added after ia64 was removed from the kernel. diff --git a/patches/standard/0012-ia64-Add-futex_requeue-syscall.patch b/patches/standard/0012-ia64-Add-futex_requeue-syscall.patch index 1f2d038..89adafb 100644 --- a/patches/standard/0012-ia64-Add-futex_requeue-syscall.patch +++ b/patches/standard/0012-ia64-Add-futex_requeue-syscall.patch @@ -1,7 +1,7 @@ -From d10256731a254cb810e34867e2771d7535896b21 Mon Sep 17 00:00:00 2001 +From f3f6a2afa76a328a092e88f83f9f7c32614cb39b Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:32:42 +0100 -Subject: [PATCH 12/43] ia64: Add futex_requeue() syscall +Subject: [PATCH 12/44] ia64: Add futex_requeue() syscall futex_requeue() was added after ia64 was removed from the kernel. diff --git a/patches/standard/0013-ia64-Remove-sentinel-element.patch b/patches/standard/0013-ia64-Remove-sentinel-element.patch index f54603e..b9bb559 100644 --- a/patches/standard/0013-ia64-Remove-sentinel-element.patch +++ b/patches/standard/0013-ia64-Remove-sentinel-element.patch @@ -1,7 +1,7 @@ -From 15d901696ee2358fb7f39e2af5d8f5870b706bc0 Mon Sep 17 00:00:00 2001 +From 37570b33f99204aa21417516a91a734f4b6586b2 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Mon, 13 Nov 2023 22:54:43 +0100 -Subject: [PATCH 13/43] ia64: Remove sentinel element +Subject: [PATCH 13/44] ia64: Remove sentinel element See 426ee5196d1821d70192923e70c0f8347faade47. --- diff --git a/patches/standard/0014-Revert-linux-export-clean-up-the-IA-64-KSYM_FUNC-mac.patch b/patches/standard/0014-Revert-linux-export-clean-up-the-IA-64-KSYM_FUNC-mac.patch index 3c4ba95..6c9ff45 100644 --- a/patches/standard/0014-Revert-linux-export-clean-up-the-IA-64-KSYM_FUNC-mac.patch +++ b/patches/standard/0014-Revert-linux-export-clean-up-the-IA-64-KSYM_FUNC-mac.patch @@ -1,7 +1,7 @@ -From a27d02e7a856f0ba2b5d40f2220c27b06bbf36f4 Mon Sep 17 00:00:00 2001 +From 67d077cd354f3e9bc12c26e7aca7b8ceac75cdcc Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Mon, 20 Nov 2023 17:08:57 +0100 -Subject: [PATCH 14/43] Revert "linux/export: clean up the IA-64 KSYM_FUNC +Subject: [PATCH 14/44] Revert "linux/export: clean up the IA-64 KSYM_FUNC macro" This reverts commit 9e0be3f50c0e8517d0238b62409c20bcb8cd8785. diff --git a/patches/standard/0015-ia64-set-nid-of-all-reserved-memblocks-to-0-at-setup.patch b/patches/standard/0015-ia64-set-nid-of-all-reserved-memblocks-to-0-at-setup.patch index b872326..a76c6a4 100644 --- a/patches/standard/0015-ia64-set-nid-of-all-reserved-memblocks-to-0-at-setup.patch +++ b/patches/standard/0015-ia64-set-nid-of-all-reserved-memblocks-to-0-at-setup.patch @@ -1,7 +1,7 @@ -From 31e75e17c2cf416989bf8f65748f7627278069d5 Mon Sep 17 00:00:00 2001 +From f0b22cdb52681b61578b5545d77cfd40d5cdfce4 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 21 Nov 2023 16:40:42 +0100 -Subject: [PATCH 15/43] ia64: set nid of all reserved memblocks to 0 at setup +Subject: [PATCH 15/44] 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()"): diff --git a/patches/standard/0016-ia64-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch b/patches/standard/0016-ia64-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch index 19d9f26..26f1ed3 100644 --- a/patches/standard/0016-ia64-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch +++ b/patches/standard/0016-ia64-rename-MAX_ORDER-to-MAX_PAGE_ORDER.patch @@ -1,7 +1,7 @@ -From 436ac87b8da9bc0d2d6d15ef047fcfff1c313575 Mon Sep 17 00:00:00 2001 +From 2e17b9e1dd94ee11e3cb2198ae74697ec7048d09 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 13:37:09 +0100 -Subject: [PATCH 16/43] ia64: rename MAX_ORDER to MAX_PAGE_ORDER +Subject: [PATCH 16/44] 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 diff --git a/patches/standard/0017-Revert-mm-remove-unnecessary-ia64-code-and-comment.patch b/patches/standard/0017-Revert-mm-remove-unnecessary-ia64-code-and-comment.patch index 5a149ba..40bc3f8 100644 --- a/patches/standard/0017-Revert-mm-remove-unnecessary-ia64-code-and-comment.patch +++ b/patches/standard/0017-Revert-mm-remove-unnecessary-ia64-code-and-comment.patch @@ -1,7 +1,7 @@ -From 08ca9bf8aa70cfc969a191d8192828766637ba4d Mon Sep 17 00:00:00 2001 +From 604cf345ec502d431c08a4d9bce0b52c19acd7f1 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 14:21:54 +0100 -Subject: [PATCH 17/43] Revert "mm: remove unnecessary ia64 code and comment" +Subject: [PATCH 17/44] Revert "mm: remove unnecessary ia64 code and comment" This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f. --- @@ -40,10 +40,10 @@ index 75c2dfd04f72..ab4054a572f1 100644 void *high_memory; EXPORT_SYMBOL(high_memory); diff --git a/mm/mm_init.c b/mm/mm_init.c -index 1c205b0a86ed..948078ce7802 100644 +index 24b68b425afb..0079253122a5 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c -@@ -1482,7 +1482,8 @@ void __init set_pageblock_order(void) +@@ -1485,7 +1485,8 @@ void __init set_pageblock_order(void) /* * Assume the largest contiguous order of interest is a huge page. @@ -53,7 +53,7 @@ index 1c205b0a86ed..948078ce7802 100644 */ pageblock_order = order; } -@@ -1600,8 +1601,8 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, +@@ -1603,8 +1604,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 1c205b0a86ed..948078ce7802 100644 /* Skip empty nodes */ if (!pgdat->node_spanned_pages) -@@ -1609,25 +1610,34 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat) +@@ -1612,25 +1613,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; diff --git a/patches/standard/0018-Revert-arch-remove-ARCH_THREAD_STACK_ALLOCATOR.patch b/patches/standard/0018-Revert-arch-remove-ARCH_THREAD_STACK_ALLOCATOR.patch index b94d21b..9460724 100644 --- a/patches/standard/0018-Revert-arch-remove-ARCH_THREAD_STACK_ALLOCATOR.patch +++ b/patches/standard/0018-Revert-arch-remove-ARCH_THREAD_STACK_ALLOCATOR.patch @@ -1,7 +1,7 @@ -From 20b71599addf292b3eac16b384f61981094c5374 Mon Sep 17 00:00:00 2001 +From fb7d6901b869ec3688568473eca1e91e71df8f51 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 12 Jan 2024 18:54:34 +0100 -Subject: [PATCH 18/43] Revert "arch: remove ARCH_THREAD_STACK_ALLOCATOR" +Subject: [PATCH 18/44] Revert "arch: remove ARCH_THREAD_STACK_ALLOCATOR" This reverts commit f72709ab69430d986dfc5a08c9a86f625e3fed33. --- @@ -10,7 +10,7 @@ This reverts commit f72709ab69430d986dfc5a08c9a86f625e3fed33. 2 files changed, 24 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig -index 832f68af7c77..21c06d6ecf55 100644 +index 6682b2a53e34..28e910573030 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -334,6 +334,10 @@ config HAVE_ARCH_THREAD_STRUCT_WHITELIST @@ -25,7 +25,7 @@ index 832f68af7c77..21c06d6ecf55 100644 config ARCH_WANTS_DYNAMIC_TASK_STRUCT bool diff --git a/kernel/fork.c b/kernel/fork.c -index f6cbb8242d54..5cf295bf4146 100644 +index a607df190172..f19d3bdca212 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -185,6 +185,8 @@ static inline void free_task_struct(struct task_struct *tsk) diff --git a/patches/standard/0019-Revert-arch-remove-ARCH_TASK_STRUCT_ALLOCATOR.patch b/patches/standard/0019-Revert-arch-remove-ARCH_TASK_STRUCT_ALLOCATOR.patch index 4bf63c4..c1e2ac0 100644 --- a/patches/standard/0019-Revert-arch-remove-ARCH_TASK_STRUCT_ALLOCATOR.patch +++ b/patches/standard/0019-Revert-arch-remove-ARCH_TASK_STRUCT_ALLOCATOR.patch @@ -1,7 +1,7 @@ -From 293e2ab353bd72170f343d508cac82e4107d68d3 Mon Sep 17 00:00:00 2001 +From 07474786659b7cbb3d4d36200158b3ac2fd73506 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 16:45:16 +0100 -Subject: [PATCH 19/43] Revert "arch: remove ARCH_TASK_STRUCT_ALLOCATOR" +Subject: [PATCH 19/44] Revert "arch: remove ARCH_TASK_STRUCT_ALLOCATOR" This reverts commit 3888750e21ccb909051c810cc79fcc0650a740f8. --- @@ -10,7 +10,7 @@ This reverts commit 3888750e21ccb909051c810cc79fcc0650a740f8. 2 files changed, 15 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig -index 21c06d6ecf55..95aecb20205a 100644 +index 28e910573030..f5a6cf54f2e2 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -324,8 +324,17 @@ config ARCH_HAS_CPU_PASID @@ -32,7 +32,7 @@ index 21c06d6ecf55..95aecb20205a 100644 An architecture should select this to provide hardened usercopy knowledge about what region of the thread_struct should be diff --git a/kernel/fork.c b/kernel/fork.c -index 5cf295bf4146..68306a813ea6 100644 +index f19d3bdca212..2b62ef11d10d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -173,6 +173,7 @@ void __weak arch_release_task_struct(struct task_struct *tsk) @@ -51,7 +51,7 @@ index 5cf295bf4146..68306a813ea6 100644 #ifndef CONFIG_ARCH_THREAD_STACK_ALLOCATOR -@@ -1042,6 +1044,7 @@ static void __init set_max_threads(unsigned int max_threads_suggested) +@@ -1048,6 +1050,7 @@ static void __init set_max_threads(unsigned int max_threads_suggested) int arch_task_struct_size __read_mostly; #endif @@ -59,7 +59,7 @@ index 5cf295bf4146..68306a813ea6 100644 static void __init task_struct_whitelist(unsigned long *offset, unsigned long *size) { /* Fetch thread_struct whitelist for the architecture. */ -@@ -1056,10 +1059,12 @@ static void __init task_struct_whitelist(unsigned long *offset, unsigned long *s +@@ -1062,10 +1065,12 @@ static void __init task_struct_whitelist(unsigned long *offset, unsigned long *s else *offset += offsetof(struct task_struct, thread); } @@ -72,7 +72,7 @@ index 5cf295bf4146..68306a813ea6 100644 #ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0 #endif -@@ -1072,6 +1077,7 @@ void __init fork_init(void) +@@ -1078,6 +1083,7 @@ void __init fork_init(void) arch_task_struct_size, align, SLAB_PANIC|SLAB_ACCOUNT, useroffset, usersize, NULL); diff --git a/patches/standard/0020-Revert-arch-remove-ARCH_TASK_STRUCT_ON_STACK.patch b/patches/standard/0020-Revert-arch-remove-ARCH_TASK_STRUCT_ON_STACK.patch index d468fc2..f2ef7c6 100644 --- a/patches/standard/0020-Revert-arch-remove-ARCH_TASK_STRUCT_ON_STACK.patch +++ b/patches/standard/0020-Revert-arch-remove-ARCH_TASK_STRUCT_ON_STACK.patch @@ -1,7 +1,7 @@ -From eb181b6a48ac9769c2c8ef336ddaddd922b7223b Mon Sep 17 00:00:00 2001 +From 9341d5b15332d1a2d4c1b94ca256c79bcea243f5 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 12 Jan 2024 19:11:18 +0100 -Subject: [PATCH 20/43] Revert "arch: remove ARCH_TASK_STRUCT_ON_STACK" +Subject: [PATCH 20/44] Revert "arch: remove ARCH_TASK_STRUCT_ON_STACK" This reverts commit 0eb5085c38749f2a91e5bd8cbebb1ebf3398343c. --- @@ -44,10 +44,10 @@ index bccb3f1f6262..40fc5813cf93 100644 #define __init_thread_info __section(".data..init_thread_info") diff --git a/include/linux/sched.h b/include/linux/sched.h -index f0e9e00d3cf5..d6e047f8a58b 100644 +index d380bffee2ef..17b376c11d28 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1884,7 +1884,9 @@ extern void ia64_set_curr_task(int cpu, struct task_struct *p); +@@ -1887,7 +1887,9 @@ extern void ia64_set_curr_task(int cpu, struct task_struct *p); void yield(void); union thread_union { diff --git a/patches/standard/0021-Revert-tty-deprecate-tty_write_message.patch b/patches/standard/0021-Revert-tty-deprecate-tty_write_message.patch index 8c04c3b..230734a 100644 --- a/patches/standard/0021-Revert-tty-deprecate-tty_write_message.patch +++ b/patches/standard/0021-Revert-tty-deprecate-tty_write_message.patch @@ -1,7 +1,7 @@ -From 8812981cec30a97abe78401bc70f38d0008d9e46 Mon Sep 17 00:00:00 2001 +From e4738f3efffae2a3865b37a0c5bc28d0dfa11b65 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 19 Jan 2024 20:18:07 +0100 -Subject: [PATCH 21/43] Revert "tty: deprecate tty_write_message()" +Subject: [PATCH 21/44] Revert "tty: deprecate tty_write_message()" This reverts commit 4c74253b831e5a8eb87d4d8d4a0eae40c331e682. @@ -12,7 +12,7 @@ Revert its conditional removal until a proper replacement is found. 1 file changed, 4 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index 9771072da177..029bc4717dba 100644 +index dcb1769c3625..9099275cfe6b 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1041,7 +1041,6 @@ static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty, diff --git a/patches/standard/0022-Revert-mmap-remove-the-IA64-specific-vma-expansion-i.patch b/patches/standard/0022-Revert-mmap-remove-the-IA64-specific-vma-expansion-i.patch index bd4cf2b..4f0bc18 100644 --- a/patches/standard/0022-Revert-mmap-remove-the-IA64-specific-vma-expansion-i.patch +++ b/patches/standard/0022-Revert-mmap-remove-the-IA64-specific-vma-expansion-i.patch @@ -1,7 +1,7 @@ -From a8697d84b28da0ae5e85decbb95c6455369397d0 Mon Sep 17 00:00:00 2001 +From 40e6812be07d30bab56e623bd8b1e433a0e0b012 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Sun, 24 Mar 2024 19:43:52 +0100 -Subject: [PATCH 22/43] Revert "mmap: remove the IA64-specific vma expansion +Subject: [PATCH 22/44] Revert "mmap: remove the IA64-specific vma expansion implementation" This reverts commit 69e583eaca579d50ffc699b1f4358258e75fa008. diff --git a/patches/standard/0023-Revert-hpet-remove-hpets-hp_clocksource.patch b/patches/standard/0023-Revert-hpet-remove-hpets-hp_clocksource.patch index 324c08d..2cded20 100644 --- a/patches/standard/0023-Revert-hpet-remove-hpets-hp_clocksource.patch +++ b/patches/standard/0023-Revert-hpet-remove-hpets-hp_clocksource.patch @@ -1,7 +1,7 @@ -From 456606d009c11c45af72694c4bf181c3b93dad72 Mon Sep 17 00:00:00 2001 +From a42ad6d28bc60bcd2300b9c08171aa55a5a687ea Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Sun, 24 Mar 2024 20:20:36 +0100 -Subject: [PATCH 23/43] Revert "hpet: remove hpets::hp_clocksource" +Subject: [PATCH 23/44] Revert "hpet: remove hpets::hp_clocksource" This reverts commit b44abdd29423a77074a9edb462de37f1a09daaab. --- diff --git a/patches/standard/0024-ia64-replay-change-alloc_pages-name-in-dma_map_ops.patch b/patches/standard/0024-ia64-replay-change-alloc_pages-name-in-dma_map_ops.patch index d63453f..66cfbcb 100644 --- a/patches/standard/0024-ia64-replay-change-alloc_pages-name-in-dma_map_ops.patch +++ b/patches/standard/0024-ia64-replay-change-alloc_pages-name-in-dma_map_ops.patch @@ -1,7 +1,7 @@ -From 171eb8cb6b7ee6de8764879ed10969af51c4b663 Mon Sep 17 00:00:00 2001 +From 32b330523b6940479400c0fbbbd1e4830d6b99c4 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:02:39 +0200 -Subject: [PATCH 24/43] ia64: replay "change alloc_pages name in dma_map_ops +Subject: [PATCH 24/44] ia64: replay "change alloc_pages name in dma_map_ops [...]" See 8a2f11878771da65b8ac135c73b47dae13afbd62. diff --git a/patches/standard/0025-ia64-handle-NUMA-early-use-of-cpu_to_node-returns-0.patch b/patches/standard/0025-ia64-handle-NUMA-early-use-of-cpu_to_node-returns-0.patch index 7017b6a..18bdc82 100644 --- a/patches/standard/0025-ia64-handle-NUMA-early-use-of-cpu_to_node-returns-0.patch +++ b/patches/standard/0025-ia64-handle-NUMA-early-use-of-cpu_to_node-returns-0.patch @@ -1,7 +1,7 @@ -From 544d94cb6d9efef601d33fa8bdd1120c08c58322 Mon Sep 17 00:00:00 2001 +From 2d652a7549c7061dd530fa322bfe2a73fb8191a0 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 13:28:12 +0200 -Subject: [PATCH 25/43] ia64: handle "NUMA: early use of cpu_to_node() returns +Subject: [PATCH 25/44] ia64: handle "NUMA: early use of cpu_to_node() returns 0 [...]" See f9899c028151468d8c4af0bcbb3d5e87619b0973. diff --git a/patches/standard/0026-Revert-mm-remove-guard-around-pgd_offset_k-macro.patch b/patches/standard/0026-Revert-mm-remove-guard-around-pgd_offset_k-macro.patch index 8da3c99..6d78c7e 100644 --- a/patches/standard/0026-Revert-mm-remove-guard-around-pgd_offset_k-macro.patch +++ b/patches/standard/0026-Revert-mm-remove-guard-around-pgd_offset_k-macro.patch @@ -1,7 +1,7 @@ -From 3d709c4ba7016d8a59eb5a0aefe5a70a08d39a29 Mon Sep 17 00:00:00 2001 +From 9c088314b1be5e5d3bcf007c527432ebe638e9ef Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:03:49 +0200 -Subject: [PATCH 26/43] Revert "mm: remove guard around pgd_offset_k() macro" +Subject: [PATCH 26/44] Revert "mm: remove guard around pgd_offset_k() macro" This reverts commit 5b0a67008b0d608bb7585fe4c3c0c09d5ceaf1c9. --- diff --git a/patches/standard/0027-Revert-ACPI-NUMA-Squash-acpi_numa_memory_affinity_in.patch b/patches/standard/0027-Revert-ACPI-NUMA-Squash-acpi_numa_memory_affinity_in.patch index 2199e5d..8cee901 100644 --- a/patches/standard/0027-Revert-ACPI-NUMA-Squash-acpi_numa_memory_affinity_in.patch +++ b/patches/standard/0027-Revert-ACPI-NUMA-Squash-acpi_numa_memory_affinity_in.patch @@ -1,7 +1,7 @@ -From e06a4c38afd93606ad11b2493f57e5aa201444c3 Mon Sep 17 00:00:00 2001 +From 4e55a2d2d5ba23835120cb842d14c83bb65270d6 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:05:31 +0200 -Subject: [PATCH 27/43] Revert "ACPI/NUMA: Squash +Subject: [PATCH 27/44] Revert "ACPI/NUMA: Squash acpi_numa_memory_affinity_init() into acpi_parse_memory_affinity()" This reverts commit 57ba79e865e5b50a6ad15a98ea4b2cf808f19c0c. diff --git a/patches/standard/0028-Revert-ACPI-NUMA-Remove-architecture-dependent-remai.patch b/patches/standard/0028-Revert-ACPI-NUMA-Remove-architecture-dependent-remai.patch index cda842b..2fba672 100644 --- a/patches/standard/0028-Revert-ACPI-NUMA-Remove-architecture-dependent-remai.patch +++ b/patches/standard/0028-Revert-ACPI-NUMA-Remove-architecture-dependent-remai.patch @@ -1,7 +1,7 @@ -From ed7559e83cb6357e524f8a2e5dfebcf8afde3934 Mon Sep 17 00:00:00 2001 +From ea5151390b71905d051d30c3708bbd9ffccfb5e2 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:10:34 +0200 -Subject: [PATCH 28/43] Revert "ACPI/NUMA: Remove architecture dependent +Subject: [PATCH 28/44] Revert "ACPI/NUMA: Remove architecture dependent remainings" This reverts commit 3a785e19f432672b9ef53f07c506d5e698439033. @@ -10,7 +10,7 @@ This reverts commit 3a785e19f432672b9ef53f07c506d5e698439033. 1 file changed, 2 insertions(+) diff --git a/include/linux/acpi.h b/include/linux/acpi.h -index 79e00a91ab34..17bf803081e4 100644 +index a78b14855105..4e761dd2829e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -269,6 +269,8 @@ void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa); diff --git a/patches/standard/0029-ia64-replay-sched-vtime-Do-not-include-asm-vtime.h-h.patch b/patches/standard/0029-ia64-replay-sched-vtime-Do-not-include-asm-vtime.h-h.patch index e97cd44..b828936 100644 --- a/patches/standard/0029-ia64-replay-sched-vtime-Do-not-include-asm-vtime.h-h.patch +++ b/patches/standard/0029-ia64-replay-sched-vtime-Do-not-include-asm-vtime.h-h.patch @@ -1,7 +1,7 @@ -From f7f647a51d779889a538665a704a3208877652fc Mon Sep 17 00:00:00 2001 +From eead9bbdf472ffe3029b5c80765dd37ced741030 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Thu, 18 Jul 2024 20:48:20 +0200 -Subject: [PATCH 29/43] ia64: replay "sched/vtime: Do not include +Subject: [PATCH 29/44] ia64: replay "sched/vtime: Do not include header" See 08a36a48544d73bf153960245aec6c5fa23960de. diff --git a/patches/standard/0030-ia64-fix-Python-string-escapes.patch b/patches/standard/0030-ia64-fix-Python-string-escapes.patch index a2ec8b0..0ed1ff1 100644 --- a/patches/standard/0030-ia64-fix-Python-string-escapes.patch +++ b/patches/standard/0030-ia64-fix-Python-string-escapes.patch @@ -1,7 +1,7 @@ -From 0fdfda553f1dedb77afe2ae8392f951ad3544182 Mon Sep 17 00:00:00 2001 +From b72b735858f7c2e0016d2a26d13b9dda1068a1bf Mon Sep 17 00:00:00 2001 From: Benjamin Gray Date: Tue, 12 Sep 2023 16:07:55 +1000 -Subject: [PATCH 30/43] ia64: fix Python string escapes +Subject: [PATCH 30/44] ia64: fix Python string escapes Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually diff --git a/patches/standard/0031-ia64-replay-dma-mapping-clearly-mark-DMA-ops-as.patch b/patches/standard/0031-ia64-replay-dma-mapping-clearly-mark-DMA-ops-as.patch index 567fdb6..942ac8d 100644 --- a/patches/standard/0031-ia64-replay-dma-mapping-clearly-mark-DMA-ops-as.patch +++ b/patches/standard/0031-ia64-replay-dma-mapping-clearly-mark-DMA-ops-as.patch @@ -1,7 +1,7 @@ -From 5b4e519f18be937933513f713cacefc8746ce38e Mon Sep 17 00:00:00 2001 +From f493b996c678969852899e0fc0ad3898ff9f80b5 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Thu, 19 Sep 2024 22:50:12 +0200 -Subject: [PATCH 31/43] ia64: replay "dma-mapping: clearly mark DMA ops as +Subject: [PATCH 31/44] ia64: replay "dma-mapping: clearly mark DMA ops as [...]" See de6c85bf918ea52d5c680f0d130b37ee2ff152d6. diff --git a/patches/standard/0032-Partially-revert-x86-remove-PG_uncached.patch b/patches/standard/0032-Partially-revert-x86-remove-PG_uncached.patch index a5c7d68..4627cae 100644 --- a/patches/standard/0032-Partially-revert-x86-remove-PG_uncached.patch +++ b/patches/standard/0032-Partially-revert-x86-remove-PG_uncached.patch @@ -1,7 +1,7 @@ -From 01358aed42ffe8d45fae87d720acf41b10ef82f0 Mon Sep 17 00:00:00 2001 +From 3e0d31a3c6dbb58ace3b7b828cf334945d586fad Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:29:04 +0200 -Subject: [PATCH 32/43] Partially revert "x86: remove PG_uncached" +Subject: [PATCH 32/44] Partially revert "x86: remove PG_uncached" This partially reverts commit 7a87225ae2c6c317c7b80cf599e5cf0eee. --- diff --git a/patches/standard/0033-Replay-mm-make-arch_get_unmapped_area-take-vm_flags-.patch b/patches/standard/0033-Replay-mm-make-arch_get_unmapped_area-take-vm_flags-.patch index fe2bec2..185dff5 100644 --- a/patches/standard/0033-Replay-mm-make-arch_get_unmapped_area-take-vm_flags-.patch +++ b/patches/standard/0033-Replay-mm-make-arch_get_unmapped_area-take-vm_flags-.patch @@ -1,7 +1,7 @@ -From db01a785f21d3d6b20b1af244d23f1fa8103b9b3 Mon Sep 17 00:00:00 2001 +From 6750ec4ea2dba733b71719e5c797b551ea66618a Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:33:54 +0200 -Subject: [PATCH 33/43] Replay "mm: make arch_get_unmapped_area() take vm_flags +Subject: [PATCH 33/44] Replay "mm: make arch_get_unmapped_area() take vm_flags by default" See 25d4054cc97484f2555709ac233f955f674e026a. diff --git a/patches/standard/0034-Revert-efi-Remove-unused-declaration-efi_initialize_.patch b/patches/standard/0034-Revert-efi-Remove-unused-declaration-efi_initialize_.patch index ae0d296..3325ce1 100644 --- a/patches/standard/0034-Revert-efi-Remove-unused-declaration-efi_initialize_.patch +++ b/patches/standard/0034-Revert-efi-Remove-unused-declaration-efi_initialize_.patch @@ -1,7 +1,7 @@ -From 6e00eeb6f1efa7ca9d23f8354e4129d089a88e2a Mon Sep 17 00:00:00 2001 +From 3eae87b8f5da59fe9f6db757279dd6acdeaf32f1 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:54:38 +0200 -Subject: [PATCH 34/43] Revert "efi: Remove unused declaration +Subject: [PATCH 34/44] Revert "efi: Remove unused declaration efi_initialize_iomem_resources()" This reverts commit 21b91d40575fb64f3f280f6c3af586e32a704a92. diff --git a/patches/standard/0035-ia64-replay-move-asm-unaligned.h-to-linux-unaligned..patch b/patches/standard/0035-ia64-replay-move-asm-unaligned.h-to-linux-unaligned..patch index 6c53498..e79af9a 100644 --- a/patches/standard/0035-ia64-replay-move-asm-unaligned.h-to-linux-unaligned..patch +++ b/patches/standard/0035-ia64-replay-move-asm-unaligned.h-to-linux-unaligned..patch @@ -1,7 +1,7 @@ -From e231aac5e283eee35188ec48821c66781cf95242 Mon Sep 17 00:00:00 2001 +From f391d0e9c11d9ccacbde60bdcb1a0fa522f2c033 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 4 Oct 2024 20:50:34 +0200 -Subject: [PATCH 35/43] ia64: replay "move asm/unaligned.h to +Subject: [PATCH 35/44] ia64: replay "move asm/unaligned.h to linux/unaligned.h" See 5f60d5f6bbc12e782fac78110b0ee62698f3b576. diff --git a/patches/standard/0036-ia64-For-now-silence-warning-due-to-redefinition-of-.patch b/patches/standard/0036-ia64-For-now-silence-warning-due-to-redefinition-of-.patch index 2498598..eec935e 100644 --- a/patches/standard/0036-ia64-For-now-silence-warning-due-to-redefinition-of-.patch +++ b/patches/standard/0036-ia64-For-now-silence-warning-due-to-redefinition-of-.patch @@ -1,7 +1,7 @@ -From 8d94b8e00fabd9ad0b82d6d044d002d4889b29e7 Mon Sep 17 00:00:00 2001 +From 68eaa4a2efdc11d60fe54b7d16f6d4654876a603 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sat, 5 Oct 2024 13:16:09 +0200 -Subject: [PATCH 36/43] ia64: For now silence warning due to redefinition of +Subject: [PATCH 36/44] ia64: For now silence warning due to redefinition of NODE_DATA --- diff --git a/patches/standard/0037-ia64-Workaround-Wmissing-prototypes-warnings.patch b/patches/standard/0037-ia64-Workaround-Wmissing-prototypes-warnings.patch index 75fe08f..9b18290 100644 --- a/patches/standard/0037-ia64-Workaround-Wmissing-prototypes-warnings.patch +++ b/patches/standard/0037-ia64-Workaround-Wmissing-prototypes-warnings.patch @@ -1,7 +1,7 @@ -From 3447f18fdbb356028e6dc142a09979115e7d8269 Mon Sep 17 00:00:00 2001 +From be148277bc08a81e3aab488a68e72718a0a8964f Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Mon, 21 Oct 2024 11:51:37 +0200 -Subject: [PATCH 37/43] ia64: Workaround -Wmissing-prototypes warnings +Subject: [PATCH 37/44] ia64: Workaround -Wmissing-prototypes warnings Workaround the -Wmissing-prototypes warnings by declaring them locally similar to what was done in: diff --git a/patches/standard/0038-Revert-sched-remove-unused-__HAVE_THREAD_FUNCTIONS-h.patch b/patches/standard/0038-Revert-sched-remove-unused-__HAVE_THREAD_FUNCTIONS-h.patch index 216a312..58da91b 100644 --- a/patches/standard/0038-Revert-sched-remove-unused-__HAVE_THREAD_FUNCTIONS-h.patch +++ b/patches/standard/0038-Revert-sched-remove-unused-__HAVE_THREAD_FUNCTIONS-h.patch @@ -1,7 +1,7 @@ -From c9f6313352c0fcee2f68c5778953020c086ba17e Mon Sep 17 00:00:00 2001 +From ef7b392aa7e5759555e95c7ae721a6cc0a59e647 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Wed, 20 Nov 2024 11:15:14 +0100 -Subject: [PATCH 38/43] Revert "sched: remove unused __HAVE_THREAD_FUNCTIONS +Subject: [PATCH 38/44] Revert "sched: remove unused __HAVE_THREAD_FUNCTIONS hook support" This reverts commit 5e9f0c4819deb9459f32f12c4fd2b47993b8c395. @@ -11,10 +11,10 @@ This reverts commit 5e9f0c4819deb9459f32f12c4fd2b47993b8c395. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index d6e047f8a58b..cde08c33cb4e 100644 +index 17b376c11d28..78b070ef64b2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1901,7 +1901,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)]; +@@ -1904,7 +1904,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)]; #ifdef CONFIG_THREAD_INFO_IN_TASK # define task_thread_info(task) (&(task)->thread_info) diff --git a/patches/standard/0039-ia64-replay-asm-generic-provide-generic-page_to_phys.patch b/patches/standard/0039-ia64-replay-asm-generic-provide-generic-page_to_phys.patch index 661ae1b..3d51a4c 100644 --- a/patches/standard/0039-ia64-replay-asm-generic-provide-generic-page_to_phys.patch +++ b/patches/standard/0039-ia64-replay-asm-generic-provide-generic-page_to_phys.patch @@ -1,7 +1,7 @@ -From 9ab9f6a528d4a7f1e2576de879b4a7c45003a3d8 Mon Sep 17 00:00:00 2001 +From 1f014585ec713f1f199d3d0b0f35ff94fdd82efc Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 22 Nov 2024 10:52:39 +0100 -Subject: [PATCH 39/43] ia64: replay "asm-generic: provide generic page_to_phys +Subject: [PATCH 39/44] ia64: replay "asm-generic: provide generic page_to_phys [...]" See c5c3238d9b8cee58cd4b08bbbe9347a94a566390. diff --git a/patches/standard/0040-ia64-replay-arch-define-CONFIG_PAGE_SIZE_-KB-on-all-.patch b/patches/standard/0040-ia64-replay-arch-define-CONFIG_PAGE_SIZE_-KB-on-all-.patch index e0f2c7d..99a53da 100644 --- a/patches/standard/0040-ia64-replay-arch-define-CONFIG_PAGE_SIZE_-KB-on-all-.patch +++ b/patches/standard/0040-ia64-replay-arch-define-CONFIG_PAGE_SIZE_-KB-on-all-.patch @@ -1,7 +1,7 @@ -From 882e257e4bbbb4cc936700123d304551f8ffc9ba Mon Sep 17 00:00:00 2001 +From fc7ff9055a63f71e8c1f8e36e7d0fda3178263b7 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 22 Nov 2024 14:31:50 +0100 -Subject: [PATCH 40/43] ia64: replay "arch: define CONFIG_PAGE_SIZE_*KB on all +Subject: [PATCH 40/44] ia64: replay "arch: define CONFIG_PAGE_SIZE_*KB on all architectures" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/patches/standard/0041-ia64-replay-mm-remove-unused-hugepage-for-vma_alloc_.patch b/patches/standard/0041-ia64-replay-mm-remove-unused-hugepage-for-vma_alloc_.patch index ee1f137..b4bea78 100644 --- a/patches/standard/0041-ia64-replay-mm-remove-unused-hugepage-for-vma_alloc_.patch +++ b/patches/standard/0041-ia64-replay-mm-remove-unused-hugepage-for-vma_alloc_.patch @@ -1,7 +1,7 @@ -From 51bb687d539771331db01538fa5fb7adffdbc1b9 Mon Sep 17 00:00:00 2001 +From 17d893869507b1ff6c5bc864e056a40b69eeaa5d Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 24 Nov 2024 09:20:03 +0100 -Subject: [PATCH 41/43] ia64: replay "mm: remove unused hugepage for +Subject: [PATCH 41/44] ia64: replay "mm: remove unused hugepage for vma_alloc_folio()" See 6359c39c9de66dede8ff5ff257c9e117483dbc7c. diff --git a/patches/standard/0042-ia64-replay-asm-generic-introduce-text-patching.h.patch b/patches/standard/0042-ia64-replay-asm-generic-introduce-text-patching.h.patch index 2253a4d..7eaad6b 100644 --- a/patches/standard/0042-ia64-replay-asm-generic-introduce-text-patching.h.patch +++ b/patches/standard/0042-ia64-replay-asm-generic-introduce-text-patching.h.patch @@ -1,7 +1,7 @@ -From 66f8d1ba63dcfce4568f68d2a0ad7a7c79d83489 Mon Sep 17 00:00:00 2001 +From ce1f29b200d7ee8139d47b64a56c844d1f8e0619 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 24 Nov 2024 09:55:19 +0100 -Subject: [PATCH 42/43] ia64: replay "asm-generic: introduce text-patching.h" +Subject: [PATCH 42/44] ia64: replay "asm-generic: introduce text-patching.h" See 0c3beacf681ec897e0b36685a9b49d01f5cb2dfb. --- diff --git a/patches/standard/0043-ia64-replay-mm-drop-hugetlb_get_unmapped_area-_-func.patch b/patches/standard/0043-ia64-replay-mm-drop-hugetlb_get_unmapped_area-_-func.patch index 8e15283..1533ce1 100644 --- a/patches/standard/0043-ia64-replay-mm-drop-hugetlb_get_unmapped_area-_-func.patch +++ b/patches/standard/0043-ia64-replay-mm-drop-hugetlb_get_unmapped_area-_-func.patch @@ -1,7 +1,7 @@ -From 4baf8b5eb4633320f67f2bfd0c1279c565c6df61 Mon Sep 17 00:00:00 2001 +From b255901c6eeb3c242182f05c33aea6ea418ee6eb Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 24 Nov 2024 11:06:09 +0100 -Subject: [PATCH 43/43] ia64: replay "mm: drop hugetlb_get_unmapped_area{_*} +Subject: [PATCH 43/44] ia64: replay "mm: drop hugetlb_get_unmapped_area{_*} functions" See cc92882ee218d62ef017fa545b3c8a2d1e060a5a. diff --git a/patches/standard/0044-ia64-disable-build-time-check.patch b/patches/standard/0044-ia64-disable-build-time-check.patch new file mode 100644 index 0000000..d1c3b35 --- /dev/null +++ b/patches/standard/0044-ia64-disable-build-time-check.patch @@ -0,0 +1,80 @@ +From 6048ebf6ed16c2dc4d02ac08d775c888f47a81ec Mon Sep 17 00:00:00 2001 +From: Johnny Mnemonic +Date: Tue, 26 Nov 2024 10:53:17 +0100 +Subject: [PATCH 44/44] ia64: disable build time check + +...to avoid that build breakage (see below) for now until we have a better +understanding of the reasons. Apparently get_order() behaves differently +on ia64 than for example on x86_64, as identical input values (tested for +4k page size!) break the build on ia64 but not on x86_64. Keep `#pragma`s, +so we don't forget about this. + +Kernel also works fine with that check disabled (tested on rx2620, rx4640, +rx2660, rx6600, rx2800-i2). + +**** + +Build breakage with additional `#pragma`s: +``` + CC [M] fs/ext4/fsmap.o +mm/page_frag_cache.c: In function 'encoded_page_create': +mm/page_frag_cache.c:30:9: note: '#pragma message: PAGE_FRAG_CACHE_MAX_ORDER = get_order(((((32768)) + ((~(~((1UL << 14) - 1))))) & ~((~(~((1UL << 14) - 1))))))' + 30 | #pragma message "PAGE_FRAG_CACHE_MAX_ORDER = " XSTR(PAGE_FRAG_CACHE_MAX_ORDER) + | ^~~~~~~ +mm/page_frag_cache.c:31:9: note: '#pragma message: PAGE_FRAG_CACHE_ORDER_MASK = ((((int)(sizeof(struct { int:(-!!(__builtin_choose_expr( (sizeof(int) == sizeof(*(8 ? ((void *)((long)((0) > (7)) * 0l)) : (int *)8))), (0) > (7), 0))); })))) + (((~((0UL))) - (((1UL)) << (0)) + 1) & (~((0UL)) >> (64 - 1 - (7)))))' + 31 | #pragma message "PAGE_FRAG_CACHE_ORDER_MASK = " XSTR(PAGE_FRAG_CACHE_ORDER_MASK) + | ^~~~~~~ +In file included from : +In function 'encoded_page_create', + inlined from '__page_frag_cache_refill' at mm/page_frag_cache.c:75:3, + inlined from '__page_frag_alloc_align' at mm/page_frag_cache.c:110:10: +././include/linux/compiler_types.h:523:45: error: call to '__compiletime_assert_438' declared with attribute error: BUILD_BUG_ON failed: PAGE_FRAG_CACHE_MAX_ORDER > PAGE_FRAG_CACHE_ORDER_MASK + 523 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + | ^ +././include/linux/compiler_types.h:504:25: note: in definition of macro '__compiletime_assert' + 504 | prefix ## suffix(); \ + | ^~~~~~ +././include/linux/compiler_types.h:523:9: note: in expansion of macro '_compiletime_assert' + 523 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + | ^~~~~~~~~~~~~~~~~~~ +./include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' + 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) + | ^~~~~~~~~~~~~~~~~~ +./include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' + 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) + | ^~~~~~~~~~~~~~~~ +mm/page_frag_cache.c:33:9: note: in expansion of macro 'BUILD_BUG_ON' + 33 | BUILD_BUG_ON(PAGE_FRAG_CACHE_MAX_ORDER > PAGE_FRAG_CACHE_ORDER_MASK); + | ^~~~~~~~~~~~ +make[3]: *** [scripts/Makefile.build:229: mm/page_frag_cache.o] Error 1 +make[2]: *** [scripts/Makefile.build:478: mm] Error 2 +make[2]: *** Waiting for unfinished jobs.... + CC block/sed-opal.o +``` +--- + mm/page_frag_cache.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c +index 3f7a203d35c6..37b8e2a49876 100644 +--- a/mm/page_frag_cache.c ++++ b/mm/page_frag_cache.c +@@ -23,7 +23,15 @@ + static unsigned long encoded_page_create(struct page *page, unsigned int order, + bool pfmemalloc) + { ++#define XSTR(x) STR(x) ++#define STR(x) #x ++ ++#pragma message "PAGE_FRAG_CACHE_MAX_ORDER = " XSTR(PAGE_FRAG_CACHE_MAX_ORDER) ++#pragma message "PAGE_FRAG_CACHE_ORDER_MASK = " XSTR(PAGE_FRAG_CACHE_ORDER_MASK) ++ ++#ifndef CONFIG_IA64 + BUILD_BUG_ON(PAGE_FRAG_CACHE_MAX_ORDER > PAGE_FRAG_CACHE_ORDER_MASK); ++#endif + BUILD_BUG_ON(PAGE_FRAG_CACHE_PFMEMALLOC_BIT >= PAGE_SIZE); + + return (unsigned long)page_address(page) | +-- +2.25.1 +