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 710a5d0..c45ea01 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 21b5af7318b01d9d28a15170661a1ec4ab3a4d19 Mon Sep 17 00:00:00 2001 +From c7205c6a7ce8c78e12a36067aee5451c6e9c7981 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:28 +0200 -Subject: [PATCH 01/36] Revert "Documentation: Drop or replace remaining +Subject: [PATCH 01/37] 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 1518343bbe22..a5d363aa958e 100644 +index 1666576acc0e..1281bfbdea69 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1496,7 +1496,7 @@ @@ -425,7 +425,7 @@ index b2ac3c743a3a..ce3f39d9b3cb 100644 sparc - 在这一点上,IRQ是开着的(?),把local_irq_save改为_disable。 - 待办事项: 需要第二个CPU来禁用抢占 (参考 #1) diff --git a/Makefile b/Makefile -index c5493c0c0ca1..e71d19745161 100644 +index 79192a3024bf..ddac27d1da41 100644 --- a/Makefile +++ b/Makefile @@ -366,7 +366,7 @@ include $(srctree)/scripts/subarch.include 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 b2b7718..0d8b237 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 8ecb61597bce22eb2a0958e041c35e170ccf63e0 Mon Sep 17 00:00:00 2001 +From 07431302e425c07bbf16e5c9a9d7a8a3c3532b96 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:38 +0200 -Subject: [PATCH 02/36] Revert "lib/raid6: Drop IA64 support" +Subject: [PATCH 02/37] 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 344e07b..58f6156 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 d49da3d13fd2f32ee720a020ae56ef3320641856 Mon Sep 17 00:00:00 2001 +From 1b0ae419f8c1349a757eb2981e34d8030a204633 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:48 +0200 -Subject: [PATCH 03/36] Revert "Documentation: Drop IA64 from feature +Subject: [PATCH 03/37] Revert "Documentation: Drop IA64 from feature descriptions" This reverts commit af1f459233d4edeef634f559539e7f4b64cb1d25. 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 cb8ed5f..b06aaab 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 409027d7e4c6712406107b410ae12cf0478cf978 Mon Sep 17 00:00:00 2001 +From 98841eeeefb0e578639cbef29c7ae259e82ef9e5 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:11:55 +0200 -Subject: [PATCH 04/36] Revert "kernel: Drop IA64 support from sig_fault +Subject: [PATCH 04/37] Revert "kernel: Drop IA64 support from sig_fault handlers" This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0. @@ -57,10 +57,10 @@ index b7bc545ec3b2..0f52d0ac47c5 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 4344860ffcac..108bb58d3d34 100644 +index cbabb2d05e0a..632f5bcedbc3 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -1716,8 +1716,9 @@ void force_sigsegv(int sig) +@@ -1717,8 +1717,9 @@ void force_sigsegv(int sig) force_sig(SIGSEGV); } @@ -72,7 +72,7 @@ index 4344860ffcac..108bb58d3d34 100644 { struct kernel_siginfo info; -@@ -1726,15 +1727,24 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr, +@@ -1727,15 +1728,24 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr, info.si_errno = 0; info.si_code = code; info.si_addr = addr; @@ -100,7 +100,7 @@ index 4344860ffcac..108bb58d3d34 100644 { struct kernel_siginfo info; -@@ -1743,6 +1753,11 @@ int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t) +@@ -1744,6 +1754,11 @@ int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t) info.si_errno = 0; info.si_code = code; info.si_addr = addr; 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 be44c1e..4b7465b 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 7ca267d96849ff3b08d27295944d624ee2dea056 Mon Sep 17 00:00:00 2001 +From 1d2a136324f85db22c54a4ec5b57efd597cada82 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 27 Oct 2023 13:13:25 +0200 -Subject: [PATCH 05/36] Revert "arch: Remove Itanium (IA-64) architecture" +Subject: [PATCH 05/37] Revert "arch: Remove Itanium (IA-64) architecture" This reverts commit cf8e8658100d4eae80ce9b21f7a81cb024dd5057. --- @@ -3010,10 +3010,10 @@ index a21dbf261be7..157b2139a4a1 100644 This option sets ``possible_cpus`` bits in ``cpu_possible_mask``. diff --git a/MAINTAINERS b/MAINTAINERS -index a097afd76ded..99334f11eb83 100644 +index 21fdaa19229a..a7cf480a2052 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -10814,6 +10814,12 @@ F: drivers/i3c/ +@@ -10787,6 +10787,12 @@ F: drivers/i3c/ F: include/dt-bindings/i3c/ F: include/linux/i3c/ @@ -3026,7 +3026,7 @@ index a097afd76ded..99334f11eb83 100644 IBM Operation Panel Input Driver M: Eddie James L: linux-input@vger.kernel.org -@@ -17624,6 +17630,11 @@ S: Maintained +@@ -17575,6 +17581,11 @@ S: Maintained F: drivers/leds/leds-pca9532.c F: include/linux/leds-pca9532.h @@ -67508,7 +67508,7 @@ index 695316a83b01..1d75d5e540bc 100644 /* Extract the status field from a kernel handle */ #define GET_MSEG_HANDLE_STATUS(h) (((*(unsigned long *)(h)) >> 16) & 3) diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c -index 0f5b09e290c8..4eb4b9455139 100644 +index 3036c15f3689..d2b2e39783d0 100644 --- a/drivers/misc/sgi-gru/grumain.c +++ b/drivers/misc/sgi-gru/grumain.c @@ -41,12 +41,16 @@ struct device *grudev = &gru_device; @@ -67878,7 +67878,7 @@ index 804355da46f5..c6a8a2dc49c7 100644 defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index ea36c6956bf3..ed3b16f3ffad 100644 +index de035071fedb..013865fdcecc 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -435,7 +435,7 @@ config FB_VESA @@ -67904,7 +67904,7 @@ index 684b9fe84fff..85716e58487b 100644 depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT diff --git a/fs/Kconfig b/fs/Kconfig -index 949895cff872..de83fbc2d48d 100644 +index aae170fc2795..542c2de4fa0f 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -257,7 +257,7 @@ config ARCH_SUPPORTS_HUGETLBFS @@ -68004,7 +68004,7 @@ index e28d88066033..c0295bef3771 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 ecf63d2b0582..508a168683c7 100644 +index 61fff5d34ed5..b38792ad77ba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -375,6 +375,8 @@ extern unsigned int kobjsize(const void *objp); @@ -68057,10 +68057,10 @@ index d293d52a3e00..53cea7e55288 100644 } diff --git a/kernel/fork.c b/kernel/fork.c -index 89ceb4a68af2..a0d4ecca688c 100644 +index 22f43721d031..3c1e782e9abd 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -3017,7 +3017,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs) +@@ -3019,7 +3019,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs) if (!access_ok((void __user *)kargs->stack, kargs->stack_size)) return false; @@ -68070,10 +68070,10 @@ index 89ceb4a68af2..a0d4ecca688c 100644 #endif } diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 43e453ab7e20..d001af5e33fd 100644 +index 719e0ed1e976..61d0afb8c363 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -8733,9 +8733,9 @@ void normalize_rt_tasks(void) +@@ -8755,9 +8755,9 @@ void normalize_rt_tasks(void) #endif /* CONFIG_MAGIC_SYSRQ */ @@ -68085,7 +68085,7 @@ index 43e453ab7e20..d001af5e33fd 100644 * * They can only be called when the whole system has been * stopped - every CPU needs to be quiescent, and no scheduling -@@ -8757,7 +8757,30 @@ struct task_struct *curr_task(int cpu) +@@ -8779,7 +8779,30 @@ struct task_struct *curr_task(int cpu) return cpu_curr(cpu); } @@ -68138,7 +68138,7 @@ index 79e6cb1d5c48..c6afa709254f 100644 { .procname = "max_lock_depth", diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 7315f643817a..86cce2fb358b 100644 +index 7312ae7c3cc5..0e7c4b0664d6 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -781,7 +781,7 @@ config SHRINKER_DEBUG @@ -68181,10 +68181,10 @@ index 20aa459bfb3e..8968e2b8a12e 100644 bool "ARM BCJ filter decoder" if EXPERT default y diff --git a/mm/mmap.c b/mm/mmap.c -index dd4b35a25aeb..3ea457da9aa1 100644 +index 79d541f1502b..88bf7d8b5c54 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -1034,9 +1034,9 @@ static int acct_stack_growth(struct vm_area_struct *vma, +@@ -1035,9 +1035,9 @@ static int acct_stack_growth(struct vm_area_struct *vma, return 0; } @@ -68196,7 +68196,7 @@ index dd4b35a25aeb..3ea457da9aa1 100644 * 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) -@@ -1132,7 +1132,7 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address) +@@ -1133,7 +1133,7 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address) validate_mm(mm); return error; } diff --git a/patches/standard/0006-ia64-Use-generic-lock-bitops.patch b/patches/standard/0006-ia64-Use-generic-lock-bitops.patch index 961b244..5fcc4e0 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 1b9b2bd5c679facced893bb86d743518a73298ff Mon Sep 17 00:00:00 2001 +From b6c42d697ccb78554a5de0f28115f486a43852e9 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:49:13 +0100 -Subject: [PATCH 06/36] ia64: Use generic lock bitops +Subject: [PATCH 06/37] 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 b305dd8..d7b6d4a 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 0272d7967139c102817877ad44e55798e0f562f5 Mon Sep 17 00:00:00 2001 +From 3e0631c838b28e5e4d2951f6aa6d8ef6b014d012 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:51:09 +0100 -Subject: [PATCH 07/36] ia64: Remove unused syscall_lookup_dcookie +Subject: [PATCH 07/37] 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 f18f9d8..ea802f4 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 d0b7cbdd83c5e04c8d9232bacba7d05424ea9aa0 Mon Sep 17 00:00:00 2001 +From 1c784ebb651f964e3ad61c96736b99f9dbf14aa5 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 31 Oct 2023 19:49:39 +0100 -Subject: [PATCH 08/36] ia64: Correct parse_crashkernel argument count +Subject: [PATCH 08/37] 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 738b189..45ead44 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 f7754b1c472c72c09ae20b4b6a8dd4ed5b25678e Mon Sep 17 00:00:00 2001 +From dcaa9a06eb03c7fdc578c4540597b79735d52846 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:18:24 +0100 -Subject: [PATCH 09/36] ia64: Reserve map_shadow_stack() syscall number +Subject: [PATCH 09/37] 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 5bb257e..4ef866a 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 e9e3910d979b6f91dcf253bac72637d11df79b0d Mon Sep 17 00:00:00 2001 +From 1a23a1586b26aaa4cbb2563bc8bc8dc909d89dc0 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:24:02 +0100 -Subject: [PATCH 10/36] ia64: Add futex_wake() syscall +Subject: [PATCH 10/37] 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 8f1df8c..a5f420f 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 467a464332e15eee26e54953f6d7d17a94324cc6 Mon Sep 17 00:00:00 2001 +From 972cd7967f7d5bacc67cc4c52ef0fe6d2bc0e389 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:31:05 +0100 -Subject: [PATCH 11/36] ia64: Add futex_wait() syscall +Subject: [PATCH 11/37] 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 db6f7f4..e2bc6cb 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 05a9a64329a84ecac50e66fb28dc352bded72ff9 Mon Sep 17 00:00:00 2001 +From 0f4716ef9b524bf0305da055b1477afcaf03cb14 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 9 Nov 2023 17:32:42 +0100 -Subject: [PATCH 12/36] ia64: Add futex_requeue() syscall +Subject: [PATCH 12/37] 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 c56021a..a19cd42 100644 --- a/patches/standard/0013-ia64-Remove-sentinel-element.patch +++ b/patches/standard/0013-ia64-Remove-sentinel-element.patch @@ -1,7 +1,7 @@ -From bba6cd5e4dd316a09d7432e5a2376553ae485e99 Mon Sep 17 00:00:00 2001 +From 727fa4d87b283fdfc252d7d69fbe1c20ea20dcb7 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Mon, 13 Nov 2023 22:54:43 +0100 -Subject: [PATCH 13/36] ia64: Remove sentinel element +Subject: [PATCH 13/37] 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 1c9d92f..6d7e414 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 5f886604f34ff0fd119d3b81fcdc2a53dca76579 Mon Sep 17 00:00:00 2001 +From 69aa4a69dce073209e492e0f86858b7ad14b7be6 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Mon, 20 Nov 2023 17:08:57 +0100 -Subject: [PATCH 14/36] Revert "linux/export: clean up the IA-64 KSYM_FUNC +Subject: [PATCH 14/37] 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 97305b7..849e7d5 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 37336209a5f0eba7f844bc8e0c9b2d278f1f136e Mon Sep 17 00:00:00 2001 +From 70552e8f6868463420357de9b0e31fa01043a83d Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 21 Nov 2023 16:40:42 +0100 -Subject: [PATCH 15/36] ia64: set nid of all reserved memblocks to 0 at setup +Subject: [PATCH 15/37] 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 ecf984c..1166ba9 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 3ef506eda8bbcbe2c1e0607044bf63ecffa76722 Mon Sep 17 00:00:00 2001 +From a8256db7a10b88399fca501f994315031ef6241d Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 13:37:09 +0100 -Subject: [PATCH 16/36] ia64: rename MAX_ORDER to MAX_PAGE_ORDER +Subject: [PATCH 16/37] 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 9c3d330..84c6229 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 8c8e6738f666b79c9da5be59946145579231afb2 Mon Sep 17 00:00:00 2001 +From d1f0a812cfcda745c07dd78f11e7236fd178a60f Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 14:21:54 +0100 -Subject: [PATCH 17/36] Revert "mm: remove unnecessary ia64 code and comment" +Subject: [PATCH 17/37] Revert "mm: remove unnecessary ia64 code and comment" This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f. --- @@ -12,7 +12,7 @@ This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f. 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig -index 4c9f5ea13271..fe1c4ebbcb77 100644 +index 33fa51d608dc..13862edde680 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -749,7 +749,7 @@ config DEFAULT_MMAP_MIN_ADDR @@ -25,7 +25,7 @@ index 4c9f5ea13271..fe1c4ebbcb77 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 2366578015ad..619285fe1e20 100644 +index bdf77a3ec47b..86cf4e6cd963 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -125,7 +125,9 @@ static __always_inline bool vmf_orig_pte_uffd_wp(struct vm_fault *vmf) 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 d32ae3e..64bd622 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 1767bce5682169a56e18cffb4b4e68442a7aad93 Mon Sep 17 00:00:00 2001 +From d9256199efd0255daef410ae50032d8f8701c727 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 12 Jan 2024 18:54:34 +0100 -Subject: [PATCH 18/36] Revert "arch: remove ARCH_THREAD_STACK_ALLOCATOR" +Subject: [PATCH 18/37] 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 8af374ea1adc..30b7976853e9 100644 +index bd9f095d69fa..1cb62a4c2f8e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -333,6 +333,10 @@ config HAVE_ARCH_THREAD_STRUCT_WHITELIST @@ -25,10 +25,10 @@ index 8af374ea1adc..30b7976853e9 100644 config ARCH_WANTS_DYNAMIC_TASK_STRUCT bool diff --git a/kernel/fork.c b/kernel/fork.c -index a0d4ecca688c..4f50d396b8b4 100644 +index 3c1e782e9abd..1f12cd540d69 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -185,6 +185,8 @@ static inline void free_task_struct(struct task_struct *tsk) +@@ -186,6 +186,8 @@ static inline void free_task_struct(struct task_struct *tsk) kmem_cache_free(task_struct_cachep, tsk); } @@ -37,7 +37,7 @@ index a0d4ecca688c..4f50d396b8b4 100644 /* * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a * kmemcache based allocator. -@@ -417,6 +419,24 @@ void thread_stack_cache_init(void) +@@ -418,6 +420,24 @@ void thread_stack_cache_init(void) } # endif /* THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK) */ 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 2355fc5..432ed50 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 cd2e7372df0119c09dd7b041069138d031d9f41b Mon Sep 17 00:00:00 2001 +From ca2aa2fa81edceb46f6fb2fb52d616348e56fd19 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Thu, 11 Jan 2024 16:45:16 +0100 -Subject: [PATCH 19/36] Revert "arch: remove ARCH_TASK_STRUCT_ALLOCATOR" +Subject: [PATCH 19/37] 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 30b7976853e9..d44335355fc9 100644 +index 1cb62a4c2f8e..6cbb01077e21 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -323,8 +323,17 @@ config ARCH_HAS_CPU_PASID @@ -32,10 +32,10 @@ index 30b7976853e9..d44335355fc9 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 4f50d396b8b4..63320467e40a 100644 +index 1f12cd540d69..c132ffee8a74 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -173,6 +173,7 @@ void __weak arch_release_task_struct(struct task_struct *tsk) +@@ -174,6 +174,7 @@ void __weak arch_release_task_struct(struct task_struct *tsk) { } @@ -43,7 +43,7 @@ index 4f50d396b8b4..63320467e40a 100644 static struct kmem_cache *task_struct_cachep; static inline struct task_struct *alloc_task_struct_node(int node) -@@ -184,6 +185,7 @@ static inline void free_task_struct(struct task_struct *tsk) +@@ -185,6 +186,7 @@ static inline void free_task_struct(struct task_struct *tsk) { kmem_cache_free(task_struct_cachep, tsk); } @@ -51,7 +51,7 @@ index 4f50d396b8b4..63320467e40a 100644 #ifndef CONFIG_ARCH_THREAD_STACK_ALLOCATOR -@@ -1042,6 +1044,7 @@ static void __init set_max_threads(unsigned int max_threads_suggested) +@@ -1043,6 +1045,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 4f50d396b8b4..63320467e40a 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 +@@ -1057,10 +1060,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 4f50d396b8b4..63320467e40a 100644 #ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0 #endif -@@ -1072,6 +1077,7 @@ void __init fork_init(void) +@@ -1073,6 +1078,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 5ad36cd..e1471d5 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 e9c22191839f33b4485b70aa678161b849bdb682 Mon Sep 17 00:00:00 2001 +From 8bba13237ba1ae8a91ddfb1ea4f33b8302b59342 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 12 Jan 2024 19:11:18 +0100 -Subject: [PATCH 20/36] Revert "arch: remove ARCH_TASK_STRUCT_ON_STACK" +Subject: [PATCH 20/37] Revert "arch: remove ARCH_TASK_STRUCT_ON_STACK" This reverts commit 0eb5085c38749f2a91e5bd8cbebb1ebf3398343c. --- @@ -44,7 +44,7 @@ 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 e6ee4258169a..f233a2979af4 100644 +index bb343136ddd0..39788263c6a0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1883,7 +1883,9 @@ extern void ia64_set_curr_task(int cpu, struct task_struct *p); 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 5c3e254..0216545 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 e300c7cfdc15698d17e39f1ace9411391cc30253 Mon Sep 17 00:00:00 2001 +From 408f98908d8388238e507aa0301a051a601211b2 Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Fri, 19 Jan 2024 20:18:07 +0100 -Subject: [PATCH 21/36] Revert "tty: deprecate tty_write_message()" +Subject: [PATCH 21/37] Revert "tty: deprecate tty_write_message()" This reverts commit 4c74253b831e5a8eb87d4d8d4a0eae40c331e682. 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 9f60ba2..fc78f19 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 f6d06737291d64a2496f37d7e8620bee373d375b Mon Sep 17 00:00:00 2001 +From 071af658649a19c36aa15a6b6bfd442c3114c74c Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Sun, 24 Mar 2024 19:43:52 +0100 -Subject: [PATCH 22/36] Revert "mmap: remove the IA64-specific vma expansion +Subject: [PATCH 22/37] Revert "mmap: remove the IA64-specific vma expansion implementation" This reverts commit 69e583eaca579d50ffc699b1f4358258e75fa008. @@ -10,10 +10,10 @@ This reverts commit 69e583eaca579d50ffc699b1f4358258e75fa008. 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c -index 3ea457da9aa1..3029c93b5497 100644 +index 88bf7d8b5c54..287f6f226887 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -1290,7 +1290,42 @@ struct vm_area_struct *find_extend_vma_locked(struct mm_struct *mm, unsigned lon +@@ -1291,7 +1291,42 @@ struct vm_area_struct *find_extend_vma_locked(struct mm_struct *mm, unsigned lon } #endif 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 ae1c741..0e2f727 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 9d9ab770c2d464305dc9a3554f0c9aec8ebf9b33 Mon Sep 17 00:00:00 2001 +From 4c19fe7fd42cbb0d9ec1fb41b4451c532c3f426d Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Sun, 24 Mar 2024 20:20:36 +0100 -Subject: [PATCH 23/36] Revert "hpet: remove hpets::hp_clocksource" +Subject: [PATCH 23/37] 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 b7b5ca5..eb4f07e 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 81ad8d3e3764d7047811aa9d7438630a4a72f2d6 Mon Sep 17 00:00:00 2001 +From 70b9d84c464ba428c7c2f170595047a86999e5ea Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:02:39 +0200 -Subject: [PATCH 24/36] ia64: replay "change alloc_pages name in dma_map_ops +Subject: [PATCH 24/37] 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 b0e8181..cfcb7fb 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 319a7fc211f098f99e057f6d2c5202c6e52acb81 Mon Sep 17 00:00:00 2001 +From 67ed0d13301dd8c3905a38595e167006d4f2c140 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 13:28:12 +0200 -Subject: [PATCH 25/36] ia64: handle "NUMA: early use of cpu_to_node() returns +Subject: [PATCH 25/37] 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 2b4ef2a..64c0ba6 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 5bdbd3c94fd752ad1da16dba7b8575f197f6b537 Mon Sep 17 00:00:00 2001 +From f097e6cacc8bc15fee5e1ef104c993729eb8b2b2 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:03:49 +0200 -Subject: [PATCH 26/36] Revert "mm: remove guard around pgd_offset_k() macro" +Subject: [PATCH 26/37] 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 aaff12d..f761983 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 bb8b749a285468c73d45071aede222bfc78ce9d4 Mon Sep 17 00:00:00 2001 +From df55e5d5effdf520634629c83122c2fa387be41b Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:05:31 +0200 -Subject: [PATCH 27/36] Revert "ACPI/NUMA: Squash +Subject: [PATCH 27/37] 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 31d2edf..9578ee2 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 d119d5b9926ce268e900557bc865b13ac2dd5acf Mon Sep 17 00:00:00 2001 +From fadcee096f8d889883945e4a8093144e05e8ca0b Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sun, 2 Jun 2024 10:10:34 +0200 -Subject: [PATCH 28/36] Revert "ACPI/NUMA: Remove architecture dependent +Subject: [PATCH 28/37] Revert "ACPI/NUMA: Remove architecture dependent remainings" This reverts commit 3a785e19f432672b9ef53f07c506d5e698439033. 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 1ebf728..6925d9a 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 334bbfe5fcf3d874fc1beb3ffa664eed3d7b3059 Mon Sep 17 00:00:00 2001 +From 8a1a621cf6d0c62987cdebcd6902f093e0bdde47 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Thu, 18 Jul 2024 20:48:20 +0200 -Subject: [PATCH 29/36] ia64: replay "sched/vtime: Do not include +Subject: [PATCH 29/37] 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 3a79101..0676efb 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 d0c9ab87026f1a66d4fcd2c9d1081d19c0df8103 Mon Sep 17 00:00:00 2001 +From 886fc991cf47d432d54a0d29529184f23661f159 Mon Sep 17 00:00:00 2001 From: Benjamin Gray Date: Tue, 12 Sep 2023 16:07:55 +1000 -Subject: [PATCH 30/36] ia64: fix Python string escapes +Subject: [PATCH 30/37] 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 39e6865..1046a3f 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 dadc9fd7efb78c2c458a6efc3179b1dc70292431 Mon Sep 17 00:00:00 2001 +From ad80f0fd59042a5de7bf1fedeea7a26a6b256c30 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Thu, 19 Sep 2024 22:50:12 +0200 -Subject: [PATCH 31/36] ia64: replay "dma-mapping: clearly mark DMA ops as +Subject: [PATCH 31/37] 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 595bcb8..6688b6d 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 8cc67d60aec9a0aa5294dd8f10e7c14b99842d86 Mon Sep 17 00:00:00 2001 +From d04e0bc0fcb56497474b40c5f29a07685c448475 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:29:04 +0200 -Subject: [PATCH 32/36] Partially revert "x86: remove PG_uncached" +Subject: [PATCH 32/37] Partially revert "x86: remove PG_uncached" This partially reverts commit 7a87225ae2c6c317c7b80cf599e5cf0eee. --- @@ -79,7 +79,7 @@ index 196778a087c4..7c587a711be1 100644 #define KPF_ARCH_2 41 #define KPF_ARCH_3 42 diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h -index 1b3a76710487..197f8acb03fe 100644 +index cc839e4365c1..d78a26a119f6 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -113,6 +113,9 @@ enum pageflags { @@ -123,10 +123,10 @@ index 6f9c3dceff32..84abc858ca3d 100644 #define IF_HAVE_PG_HWPOISON(_name) ,{1UL << PG_##_name, __stringify(_name)} #else diff --git a/tools/mm/page-types.c b/tools/mm/page-types.c -index fa050d5a48cd..8ca41c41105e 100644 +index 6eb17cc1a06c..fa57be7c3f20 100644 --- a/tools/mm/page-types.c +++ b/tools/mm/page-types.c -@@ -76,7 +76,7 @@ +@@ -77,7 +77,7 @@ #define KPF_PRIVATE_2 36 #define KPF_OWNER_PRIVATE 37 #define KPF_ARCH 38 @@ -135,7 +135,7 @@ index fa050d5a48cd..8ca41c41105e 100644 #define KPF_SOFTDIRTY 40 #define KPF_ARCH_2 41 -@@ -134,6 +134,7 @@ static const char * const page_flag_names[] = { +@@ -135,6 +135,7 @@ static const char * const page_flag_names[] = { [KPF_PRIVATE_2] = "p:private_2", [KPF_OWNER_PRIVATE] = "O:owner_private", [KPF_ARCH] = "h:arch", 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 6d4aa4e..f9b44be 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 cc5f43adcaabd10da4361609a38dc61e1a14653d Mon Sep 17 00:00:00 2001 +From f55d4cd7eb6e9dab2da10cda15cc1953a254babe Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:33:54 +0200 -Subject: [PATCH 33/36] Replay "mm: make arch_get_unmapped_area() take vm_flags +Subject: [PATCH 33/37] 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 242b81a..37b4144 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 61602f5cb843f8fce30be79a00c81ed48acf8c40 Mon Sep 17 00:00:00 2001 +From 451d23e0b23ab59516e004044ccac20b2b936faa Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 27 Sep 2024 14:54:38 +0200 -Subject: [PATCH 34/36] Revert "efi: Remove unused declaration +Subject: [PATCH 34/37] 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 901b7cc..67a5b84 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 ddd0fcfe05c2535b83ff6d1302237e5ec10d233c Mon Sep 17 00:00:00 2001 +From e83d981751c9f19771ed7403e1bd053e08c6204b Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Fri, 4 Oct 2024 20:50:34 +0200 -Subject: [PATCH 35/36] ia64: replay "move asm/unaligned.h to +Subject: [PATCH 35/37] 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 fc540ed..3896600 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 c598a2fa9085850a4d264ca05eee65145bd55dfe Mon Sep 17 00:00:00 2001 +From cd9576bbe610d9b5021d12bdb1268274c886cb74 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Sat, 5 Oct 2024 13:16:09 +0200 -Subject: [PATCH 36/36] ia64: For now silence warning due to redefinition of +Subject: [PATCH 36/37] 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 new file mode 100644 index 0000000..9252205 --- /dev/null +++ b/patches/standard/0037-ia64-Workaround-Wmissing-prototypes-warnings.patch @@ -0,0 +1,648 @@ +From 820146ad4c28853df785ffecc45b01fcc27ff05e Mon Sep 17 00:00:00 2001 +From: Johnny Mnemonic +Date: Mon, 21 Oct 2024 11:51:37 +0200 +Subject: [PATCH 37/37] ia64: Workaround -Wmissing-prototypes warnings + +Workaround the -Wmissing-prototypes warnings by declaring them locally +similar to what was done in: + +* 49ff7d871242d7fd8adb8a2d8347c5d94dda808b +* 736e30af583fb6e0e2b8211b894ff99dea0f1ee7 +* 8d0d37cfb8039939f51dd2a1da98aff3b50a4e84 +* 3d013424de1efc2c9e68c6c06e76159e467c7ba8 +--- + arch/ia64/kernel/acpi.c | 3 +++ + arch/ia64/kernel/asm-offsets.c | 3 +++ + arch/ia64/kernel/efi.c | 3 +++ + arch/ia64/kernel/elfcore.c | 5 +++++ + arch/ia64/kernel/iosapic.c | 3 +++ + arch/ia64/kernel/irq.c | 3 +++ + arch/ia64/kernel/irq_ia64.c | 11 +++++++++++ + arch/ia64/kernel/kprobes.c | 3 +++ + arch/ia64/kernel/mca.c | 14 ++++++++++++++ + arch/ia64/kernel/mca_drv.c | 7 +++++++ + arch/ia64/kernel/module.c | 3 +++ + arch/ia64/kernel/process.c | 12 ++++++++++++ + arch/ia64/kernel/ptrace.c | 9 +++++++++ + arch/ia64/kernel/salinfo.c | 3 +++ + arch/ia64/kernel/signal.c | 3 +++ + arch/ia64/kernel/smpboot.c | 11 +++++++++++ + arch/ia64/kernel/sys_ia64.c | 12 ++++++++++++ + arch/ia64/kernel/time.c | 2 ++ + arch/ia64/kernel/traps.c | 16 ++++++++++++++++ + arch/ia64/kernel/unaligned.c | 3 +++ + arch/ia64/kernel/unwind.c | 3 +++ + arch/ia64/lib/checksum.c | 12 ++++++++++++ + arch/ia64/mm/discontig.c | 4 ++++ + arch/ia64/mm/extable.c | 3 +++ + arch/ia64/mm/fault.c | 3 +++ + arch/ia64/mm/hugetlbpage.c | 4 ++++ + arch/ia64/mm/init.c | 6 ++++++ + arch/ia64/mm/tlb.c | 3 +++ + arch/ia64/pci/pci.c | 3 +++ + 29 files changed, 170 insertions(+) + +diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c +index 41e8fe55cd98..20e13d0c5627 100644 +--- a/arch/ia64/kernel/acpi.c ++++ b/arch/ia64/kernel/acpi.c +@@ -908,6 +908,9 @@ EXPORT_SYMBOL(acpi_unregister_ioapic); + */ + int acpi_suspend_lowlevel(void) { return 0; } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void acpi_proc_quirk_mwait_check(void); ++ + void acpi_proc_quirk_mwait_check(void) + { + } +diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c +index be3b90fef2e9..3f7bc930a62e 100644 +--- a/arch/ia64/kernel/asm-offsets.c ++++ b/arch/ia64/kernel/asm-offsets.c +@@ -20,6 +20,9 @@ + #include "../kernel/sigframe.h" + #include "../kernel/fsyscall_gtod_data.h" + ++/* workaround for a warning with -Wmissing-prototypes */ ++void foo(void); ++ + void foo(void) + { + DEFINE(IA64_TASK_SIZE, sizeof (struct task_struct)); +diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c +index 033f5aead88a..b52d4865c3cb 100644 +--- a/arch/ia64/kernel/efi.c ++++ b/arch/ia64/kernel/efi.c +@@ -962,6 +962,9 @@ efi_uart_console_only(void) + return 0; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++struct kern_memdesc * find_memmap_space (void); ++ + /* + * Look for the first granule aligned memory descriptor memory + * that is big enough to hold EFI memory map. Make sure this +diff --git a/arch/ia64/kernel/elfcore.c b/arch/ia64/kernel/elfcore.c +index 8895df121540..b32fa1821b36 100644 +--- a/arch/ia64/kernel/elfcore.c ++++ b/arch/ia64/kernel/elfcore.c +@@ -6,6 +6,11 @@ + + #include + ++/* workaround for a warning with -Wmissing-prototypes */ ++Elf64_Half elf_core_extra_phdrs(struct coredump_params *cprm); ++int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset); ++int elf_core_write_extra_data(struct coredump_params *cprm); ++size_t elf_core_extra_data_size(struct coredump_params *cprm); + + Elf64_Half elf_core_extra_phdrs(struct coredump_params *cprm) + { +diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c +index 99300850abc1..f37e4402c635 100644 +--- a/arch/ia64/kernel/iosapic.c ++++ b/arch/ia64/kernel/iosapic.c +@@ -261,6 +261,9 @@ iosapic_nop (struct irq_data *data) + + + #ifdef CONFIG_KEXEC ++/* workaround for a warning with -Wmissing-prototypes */ ++void kexec_disable_iosapic(void); ++ + void + kexec_disable_iosapic(void) + { +diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c +index 275b9ea58c64..dcb718560e62 100644 +--- a/arch/ia64/kernel/irq.c ++++ b/arch/ia64/kernel/irq.c +@@ -125,6 +125,9 @@ static void migrate_irqs(void) + } + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void fixup_irqs(void); ++ + void fixup_irqs(void) + { + unsigned int irq; +diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c +index 46e33c5cb53d..c94e0bec3d72 100644 +--- a/arch/ia64/kernel/irq_ia64.c ++++ b/arch/ia64/kernel/irq_ia64.c +@@ -420,6 +420,10 @@ void destroy_irq(unsigned int irq) + # define IS_RESCHEDULE(vec) (0) + # define IS_LOCAL_TLB_FLUSH(vec) (0) + #endif ++ ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_handle_irq (ia64_vector vector, struct pt_regs *regs); ++ + /* + * That's where the IVT branches when we get an external + * interrupt. This branches to the correct hardware IRQ handler via +@@ -505,6 +509,10 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) + } + + #ifdef CONFIG_HOTPLUG_CPU ++ ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_process_pending_intr(void); ++ + /* + * This function emulates a interrupt processing when a cpu is about to be + * brought down. +@@ -583,6 +591,9 @@ static irqreturn_t dummy_handler (int irq, void *dev_id) + + #endif + ++/* workaround for a warning with -Wmissing-prototypes */ ++void register_percpu_irq(ia64_vector vec, irq_handler_t handler, unsigned long flags, const char *name); ++ + void + register_percpu_irq(ia64_vector vec, irq_handler_t handler, unsigned long flags, + const char *name) +diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c +index ca34e51e84b4..502ce72bb352 100644 +--- a/arch/ia64/kernel/kprobes.c ++++ b/arch/ia64/kernel/kprobes.c +@@ -396,6 +396,9 @@ void __kretprobe_trampoline(void) + { + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs); ++ + int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) + { + regs->cr_iip = __kretprobe_trampoline_handler(regs, NULL); +diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c +index 2671688d349a..0598760e7b1e 100644 +--- a/arch/ia64/kernel/mca.c ++++ b/arch/ia64/kernel/mca.c +@@ -487,6 +487,12 @@ ia64_mca_log_sal_error_record(int sal_info_type) + ia64_sal_clear_state_info(sal_info_type); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++int ++search_mca_table (const struct mca_table_entry *first, ++ const struct mca_table_entry *last, ++ unsigned long ip); ++ + /* + * search_mca_table + * See if the MCA surfaced in an instruction range +@@ -592,6 +598,9 @@ ia64_mca_cpe_int_handler (int cpe_irq, void *arg) + return IRQ_HANDLED; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_mca_register_cpev (int cpev); ++ + /* + * ia64_mca_register_cpev + * +@@ -1260,6 +1269,11 @@ static void mca_insert_tr(u64 iord) + ia64_set_psr(psr); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ++ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, ++ struct ia64_sal_os_state *sos); ++ + /* + * ia64_mca_handler + * +diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c +index 23c203639a96..ebe2691db4b2 100644 +--- a/arch/ia64/kernel/mca_drv.c ++++ b/arch/ia64/kernel/mca_drv.c +@@ -147,6 +147,9 @@ mca_page_isolate(unsigned long paddr) + return ISOLATE_OK; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void mca_handler_bh(unsigned long paddr, void *iip, unsigned long ipsr); ++ + /** + * mca_hanlder_bh - Kill the process which occurred memory read error + * @paddr: poisoned address received from MCA Handler +@@ -765,6 +768,10 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos) + * ============================================================================= + */ + ++/* workaround for a warning with -Wmissing-prototypes */ ++int __init mca_external_handler_init(void); ++void __exit mca_external_handler_exit(void); ++ + int __init mca_external_handler_init(void) + { + if (init_record_index_pools()) +diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c +index 57f57943686b..1d314d31e7e8 100644 +--- a/arch/ia64/kernel/module.c ++++ b/arch/ia64/kernel/module.c +@@ -241,6 +241,9 @@ patch_plt (struct module *mod, struct plt_entry *plt, long target_ip, unsigned l + return 0; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++unsigned long plt_target (struct plt_entry *plt); ++ + unsigned long + plt_target (struct plt_entry *plt) + { +diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c +index 9a5cd9fad3a9..c3cd40fa2215 100644 +--- a/arch/ia64/kernel/process.c ++++ b/arch/ia64/kernel/process.c +@@ -151,6 +151,10 @@ show_regs (struct pt_regs *regs) + show_stack(NULL, NULL, KERN_DEFAULT); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void console_print(const char *s); ++void do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall); ++ + /* local support for deprecated console_print */ + void + console_print(const char *s) +@@ -402,6 +406,11 @@ copy_thread(struct task_struct *p, const struct kernel_clone_args *args) + return retval; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++asmlinkage long ia64_clone(unsigned long clone_flags, unsigned long stack_start, ++ unsigned long stack_size, unsigned long parent_tidptr, ++ unsigned long child_tidptr, unsigned long tls); ++ + asmlinkage long ia64_clone(unsigned long clone_flags, unsigned long stack_start, + unsigned long stack_size, unsigned long parent_tidptr, + unsigned long child_tidptr, unsigned long tls) +@@ -555,6 +564,9 @@ __get_wchan (struct task_struct *p) + return 0; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void cpu_halt (void); ++ + void + cpu_halt (void) + { +diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c +index 4c41912c550f..fd06d47edb73 100644 +--- a/arch/ia64/kernel/ptrace.c ++++ b/arch/ia64/kernel/ptrace.c +@@ -1151,6 +1151,15 @@ arch_ptrace (struct task_struct *child, long request, + } + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++asmlinkage long ++syscall_trace_enter (long arg0, long arg1, long arg2, long arg3, ++ long arg4, long arg5, long arg6, long arg7, ++ struct pt_regs regs); ++asmlinkage void ++syscall_trace_leave (long arg0, long arg1, long arg2, long arg3, ++ long arg4, long arg5, long arg6, long arg7, ++ struct pt_regs regs); + + /* "asmlinkage" so the input arguments are preserved... */ + +diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c +index 03b632c56899..981feaea92f4 100644 +--- a/arch/ia64/kernel/salinfo.c ++++ b/arch/ia64/kernel/salinfo.c +@@ -197,6 +197,9 @@ shift1_data_saved (struct salinfo_data *data, int shift) + sizeof(data->data_saved[0])); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe); ++ + /* This routine is invoked in interrupt context. Note: mca.c enables + * interrupts before calling this code for CMC/CPE. MCA and INIT events are + * not irq safe, do not call any routines that use spinlocks, they may deadlock. +diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c +index 51cf6a7ec158..c4a7dd737ed4 100644 +--- a/arch/ia64/kernel/signal.c ++++ b/arch/ia64/kernel/signal.c +@@ -104,6 +104,9 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr) + return err; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++long ia64_rt_sigreturn (struct sigscratch *scr); ++ + long + ia64_rt_sigreturn (struct sigscratch *scr) + { +diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c +index d0e935cf2093..2c1dbcb54076 100644 +--- a/arch/ia64/kernel/smpboot.c ++++ b/arch/ia64/kernel/smpboot.c +@@ -186,6 +186,9 @@ static void fix_b0_for_bsp(void) + #endif + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void sync_master (void *arg); ++ + void + sync_master (void *arg) + { +@@ -239,6 +242,9 @@ get_delta (long *rt, long *master) + return tcenter - best_tm; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_sync_itc (unsigned int master); ++ + /* + * Synchronize ar.itc of the current (slave) CPU with the ar.itc of the MASTER CPU + * (normally the time-keeper CPU). We use a closed loop to eliminate the possibility of +@@ -427,6 +433,8 @@ smp_callin (void) + Dprintk("Stack on CPU %d at about %p\n",cpuid, &cpuid); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++int start_secondary (void *unused); + + /* + * Activate a secondary processor. head.S calls this. +@@ -589,6 +597,9 @@ remove_siblinginfo(int cpu) + + extern void fixup_irqs(void); + ++/* workaround for a warning with -Wmissing-prototypes */ ++int migrate_platform_irqs(unsigned int cpu); ++ + int migrate_platform_irqs(unsigned int cpu) + { + int new_cpei_cpu; +diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c +index 6669514a0454..9f4a579fb437 100644 +--- a/arch/ia64/kernel/sys_ia64.c ++++ b/arch/ia64/kernel/sys_ia64.c +@@ -67,6 +67,11 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len + return vm_unmapped_area(&info); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++asmlinkage long ia64_getpriority (int which, int who); ++asmlinkage unsigned long sys_getpagesize (void); ++asmlinkage unsigned long ia64_brk (unsigned long brk); ++ + asmlinkage long + ia64_getpriority (int which, int who) + { +@@ -157,6 +162,13 @@ sys_mmap (unsigned long addr, unsigned long len, int prot, int flags, int fd, lo + return addr; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++asmlinkage unsigned long ++ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, ++ unsigned long new_addr); ++asmlinkage long ++ia64_clock_getres(const clockid_t which_clock, struct __kernel_timespec __user *tp); ++ + asmlinkage unsigned long + ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, + unsigned long new_addr) +diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c +index 83ef044b63ef..082101e1b7eb 100644 +--- a/arch/ia64/kernel/time.c ++++ b/arch/ia64/kernel/time.c +@@ -256,6 +256,8 @@ static int __init nojitter_setup(char *str) + + __setup("nojitter", nojitter_setup); + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_init_itm(void); + + void ia64_init_itm(void) + { +diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c +index 53735b1d1be3..7c1ee9e73785 100644 +--- a/arch/ia64/kernel/traps.c ++++ b/arch/ia64/kernel/traps.c +@@ -31,6 +31,12 @@ + fpswa_interface_t *fpswa_interface; + EXPORT_SYMBOL(fpswa_interface); + ++/* workaround for a warning with -Wmissing-prototypes */ ++void __init trap_init (void); ++int die (const char *str, struct pt_regs *regs, long err); ++int die_if_kernel (char *str, struct pt_regs *regs, long err); ++void __kprobes ia64_bad_break (unsigned long break_num, struct pt_regs *regs); ++ + void __init + trap_init (void) + { +@@ -383,6 +389,16 @@ struct illegal_op_return { + unsigned long fkt, arg1, arg2, arg3; + }; + ++/* workaround for a warning with -Wmissing-prototypes */ ++struct illegal_op_return ++ia64_illegal_op_fault (unsigned long ec, long arg1, long arg2, long arg3, ++ long arg4, long arg5, long arg6, long arg7, ++ struct pt_regs regs); ++void __kprobes ++ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, ++ unsigned long iim, unsigned long itir, long arg5, long arg6, ++ long arg7, struct pt_regs regs); ++ + struct illegal_op_return + ia64_illegal_op_fault (unsigned long ec, long arg1, long arg2, long arg3, + long arg4, long arg5, long arg6, long arg7, +diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c +index 9cc894b76661..03807762312f 100644 +--- a/arch/ia64/kernel/unaligned.c ++++ b/arch/ia64/kernel/unaligned.c +@@ -1310,6 +1310,9 @@ emulate_store_float (unsigned long ifa, load_store_t ld, struct pt_regs *regs, + */ + static DEFINE_RATELIMIT_STATE(logging_rate_limit, 5 * HZ, 5); + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs); ++ + void + ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs) + { +diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c +index 6bd64c35e691..44620c781ac9 100644 +--- a/arch/ia64/kernel/unwind.c ++++ b/arch/ia64/kernel/unwind.c +@@ -2280,6 +2280,9 @@ unw_init (void) + __start_unwind, __end_unwind); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++asmlinkage long sys_getunwind (void __user *buf, size_t buf_size); ++ + /* + * DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED + * +diff --git a/arch/ia64/lib/checksum.c b/arch/ia64/lib/checksum.c +index d26517fe3500..6a2e8f9f0da9 100644 +--- a/arch/ia64/lib/checksum.c ++++ b/arch/ia64/lib/checksum.c +@@ -30,6 +30,9 @@ from64to16 (unsigned long x) + return x; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __wsum sum); ++ + /* + * computes the checksum of the TCP/UDP pseudo-header + * returns a 16-bit checksum, already complemented. +@@ -45,6 +48,9 @@ csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, + + EXPORT_SYMBOL(csum_tcpudp_magic); + ++/* workaround for a warning with -Wmissing-prototypes */ ++__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __wsum sum); ++ + __wsum + csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, + __u8 proto, __wsum sum) +@@ -65,6 +71,9 @@ EXPORT_SYMBOL(csum_tcpudp_nofold); + + extern unsigned long do_csum (const unsigned char *, long); + ++/* workaround for a warning with -Wmissing-prototypes */ ++__wsum csum_partial(const void *buff, int len, __wsum sum); ++ + /* + * computes the checksum of a memory block at buff, length len, + * and adds in "sum" (32-bit) +@@ -90,6 +99,9 @@ __wsum csum_partial(const void *buff, int len, __wsum sum) + + EXPORT_SYMBOL(csum_partial); + ++/* workaround for a warning with -Wmissing-prototypes */ ++__sum16 ip_compute_csum (const void *buff, int len); ++ + /* + * this routine is used for miscellaneous IP-like checksums, mainly + * in icmp.c +diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c +index 73d0db36edb6..c55f6e9b2c3a 100644 +--- a/arch/ia64/mm/discontig.c ++++ b/arch/ia64/mm/discontig.c +@@ -608,6 +608,10 @@ void __init paging_init(void) + zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page)); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++pg_data_t * __init arch_alloc_nodedata(int nid); ++void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat); ++ + pg_data_t * __init arch_alloc_nodedata(int nid) + { + unsigned long size = compute_pernodesize(nid); +diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c +index da477c11770b..0d795681df96 100644 +--- a/arch/ia64/mm/extable.c ++++ b/arch/ia64/mm/extable.c +@@ -11,6 +11,9 @@ + #include + #include + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e); ++ + void + ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e) + { +diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c +index 5458b52b4009..9024a29207b1 100644 +--- a/arch/ia64/mm/fault.c ++++ b/arch/ia64/mm/fault.c +@@ -62,6 +62,9 @@ mapped_kernel_page_is_present (unsigned long address) + # define VM_WRITE_BIT 1 + # define VM_EXEC_BIT 2 + ++/* workaround for a warning with -Wmissing-prototypes */ ++void __kprobes ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs); ++ + void __kprobes + ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs) + { +diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c +index 38de155d80c5..a6f8637f6a3f 100644 +--- a/arch/ia64/mm/hugetlbpage.c ++++ b/arch/ia64/mm/hugetlbpage.c +@@ -91,6 +91,10 @@ int prepare_hugepage_range(struct file *file, + return 0; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++int pmd_huge(pmd_t pmd); ++int pud_huge(pud_t pud); ++ + int pmd_huge(pmd_t pmd) + { + return 0; +diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c +index 05b0f2f0c073..902fcf3e2497 100644 +--- a/arch/ia64/mm/init.c ++++ b/arch/ia64/mm/init.c +@@ -161,6 +161,9 @@ free_initmem (void) + -1, "unused kernel"); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void __init free_initrd_mem (unsigned long start, unsigned long end); ++ + void __init + free_initrd_mem (unsigned long start, unsigned long end) + { +@@ -310,6 +313,9 @@ int in_gate_area(struct mm_struct *mm, unsigned long addr) + return in_gate_area_no_mm(addr); + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_mmu_init(void *my_cpu_data); ++ + void ia64_mmu_init(void *my_cpu_data) + { + unsigned long pta, impl_va_bits; +diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c +index ca060e7a2a46..678546bda139 100644 +--- a/arch/ia64/mm/tlb.c ++++ b/arch/ia64/mm/tlb.c +@@ -366,6 +366,9 @@ void flush_tlb_range(struct vm_area_struct *vma, + } + EXPORT_SYMBOL(flush_tlb_range); + ++/* workaround for a warning with -Wmissing-prototypes */ ++void ia64_tlb_init(void); ++ + void ia64_tlb_init(void) + { + ia64_ptce_info_t ptce_info; +diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c +index 0a0328e61bef..1e28bf4db18f 100644 +--- a/arch/ia64/pci/pci.c ++++ b/arch/ia64/pci/pci.c +@@ -323,6 +323,9 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) + return 0; + } + ++/* workaround for a warning with -Wmissing-prototypes */ ++void pcibios_fixup_device_resources(struct pci_dev *dev); ++ + void pcibios_fixup_device_resources(struct pci_dev *dev) + { + int idx; +-- +2.25.1 +