Skip to content

Commit

Permalink
Update standard patch set to v6.13-rc1-w-ia64
Browse files Browse the repository at this point in the history
from
https://github.com/johnny-mnemonic/linux-ia64/tree/v6.13-rc1-w-ia64

Also drop extra patch now in standard patch set.
  • Loading branch information
johnny-mnemonic committed Dec 2, 2024
1 parent c5f969e commit db585c3
Show file tree
Hide file tree
Showing 45 changed files with 207 additions and 147 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down Expand Up @@ -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 @@
Expand Down Expand Up @@ -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``;
Expand All @@ -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.
= =============================================================

Expand All @@ -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.


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down Expand Up @@ -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 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
---
Expand Down Expand Up @@ -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/

Expand All @@ -3026,7 +3026,7 @@ index e7f017097701..dad90e09350c 100644
IBM Operation Panel Input Driver
M: Eddie James <[email protected]>
L: [email protected]
@@ -17693,6 +17699,11 @@ S: Maintained
@@ -17784,6 +17790,11 @@ S: Maintained
F: drivers/leds/leds-pca9532.c
F: include/linux/leds-pca9532.h

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand All @@ -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;

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0006-ia64-Use-generic-lock-bitops.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0010-ia64-Add-futex_wake-syscall.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0011-ia64-Add-futex_wait-syscall.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0012-ia64-Add-futex_requeue-syscall.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0013-ia64-Remove-sentinel-element.patch
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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()"):
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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
Expand Down
Loading

0 comments on commit db585c3

Please sign in to comment.