Skip to content

Commit 1e0c505

Browse files
committed
Merge tag 'asm-generic-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull ia64 removal and asm-generic updates from Arnd Bergmann: - The ia64 architecture gets its well-earned retirement as planned, now that there is one last (mostly) working release that will be maintained as an LTS kernel. - The architecture specific system call tables are updated for the added map_shadow_stack() syscall and to remove references to the long-gone sys_lookup_dcookie() syscall. * tag 'asm-generic-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: hexagon: Remove unusable symbols from the ptrace.h uapi asm-generic: Fix spelling of architecture arch: Reserve map_shadow_stack() syscall number for all architectures syscalls: Cleanup references to sys_lookup_dcookie() Documentation: Drop or replace remaining mentions of IA64 lib/raid6: Drop IA64 support Documentation: Drop IA64 from feature descriptions kernel: Drop IA64 support from sig_fault handlers arch: Remove Itanium (IA-64) architecture
2 parents 4684e92 + 550087a commit 1e0c505

File tree

453 files changed

+142
-65219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+142
-65219
lines changed

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,6 @@ Description: Parameters for the CPU cache attributes
354354
- ReadWriteAllocate:
355355
both writeallocate and readallocate
356356

357-
attributes:
358-
LEGACY used only on IA64 and is same as write_policy
359-
360357
coherency_line_size:
361358
the minimum amount of data in bytes that gets
362359
transferred from memory to cache

Documentation/ABI/testing/sysfs-firmware-dmi-entries

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ What: /sys/firmware/dmi/entries/
22
Date: February 2011
33
Contact: Mike Waychison <mikew@google.com>
44
Description:
5-
Many machines' firmware (x86 and ia64) export DMI /
5+
Many machines' firmware (x86 and arm64) export DMI /
66
SMBIOS tables to the operating system. Getting at this
77
information is often valuable to userland, especially in
88
cases where there are OEM extensions used.

Documentation/admin-guide/kdump/kdump.rst

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can use common commands, such as cp, scp or makedumpfile to copy
1717
the memory image to a dump file on the local disk, or across the network
1818
to a remote system.
1919

20-
Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,
20+
Kdump and kexec are currently supported on the x86, x86_64, ppc64,
2121
s390x, arm and arm64 architectures.
2222

2323
When the system kernel boots, it reserves a small section of memory for
@@ -113,7 +113,7 @@ There are two possible methods of using Kdump.
113113
2) Or use the system kernel binary itself as dump-capture kernel and there is
114114
no need to build a separate dump-capture kernel. This is possible
115115
only with the architectures which support a relocatable kernel. As
116-
of today, i386, x86_64, ppc64, ia64, arm and arm64 architectures support
116+
of today, i386, x86_64, ppc64, arm and arm64 architectures support
117117
relocatable kernel.
118118

119119
Building a relocatable kernel is advantageous from the point of view that
@@ -236,24 +236,6 @@ Dump-capture kernel config options (Arch Dependent, ppc64)
236236

237237
Make and install the kernel and its modules.
238238

239-
Dump-capture kernel config options (Arch Dependent, ia64)
240-
----------------------------------------------------------
241-
242-
- No specific options are required to create a dump-capture kernel
243-
for ia64, other than those specified in the arch independent section
244-
above. This means that it is possible to use the system kernel
245-
as a dump-capture kernel if desired.
246-
247-
The crashkernel region can be automatically placed by the system
248-
kernel at runtime. This is done by specifying the base address as 0,
249-
or omitting it all together::
250-
251-
crashkernel=256M@0
252-
253-
or::
254-
255-
crashkernel=256M
256-
257239
Dump-capture kernel config options (Arch Dependent, arm)
258240
----------------------------------------------------------
259241

@@ -348,11 +330,6 @@ Boot into System Kernel
348330

349331
On ppc64, use "crashkernel=128M@32M".
350332

351-
On ia64, 256M@256M is a generous value that typically works.
352-
The region may be automatically placed on ia64, see the
353-
dump-capture kernel config option notes above.
354-
If use sparse memory, the size should be rounded to GRANULE boundaries.
355-
356333
On s390x, typically use "crashkernel=xxM". The value of xx is dependent
357334
on the memory consumption of the kdump system. In general this is not
358335
dependent on the memory size of the production system.
@@ -383,10 +360,6 @@ For ppc64:
383360

384361
- Use vmlinux
385362

386-
For ia64:
387-
388-
- Use vmlinux or vmlinuz.gz
389-
390363
For s390x:
391364

392365
- Use image or bzImage
@@ -428,14 +401,10 @@ to load dump-capture kernel::
428401
--initrd=<initrd-for-dump-capture-kernel> \
429402
--append="root=<root-dev> <arch-specific-options>"
430403

