From nobody Fri Sep 12 00:41:50 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 051DAC6379F for ; Wed, 15 Feb 2023 10:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233656AbjBOKAr (ORCPT ); Wed, 15 Feb 2023 05:00:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234103AbjBOKAk (ORCPT ); Wed, 15 Feb 2023 05:00:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 023F82BF16; Wed, 15 Feb 2023 02:00:36 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 913CCB820DC; Wed, 15 Feb 2023 10:00:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0145C433EF; Wed, 15 Feb 2023 10:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676455234; bh=IrU+aIiMDsCo/9t1tLwulF1zkfBra6cRuG3BYRBDIqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MrIiAPs+4a90XZeM0ZSgdleW2c38+wWs/QcXYna3jDVH9m0DS1ZHTP8iFGaon4BGS InVyWmJcO6iqQZiJaVW8cYFumNlSwUJy6mbzOG/hoSsF9K1Hp1+n5N9ssu7Tevtf9C O8yHKgUKmhdkQEwF2gtl+SQ2epBoqGT7r54CfXc2E7yVzsSCja5yGRKUleP34ml5ft oRp4jTSyS8jkClWZzvhQpLnJKFfLRcXJG3eJ7F3SAf51quDE05YYgT6Q9nHPvm1y2k S4GxDP2/ALIjVG/ijGFU0fP+eP5uUNn4bmmdu2OR7KsgOPoX02YMLpjlmdBBr9zDmR 4QC9g2eFrh4RA== From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Jonathan Corbet , Arnd Bergmann , Tony Luck , Jessica Clarke , John Paul Adrian Glaubitz , Matthew Wilcox , Marc Zyngier , Guenter Roeck , Linus Torvalds , linux-ia64@vger.kernel.org Subject: [RFC PATCH 5/5] Documentation: Drop or replace remaining mentions of IA64 Date: Wed, 15 Feb 2023 11:00:08 +0100 Message-Id: <20230215100008.2565237-6-ardb@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230215100008.2565237-1-ardb@kernel.org> References: <20230215100008.2565237-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=19813; i=ardb@kernel.org; h=from:subject; bh=IrU+aIiMDsCo/9t1tLwulF1zkfBra6cRuG3BYRBDIqE=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBj7K0Y84jWI6c3Bk0g7+Dh5fPkMAWQDub58u7Xc 680oqK+a/GJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCY+ytGAAKCRDDTyI5ktmP JHWKC/95HAuZfeaUZkYZhtjCQvq+ZkrTDq9MPPlM2DU4YhkQDW8PO5TjwW51seVyeHN/GWSMGDI NrNVGPaLYEW217XCdK6P3vAdYnf10/CGV6/8+5hsVfjDZ2IZ8vmVHXmMYeWmSGDogbDI8w+OFrf Wzxf33wiUDG3sVQ1Ad3paQ6kTAjdlhp45FACZfDbM1qiRCl1lkEaysYzf+6kwxbR05B3HWn9A4e FpOeC99uJcaV/gI332RYuHnSGg3l6n5fmasR3mO6xxUCaxGJYeO/374Cqs/eX1zpXKmlOZ5fC3f 3XVeyv94JM1HVuvXR04YdWggO8zggncsy5jVUl2/dpRinvmThAh3tR8gXRfV0kn3L9WDjC7K+bN fmC+5qyL3pSyMPEEEGxeJPwgkxg6OjPB5EqN7lDi6Hu1B/a/B7eGiusKWaOMLp+J3aE+e0XYrIj 17zjJpd/gJeG+f40GRqCL3j4HKNzNysfsggyK78sBOa0x3yxu5AiW00AyN/twhF0t0qoU= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drop or update mentions of IA64, as appropriate. Signed-off-by: Ard Biesheuvel --- Documentation/ABI/testing/sysfs-devices-system-cpu | 3 -- Documentation/ABI/testing/sysfs-firmware-dmi-entries | 2 +- Documentation/admin-guide/kdump/kdump.rst | 37 ++= ------------------ Documentation/admin-guide/kdump/vmcoreinfo.rst | 30 --= -------------- Documentation/admin-guide/kernel-parameters.txt | 8 +-= --- Documentation/admin-guide/mm/memory-hotplug.rst | 2 +- Documentation/admin-guide/sysctl/kernel.rst | 23 ++= ---------- Documentation/arch.rst | 1 - Documentation/block/ioprio.rst | 3 -- Documentation/core-api/debugging-via-ohci1394.rst | 6 ++= -- Documentation/kbuild/makefiles.rst | 2 +- Documentation/networking/device_drivers/ethernet/neterion/s2io.rst | 4 +-- Documentation/scheduler/sched-arch.rst | 4 +-- Documentation/trace/kprobes.rst | 1 - Documentation/translations/zh_CN/arch.rst | 1 - Documentation/translations/zh_CN/core-api/cpu_hotplug.rst | 6 --= -- Documentation/translations/zh_CN/scheduler/sched-arch.rst | 5 +-- Makefile | 4 +-- 18 files changed, 18 insertions(+), 124 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documenta= tion/ABI/testing/sysfs-devices-system-cpu index f54867cadb0f68a8..7fc70f8cd90ed4ec 100644 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu @@ -354,9 +354,6 @@ Description: Parameters for the CPU cache attributes - ReadWriteAllocate: both writeallocate and readallocate =20 - 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 diff --git a/Documentation/ABI/testing/sysfs-firmware-dmi-entries b/Documen= tation/ABI/testing/sysfs-firmware-dmi-entries index fe0289c877684958..b6c23807b8047405 100644 --- a/Documentation/ABI/testing/sysfs-firmware-dmi-entries +++ b/Documentation/ABI/testing/sysfs-firmware-dmi-entries @@ -2,7 +2,7 @@ What: /sys/firmware/dmi/entries/ Date: February 2011 Contact: Mike Waychison 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. diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admi= n-guide/kdump/kdump.rst index a748e7eb4429b886..5762e7477a0c8edb 100644 --- a/Documentation/admin-guide/kdump/kdump.rst +++ b/Documentation/admin-guide/kdump/kdump.rst @@ -17,7 +17,7 @@ You can use common commands, such as cp, scp or makedumpf= ile to copy the memory image to a dump file on the local disk, or across the network to a remote system. =20 -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. =20 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. =20 Building a relocatable kernel is advantageous from the point of view that @@ -236,24 +236,6 @@ Dump-capture kernel config options (Arch Dependent, pp= c64) =20 Make and install the kernel and its modules. =20 -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=3D256M@0 - - or:: - - crashkernel=3D256M - Dump-capture kernel config options (Arch Dependent, arm) ---------------------------------------------------------- =20 @@ -348,11 +330,6 @@ Boot into System Kernel =20 On ppc64, use "crashkernel=3D128M@32M". =20 - 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=3DxxM". The value of xx is depende= nt 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: =20 - Use vmlinux =20 -For ia64: - - - Use vmlinux or vmlinuz.gz - For s390x: =20 - Use image or bzImage @@ -428,14 +401,10 @@ to load dump-capture kernel:: --initrd=3D \ --append=3D"root=3D " =20 -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. =20 -For i386, x86_64 and ia64: +For i386 and x86_64: =20 "1 irqpoll nr_cpus=3D1 reset_devices" =20 diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation= /admin-guide/kdump/vmcoreinfo.rst index 86fd884928700bd0..54f3971340ad1459 100644 --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst @@ -419,36 +419,6 @@ of a higher page table lookup overhead, and also consu= mes more page table space per process. Used to check whether PAE was enabled in the crash kernel when converting virtual addresses to physical addresses. =20 -ia64 -=3D=3D=3D=3D - -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 us= ed. - -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 =3D=3D=3D=3D=3D =20 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 6cfa6e3996cf75ee..d0e67c70ba90bce6 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1443,7 +1443,7 @@ See comment before function elanfreq_setup() in arch/x86/kernel/cpu/cpufreq/elanfreq.c. =20 - elfcorehdr=3D[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390] + elfcorehdr=3D[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. @@ -1506,12 +1506,6 @@ floppy=3D [HW] See Documentation/admin-guide/blockdev/floppy.rst. =20 - 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 diff --git a/Documentation/admin-guide/mm/memory-hotplug.rst b/Documentatio= n/admin-guide/mm/memory-hotplug.rst index a3c9e8ad8fa0d83f..09128f1a29001124 100644 --- a/Documentation/admin-guide/mm/memory-hotplug.rst +++ b/Documentation/admin-guide/mm/memory-hotplug.rst @@ -35,7 +35,7 @@ used to expose persistent memory, other performance-diffe= rentiated memory and reserved memory regions as ordinary system RAM to Linux. =20 Linux only supports memory hot(un)plug on selected 64 bit architectures, s= uch as -x86_64, arm64, ppc64, s390x and ia64. +x86_64, arm64, ppc64 and s390x. =20 Memory Hot(Un)Plug Granularity ------------------------------ diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/ad= min-guide/sysctl/kernel.rst index 46e3d62c0eea84d1..bf8efef45b1d5d7a 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -436,7 +436,7 @@ ignore-unaligned-usertrap =20 On architectures where unaligned accesses cause traps, and where this feature is supported (``CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN``; -currently, ``arc``, ``ia64`` and ``loongarch``), controls whether all +currently, ``arc`` and ``loongarch``), controls whether all unaligned traps are logged. =20 =3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -445,10 +445,7 @@ unaligned traps are logged. setting. =3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -See also `unaligned-trap`_ and `unaligned-dump-stack`_. On ``ia64``, -this allows system administrators to override the -``IA64_THREAD_UAC_NOPRINT`` ``prctl`` and avoid logs being flooded. - +See also `unaligned-trap`_. =20 kexec_load_disabled =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -1471,22 +1468,6 @@ See Documentation/admin-guide/kernel-parameters.rst = and Documentation/trace/boottime-trace.rst. =20 =20 -.. _unaligned-dump-stack: - -unaligned-dump-stack (ia64) -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D - -When logging unaligned accesses, controls whether the stack is -dumped. - -=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D -0 Do not dump the stack. This is the default setting. -1 Dump the stack. -=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D - -See also `ignore-unaligned-usertrap`_. - - unaligned-trap =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/Documentation/arch.rst b/Documentation/arch.rst index 41a66a8b38e42479..3f9962e45c098c62 100644 --- a/Documentation/arch.rst +++ b/Documentation/arch.rst @@ -12,7 +12,6 @@ implementation. arc/index arm/index arm64/index - ia64/index loongarch/index m68k/index mips/index diff --git a/Documentation/block/ioprio.rst b/Documentation/block/ioprio.rst index f72b0de65af731f1..a25c6d5df87b20ff 100644 --- a/Documentation/block/ioprio.rst +++ b/Documentation/block/ioprio.rst @@ -80,9 +80,6 @@ ionice.c tool:: #elif defined(__x86_64__) #define __NR_ioprio_set 251 #define __NR_ioprio_get 252 - #elif defined(__ia64__) - #define __NR_ioprio_set 1274 - #define __NR_ioprio_get 1275 #else #error "Unsupported arch" #endif diff --git a/Documentation/core-api/debugging-via-ohci1394.rst b/Documentat= ion/core-api/debugging-via-ohci1394.rst index 981ad4f89fd3e445..cb3d3228dfc8449b 100644 --- a/Documentation/core-api/debugging-via-ohci1394.rst +++ b/Documentation/core-api/debugging-via-ohci1394.rst @@ -23,9 +23,9 @@ Retrieving a full system memory dump is also possible ove= r the FireWire, using data transfer rates in the order of 10MB/s or more. =20 With most FireWire controllers, memory access is limited to the low 4 GB -of physical address space. This can be a problem on IA64 machines where -memory is located mostly above that limit, but it is rarely a problem on -more common hardware such as x86, x86-64 and PowerPC. +of physical address space. This can be a problem on machines where memory= is +located mostly above that limit, but it is rarely a problem on more common +hardware such as x86, x86-64 and PowerPC. =20 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/make= files.rst index 38bc74eaa5474039..9ca798a51a2d0e7b 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -114,7 +114,7 @@ knowledge about the kernel Makefiles, plus detailed kno= wledge about the public interface for kbuild. =20 *Arch developers* are people who work on an entire architecture, such -as sparc or ia64. Arch developers need to know about the arch Makefile +as sparc or x86. Arch developers need to know about the arch Makefile as well as kbuild Makefiles. =20 *Kbuild developers* are people who work on the kernel build system itself. diff --git a/Documentation/networking/device_drivers/ethernet/neterion/s2io= .rst b/Documentation/networking/device_drivers/ethernet/neterion/s2io.rst index c5673ec4559ba733..d731b5a985611f89 100644 --- a/Documentation/networking/device_drivers/ethernet/neterion/s2io.rst +++ b/Documentation/networking/device_drivers/ethernet/neterion/s2io.rst @@ -64,8 +64,8 @@ c. Multi-buffer receive mode. Scattering of packet across= multiple IBM xSeries). =20 d. MSI/MSI-X. Can be enabled on platforms which support this feature - (IA64, Xeon) resulting in noticeable performance improvement(up to 7% - on certain platforms). + resulting in noticeable performance improvement (up to 7% on certain + platforms). =20 e. Statistics. Comprehensive MAC-level and software statistics displayed using "ethtool -S" option. diff --git a/Documentation/scheduler/sched-arch.rst b/Documentation/schedul= er/sched-arch.rst index 0eaec669790a006c..f2c23769d4fbfa9e 100644 --- a/Documentation/scheduler/sched-arch.rst +++ b/Documentation/scheduler/sched-arch.rst @@ -10,7 +10,7 @@ Context switch By default, the switch_to arch function is called with the runqueue locked. This is usually not a problem unless switch_to may need to take the runqueue lock. This is usually due to a wake up operation in -the context switch. See arch/ia64/include/asm/switch_to.h for an example. +the context switch. =20 To request the scheduler call switch_to with the runqueue unlocked, you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file @@ -68,8 +68,6 @@ Possible arch/ problems =20 Possible arch problems I found (and either tried to fix or didn't): =20 -ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a) - sh64 - Is sleeping racy vs interrupts? (See #4a) =20 sparc - IRQs on at this point(?), change local_irq_save to _disable. diff --git a/Documentation/trace/kprobes.rst b/Documentation/trace/kprobes.= rst index fc7ce76eab655c01..f825970a14957346 100644 --- a/Documentation/trace/kprobes.rst +++ b/Documentation/trace/kprobes.rst @@ -315,7 +315,6 @@ architectures: - i386 (Supports jump optimization) - x86_64 (AMD-64, EM64T) (Supports jump optimization) - ppc64 -- ia64 (Does not support probes on instruction slot1.) - sparc64 (Return probes not yet implemented.) - arm - ppc diff --git a/Documentation/translations/zh_CN/arch.rst b/Documentation/tran= slations/zh_CN/arch.rst index 690e173d8b2a83cc..ae7014476cc7677a 100644 --- a/Documentation/translations/zh_CN/arch.rst +++ b/Documentation/translations/zh_CN/arch.rst @@ -18,7 +18,6 @@ TODOList: =20 * arm/index -* ia64/index * m68k/index * nios2/index * powerpc/index diff --git a/Documentation/translations/zh_CN/core-api/cpu_hotplug.rst b/Do= cumentation/translations/zh_CN/core-api/cpu_hotplug.rst index 4772a900c37a048c..bc0d7ea6d834cc22 100644 --- a/Documentation/translations/zh_CN/core-api/cpu_hotplug.rst +++ b/Documentation/translations/zh_CN/core-api/cpu_hotplug.rst @@ -49,12 +49,6 @@ CPU=E7=83=AD=E6=8B=94=E6=8F=92=E6=94=AF=E6=8C=81=E7=9A= =84=E4=B8=80=E4=B8=AA=E6=9B=B4=E6=96=B0=E9=A2=96=E7=9A=84=E7=94=A8=E9=80=94= =E6=98=AF=E5=AE=83=E5=9C=A8SMP=E7=9A=84=E6=9A=82=E5=81=9C=E6=81=A2=E5=A4=8D= =E6=94=AF=E6=8C=81 =E9=99=90=E5=88=B6=E5=86=85=E6=A0=B8=E5=B0=86=E6=94=AF=E6=8C=81=E7=9A=84= CPU=E6=80=BB=E9=87=8F=E3=80=82=E5=A6=82=E6=9E=9C=E8=BF=99=E9=87=8C=E6=8F=90= =E4=BE=9B=E7=9A=84=E6=95=B0=E9=87=8F=E4=BD=8E=E4=BA=8E=E5=AE=9E=E9=99=85=E5= =8F=AF=E7=94=A8=E7=9A=84CPU=E6=95=B0=E9=87=8F=EF=BC=8C=E9=82=A3=E4=B9=88=E5= =85=B6=E4=BB=96CPU =E4=BB=A5=E5=90=8E=E5=B0=B1=E4=B8=8D=E8=83=BD=E4=B8=8A=E7=BA=BF=E4=BA=86= =E3=80=82 =20 -``additional_cpus=3Dn`` - =E4=BD=BF=E7=94=A8=E5=AE=83=E6=9D=A5=E9=99=90=E5=88=B6=E5=8F=AF=E7=83=AD= =E6=8F=92=E6=8B=94=E7=9A=84CPU=E3=80=82=E8=AF=A5=E9=80=89=E9=A1=B9=E8=AE=BE= =E7=BD=AE - ``cpu_possible_mask =3D cpu_present_mask + additional_cpus`` - - =E8=BF=99=E4=B8=AA=E9=80=89=E9=A1=B9=E5=8F=AA=E9=99=90=E4=BA=8EIA64=E6= =9E=B6=E6=9E=84=E3=80=82 - ``possible_cpus=3Dn`` =E8=BF=99=E4=B8=AA=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE ``cpu_possible_ma= sk`` =E4=B8=AD=E7=9A=84 ``possible_cpus`` =E4=BD=8D=E3=80=82 =20 diff --git a/Documentation/translations/zh_CN/scheduler/sched-arch.rst b/Do= cumentation/translations/zh_CN/scheduler/sched-arch.rst index 754a15c6b60f3a1e..de41b028b2b0245c 100644 --- a/Documentation/translations/zh_CN/scheduler/sched-arch.rst +++ b/Documentation/translations/zh_CN/scheduler/sched-arch.rst @@ -20,8 +20,7 @@ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 1. =E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E9=94=81 =E9=BB=98=E8=AE=A4=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8Cswitch_to arch=E5=87= =BD=E6=95=B0=E5=9C=A8=E8=B0=83=E7=94=A8=E6=97=B6=E9=94=81=E5=AE=9A=E4=BA=86= =E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E3=80=82=E8=BF=99=E9=80=9A=E5=B8=B8=E4= =B8=8D=E6=98=AF=E4=B8=80=E4=B8=AA=E9=97=AE=E9=A2=98=EF=BC=8C=E9=99=A4=E9=9D= =9E -switch_to=E5=8F=AF=E8=83=BD=E9=9C=80=E8=A6=81=E8=8E=B7=E5=8F=96=E8=BF=90= =E8=A1=8C=E9=98=9F=E5=88=97=E9=94=81=E3=80=82=E8=BF=99=E9=80=9A=E5=B8=B8=E6= =98=AF=E7=94=B1=E4=BA=8E=E4=B8=8A=E4=B8=8B=E6=96=87=E5=88=87=E6=8D=A2=E4=B8= =AD=E7=9A=84=E5=94=A4=E9=86=92=E6=93=8D=E4=BD=9C=E9=80=A0=E6=88=90=E7=9A=84= =E3=80=82=E8=A7=81 -arch/ia64/include/asm/switch_to.h=E7=9A=84=E4=BE=8B=E5=AD=90=E3=80=82 +switch_to=E5=8F=AF=E8=83=BD=E9=9C=80=E8=A6=81=E8=8E=B7=E5=8F=96=E8=BF=90= =E8=A1=8C=E9=98=9F=E5=88=97=E9=94=81=E3=80=82=E8=BF=99=E9=80=9A=E5=B8=B8=E6= =98=AF=E7=94=B1=E4=BA=8E=E4=B8=8A=E4=B8=8B=E6=96=87=E5=88=87=E6=8D=A2=E4=B8= =AD=E7=9A=84=E5=94=A4=E9=86=92=E6=93=8D=E4=BD=9C=E9=80=A0=E6=88=90=E7=9A=84= =E3=80=82 =20 =E4=B8=BA=E4=BA=86=E8=A6=81=E6=B1=82=E8=B0=83=E5=BA=A6=E5=99=A8=E5=9C=A8= =E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E8=A7=A3=E9=94=81=E7=9A=84=E6=83=85=E5= =86=B5=E4=B8=8B=E8=B0=83=E7=94=A8switch_to=EF=BC=8C=E4=BD=A0=E5=BF=85=E9=A1= =BB=E5=9C=A8=E5=A4=B4=E6=96=87=E4=BB=B6 =E4=B8=AD`#define __ARCH_WANT_UNLOCKED_CTXSW`(=E9=80=9A=E5=B8=B8=E6=98=AF= =E5=AE=9A=E4=B9=89switch_to=E7=9A=84=E9=82=A3=E4=B8=AA=E6=96=87=E4=BB=B6=EF= =BC=89=E3=80=82 @@ -68,8 +67,6 @@ arch/x86/kernel/process.c=E6=9C=89=E8=BD=AE=E8=AF=A2=E5= =92=8C=E7=9D=A1=E7=9C=A0=E7=A9=BA=E9=97=B2=E5=87=BD=E6=95=B0=E7=9A=84=E4=BE= =8B=E5=AD=90=E3=80=82 =20 =E6=88=91=E5=8F=91=E7=8E=B0=E7=9A=84=E5=8F=AF=E8=83=BD=E7=9A=84arch=E9=97= =AE=E9=A2=98=EF=BC=88=E5=B9=B6=E8=AF=95=E5=9B=BE=E8=A7=A3=E5=86=B3=E6=88=96= =E6=B2=A1=E6=9C=89=E8=A7=A3=E5=86=B3=EF=BC=89=E3=80=82: =20 -ia64 - safe_halt=E7=9A=84=E8=B0=83=E7=94=A8=E4=B8=8E=E4=B8=AD=E6=96=AD=E7= =9B=B8=E6=AF=94=EF=BC=8C=E6=98=AF=E5=90=A6=E5=BE=88=E8=8D=92=E8=B0=AC=EF=BC= =9F (=E5=AE=83=E7=9D=A1=E7=9C=A0=E4=BA=86=E5=90=97) (=E5=8F=82=E8=80=83 #4a) - sh64 - =E7=9D=A1=E7=9C=A0=E4=B8=8E=E4=B8=AD=E6=96=AD=E7=9B=B8=E6=AF=94=EF= =BC=8C=E6=98=AF=E5=90=A6=E5=BE=88=E8=8D=92=E8=B0=AC=EF=BC=9F (=E5=8F=82=E8= =80=83 #4a) =20 sparc - =E5=9C=A8=E8=BF=99=E4=B8=80=E7=82=B9=E4=B8=8A=EF=BC=8CIRQ=E6=98=AF= =E5=BC=80=E7=9D=80=E7=9A=84=EF=BC=88=EF=BC=9F=EF=BC=89=EF=BC=8C=E6=8A=8Aloc= al_irq_save=E6=94=B9=E4=B8=BA_disable=E3=80=82 diff --git a/Makefile b/Makefile index 716a975730a68e3a..ddae1033f4bc64c8 100644 --- a/Makefile +++ b/Makefile @@ -392,7 +392,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: -# make ARCH=3Dia64 +# make ARCH=3Darm64 # Another way is to have ARCH set in the environment. # The default ARCH is the host where make is executed. =20 @@ -400,7 +400,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 -# make CROSS_COMPILE=3Dia64-linux- +# make CROSS_COMPILE=3Daarch64-linux-gnu- # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile --=20 2.39.1