Commit 1e0c505e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4684e928 550087a0

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

+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ Description: Parameters for the CPU cache attributes 
			- ReadWriteAllocate:

					both writeallocate and readallocate



		attributes:

			    LEGACY used only on IA64 and is same as write_policy



		coherency_line_size:

				     the minimum amount of data in bytes that gets

				     transferred from memory to cache

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ What: /sys/firmware/dmi/entries/ 
Date:		February 2011

Contact:	Mike Waychison <mikew@google.com>

Description:

		Many machines' firmware (x86 and ia64) export DMI /

		Many machines' firmware (x86 and arm64) export DMI /

		SMBIOS tables to the operating system.  Getting at this

		information is often valuable to userland, especially in

		cases where there are OEM extensions used.

Documentation/admin-guide/kdump/kdump.rst

+3 −34
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ You can use common commands, such as cp, scp or makedumpfile to copy 
the memory image to a dump file on the local disk, or across the network

to a remote system.



Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,

Kdump and kexec are currently supported on the x86, x86_64, ppc64,

s390x, arm and arm64 architectures.



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. 
2) Or use the system kernel binary itself as dump-capture kernel and there is

   no need to build a separate dump-capture kernel. This is possible

   only with the architectures which support a relocatable kernel. As

   of today, i386, x86_64, ppc64, ia64, arm and arm64 architectures support

   of today, i386, x86_64, ppc64, arm and arm64 architectures support

   relocatable kernel.



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


   Make and install the kernel and its modules.



Dump-capture kernel config options (Arch Dependent, ia64)

----------------------------------------------------------



- No specific options are required to create a dump-capture kernel

  for ia64, other than those specified in the arch independent section

  above. This means that it is possible to use the system kernel

  as a dump-capture kernel if desired.



  The crashkernel region can be automatically placed by the system

  kernel at runtime. This is done by specifying the base address as 0,

  or omitting it all together::



	crashkernel=256M@0



  or::



	crashkernel=256M



Dump-capture kernel config options (Arch Dependent, arm)

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


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



   On ia64, 256M@256M is a generous value that typically works.

   The region may be automatically placed on ia64, see the

   dump-capture kernel config option notes above.

   If use sparse memory, the size should be rounded to GRANULE boundaries.



   On s390x, typically use "crashkernel=xxM". The value of xx is dependent

   on the memory consumption of the kdump system. In general this is not

   dependent on the memory size of the production system.
@@ -383,10 +360,6 @@ For ppc64: 


	- Use vmlinux



For ia64:



	- Use vmlinux or vmlinuz.gz



For s390x:



	- Use image or bzImage
@@ -428,14 +401,10 @@ to load dump-capture kernel:: 
   --initrd=<initrd-for-dump-capture-kernel> \

   --append="root=<root-dev> <arch-specific-options>"



Please note, that --args-linux does not need to be specified for ia64.

It is planned to make this a no-op on that architecture, but for now

it should be omitted



Following are the arch specific command line options to be used while

loading dump-capture kernel.



For i386, x86_64 and ia64:

For i386 and x86_64:



	"1 irqpoll nr_cpus=1 reset_devices"

Documentation/admin-guide/kdump/vmcoreinfo.rst

+0 −30
Original line number Diff line number Diff line
@@ -413,36 +413,6 @@ of a higher page table lookup overhead, and also consumes more page 
table space per process. Used to check whether PAE was enabled in the

crash kernel when converting virtual addresses to physical addresses.



ia64

====



pgdat_list|(pgdat_list, MAX_NUMNODES)

-------------------------------------



pg_data_t array storing all NUMA nodes information. MAX_NUMNODES

indicates the number of the nodes.



node_memblk|(node_memblk, NR_NODE_MEMBLKS)

------------------------------------------



List of node memory chunks. Filled when parsing the SRAT table to obtain

information about memory nodes. NR_NODE_MEMBLKS indicates the number of

node memory chunks.



These values are used to compute the number of nodes the crashed kernel used.



node_memblk_s|(node_memblk_s, start_paddr)|(node_memblk_s, size)

----------------------------------------------------------------



The size of a struct node_memblk_s and the offsets of the

node_memblk_s's members. Used to compute the number of nodes.



PGTABLE_3|PGTABLE_4

-------------------



User-space tools need to know whether the crash kernel was in 3-level or

4-level paging mode. Used to distinguish the page table.



ARM64

=====

Documentation/admin-guide/kernel-parameters.txt

+1 −7
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ 
			See comment before function elanfreq_setup() in

			arch/x86/kernel/cpu/cpufreq/elanfreq.c.



	elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]

	elfcorehdr=[size[KMG]@]offset[KMG] [PPC,SH,X86,S390]

			Specifies physical address of start of kernel core

			image elf header and optionally the size. Generally

			kexec loader will pass this option to capture kernel.
@@ -1516,12 +1516,6 @@ 
	floppy=		[HW]

			See Documentation/admin-guide/blockdev/floppy.rst.



	force_pal_cache_flush

			[IA-64] Avoid check_sal_cache_flush which may hang on

			buggy SAL_CACHE_FLUSH implementations. Using this

			parameter will force ia64_sal_cache_flush to call

			ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.



	forcepae	[X86-32]

			Forcefully enable Physical Address Extension (PAE).

			Many Pentium M systems disable PAE but may have a