431-
Please note, that --args-linux does not need to be specified for ia64.
432-
It is planned to make this a no-op on that architecture, but for now
433-
it should be omitted
434-
435404
Following are the arch specific command line options to be used while
436405
loading dump-capture kernel.
437406

438-
For i386, x86_64 and ia64:
407+
For i386 and x86_64:
439408

440409
"1 irqpoll nr_cpus=1 reset_devices"
441410

Documentation/admin-guide/kdump/vmcoreinfo.rst

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -413,36 +413,6 @@ of a higher page table lookup overhead, and also consumes more page
413413
table space per process. Used to check whether PAE was enabled in the
414414
crash kernel when converting virtual addresses to physical addresses.
415415

416-
ia64
417-
====
418-
419-
pgdat_list|(pgdat_list, MAX_NUMNODES)
420-
-------------------------------------
421-
422-
pg_data_t array storing all NUMA nodes information. MAX_NUMNODES
423-
indicates the number of the nodes.
424-
425-
node_memblk|(node_memblk, NR_NODE_MEMBLKS)
426-
------------------------------------------
427-
428-
List of node memory chunks. Filled when parsing the SRAT table to obtain
429-
information about memory nodes. NR_NODE_MEMBLKS indicates the number of
430-
node memory chunks.
431-
432-
These values are used to compute the number of nodes the crashed kernel used.
433-
434-
node_memblk_s|(node_memblk_s, start_paddr)|(node_memblk_s, size)
435-
----------------------------------------------------------------
436-
437-
The size of a struct node_memblk_s and the offsets of the
438-
node_memblk_s's members. Used to compute the number of nodes.
439-
440-
PGTABLE_3|PGTABLE_4
441-
-------------------
442-
443-
User-space tools need to know whether the crash kernel was in 3-level or
444-
4-level paging mode. Used to distinguish the page table.
445-
446416
ARM64
447417
=====
448418

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@
14531453
See comment before function elanfreq_setup() in
14541454
arch/x86/kernel/cpu/cpufreq/elanfreq.c.
14551455

1456-
elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
1456+
elfcorehdr=[size[KMG]@]offset[KMG] [PPC,SH,X86,S390]
14571457
Specifies physical address of start of kernel core
14581458
image elf header and optionally the size. Generally
14591459
kexec loader will pass this option to capture kernel.
@@ -1516,12 +1516,6 @@
15161516
floppy= [HW]
15171517
See Documentation/admin-guide/blockdev/floppy.rst.
15181518

1519-
force_pal_cache_flush
1520-
[IA-64] Avoid check_sal_cache_flush which may hang on
1521-
buggy SAL_CACHE_FLUSH implementations. Using this
1522-
parameter will force ia64_sal_cache_flush to call
1523-
ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
1524-
15251519
forcepae [X86-32]
15261520
Forcefully enable Physical Address Extension (PAE).
15271521
Many Pentium M systems disable PAE but may have a

Documentation/admin-guide/mm/memory-hotplug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ used to expose persistent memory, other performance-differentiated memory and
3333
reserved memory regions as ordinary system RAM to Linux.
3434

3535
Linux only supports memory hot(un)plug on selected 64 bit architectures, such as
36-
x86_64, arm64, ppc64, s390x and ia64.
36+
x86_64, arm64, ppc64 and s390x.
3737

3838
Memory Hot(Un)Plug Granularity
3939
------------------------------

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ ignore-unaligned-usertrap
436436

437437
On architectures where unaligned accesses cause traps, and where this
438438
feature is supported (``CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN``;
439-
currently, ``arc``, ``ia64`` and ``loongarch``), controls whether all
439+
currently, ``arc`` and ``loongarch``), controls whether all
440440
unaligned traps are logged.
441441

442442
= =============================================================
@@ -445,10 +445,7 @@ unaligned traps are logged.
445445
setting.
446446
= =============================================================
447447

448-
See also `unaligned-trap`_ and `unaligned-dump-stack`_. On ``ia64``,
449-
this allows system administrators to override the
450-
``IA64_THREAD_UAC_NOPRINT`` ``prctl`` and avoid logs being flooded.
451-
448+
See also `unaligned-trap`_.
452449

453450
io_uring_disabled
454451
=================
@@ -1539,22 +1536,6 @@ See Documentation/admin-guide/kernel-parameters.rst and
15391536
Documentation/trace/boottime-trace.rst.
15401537

15411538

1542-
.. _unaligned-dump-stack:
1543-
1544-
unaligned-dump-stack (ia64)
1545-
===========================
1546-
1547-
When logging unaligned accesses, controls whether the stack is
1548-
dumped.
1549-
1550-
= ===================================================
1551-
0 Do not dump the stack. This is the default setting.
1552-
1 Dump the stack.
1553-
= ===================================================
1554-
1555-
See also `ignore-unaligned-usertrap`_.
1556-
1557-
15581539
unaligned-trap
15591540
==============
15601541

0 commit comments

Comments
 (0)