Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

doc: fix wrong arch/i386 references

Change all "arch/i386" to "arch/x86" in Documentaion/,
since the directory has changed.

Also update the files which have changed their filename
in the meantime accordingly.

Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com>
[jkosina@suse.cz: reword changelog]
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Wanlong Gao and committed by
Jiri Kosina
25eb650a c443453c

+36 -36
+2 -2
Documentation/RCU/NMI-RCU.txt
··· 5 5 it is possible to use RCU to provide dynamic non-maskable interrupt 6 6 handlers, as well as dynamic irq handlers. This document describes 7 7 how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer 8 - work in "arch/i386/oprofile/nmi_timer_int.c" and in 9 - "arch/i386/kernel/traps.c". 8 + work in "arch/x86/oprofile/nmi_timer_int.c" and in 9 + "arch/x86/kernel/traps.c". 10 10 11 11 The relevant pieces of code are listed below, each followed by a 12 12 brief explanation.
+1 -1
Documentation/blockdev/README.DAC960
··· 214 214 make config 215 215 make bzImage (or zImage) 216 216 217 - Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your 217 + Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your 218 218 standard kernel, run lilo if appropriate, and reboot. 219 219 220 220 To create the necessary devices in /dev, the "make_rd" script included in
+4 -4
Documentation/blockdev/ramdisk.txt
··· 64 64 is not required. Bits 11 to 13 are not currently used and may as well be zero. 65 65 These numbers are no magical secrets, as seen below: 66 66 67 - ./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF 68 - ./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000 69 - ./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000 67 + ./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF 68 + ./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000 69 + ./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000 70 70 71 71 Consider a typical two floppy disk setup, where you will have the 72 72 kernel on disk one, and have already put a RAM disk image onto disk #2. ··· 85 85 Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word. 86 86 So to create disk one of the set, you would do: 87 87 88 - /usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0 88 + /usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0 89 89 /usr/src/linux# rdev /dev/fd0 /dev/fd0 90 90 /usr/src/linux# rdev -r /dev/fd0 49152 91 91
+1 -1
Documentation/cpu-freq/cpu-drivers.txt
··· 168 168 to policy->max, and -if supported- select a performance-oriented 169 169 setting when policy->policy is CPUFREQ_POLICY_PERFORMANCE, and a 170 170 powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check 171 - the reference implementation in arch/i386/kernel/cpu/cpufreq/longrun.c 171 + the reference implementation in drivers/cpufreq/longrun.c 172 172 173 173 174 174
+1 -1
Documentation/filesystems/nfs/nfsroot.txt
··· 226 226 cdrecord. 227 227 228 228 e.g. 229 - cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso 229 + cdrecord dev=ATAPI:1,0,0 arch/x86/boot/image.iso 230 230 231 231 For more information on isolinux, including how to create bootdisks 232 232 for prebuilt kernels, see http://syslinux.zytor.com/
+1 -1
Documentation/isdn/README.HiSax
··· 506 506 <ISDN subsystem - ISDN support -- HiSax> 507 507 make clean; make zImage; make modules; make modules_install 508 508 2. Install the new kernel 509 - cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn 509 + cp /usr/src/linux/arch/x86/boot/zImage /etc/kernel/linux.isdn 510 510 vi /etc/lilo.conf 511 511 <add new kernel in the bootable image section> 512 512 lilo
+19 -19
Documentation/kbuild/makefiles.txt
··· 441 441 specified if first option are not supported. 442 442 443 443 Example: 444 - #arch/i386/kernel/Makefile 444 + #arch/x86/kernel/Makefile 445 445 vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) 446 446 447 447 In the above example, vsyscall-flags will be assigned the option ··· 460 460 supported to use an optional second option. 461 461 462 462 Example: 463 - #arch/i386/Makefile 463 + #arch/x86/Makefile 464 464 cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586) 465 465 466 466 In the above example, cflags-y will be assigned the option ··· 522 522 even though the option was accepted by gcc. 523 523 524 524 Example: 525 - #arch/i386/Makefile 525 + #arch/x86/Makefile 526 526 cflags-y += $(shell \ 527 527 if [ $(call cc-version) -ge 0300 ] ; then \ 528 528 echo "-mregparm=3"; fi ;) ··· 802 802 is not sufficient this sometimes needs to be explicit. 803 803 804 804 Example: 805 - #arch/i386/boot/Makefile 805 + #arch/x86/boot/Makefile 806 806 subdir- := compressed/ 807 807 808 808 The above assignment instructs kbuild to descend down in the ··· 812 812 final bootimage there is an optional target named archclean: 813 813 814 814 Example: 815 - #arch/i386/Makefile 815 + #arch/x86/Makefile 816 816 archclean: 817 - $(Q)$(MAKE) $(clean)=arch/i386/boot 817 + $(Q)$(MAKE) $(clean)=arch/x86/boot 818 818 819 - When "make clean" is executed, make will descend down in arch/i386/boot, 820 - and clean as usual. The Makefile located in arch/i386/boot/ may use 819 + When "make clean" is executed, make will descend down in arch/x86/boot, 820 + and clean as usual. The Makefile located in arch/x86/boot/ may use 821 821 the subdir- trick to descend further down. 822 822 823 823 Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is ··· 882 882 LDFLAGS_vmlinux uses the LDFLAGS_$@ support. 883 883 884 884 Example: 885 - #arch/i386/Makefile 885 + #arch/x86/Makefile 886 886 LDFLAGS_vmlinux := -e stext 887 887 888 888 OBJCOPYFLAGS objcopy flags ··· 920 920 Often, the KBUILD_CFLAGS variable depends on the configuration. 921 921 922 922 Example: 923 - #arch/i386/Makefile 923 + #arch/x86/Makefile 924 924 cflags-$(CONFIG_M386) += -march=i386 925 925 KBUILD_CFLAGS += $(cflags-y) 926 926 927 927 Many arch Makefiles dynamically run the target C compiler to 928 928 probe supported options: 929 929 930 - #arch/i386/Makefile 930 + #arch/x86/Makefile 931 931 932 932 ... 933 933 cflags-$(CONFIG_MPENTIUMII) += $(call cc-option,\ ··· 1038 1038 into the arch/$(ARCH)/boot/Makefile. 1039 1039 1040 1040 Example: 1041 - #arch/i386/Makefile 1042 - boot := arch/i386/boot 1041 + #arch/x86/Makefile 1042 + boot := arch/x86/boot 1043 1043 bzImage: vmlinux 1044 1044 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 1045 1045 ··· 1051 1051 To support this, $(archhelp) must be defined. 1052 1052 1053 1053 Example: 1054 - #arch/i386/Makefile 1054 + #arch/x86/Makefile 1055 1055 define archhelp 1056 1056 echo '* bzImage - Image (arch/$(ARCH)/boot/bzImage)' 1057 1057 endif ··· 1065 1065 from vmlinux. 1066 1066 1067 1067 Example: 1068 - #arch/i386/Makefile 1068 + #arch/x86/Makefile 1069 1069 all: bzImage 1070 1070 1071 1071 When "make" is executed without arguments, bzImage will be built. ··· 1083 1083 2) kbuild knows what files to delete during "make clean" 1084 1084 1085 1085 Example: 1086 - #arch/i386/kernel/Makefile 1086 + #arch/x86/kernel/Makefile 1087 1087 extra-y := head.o init_task.o 1088 1088 1089 1089 In this example, extra-y is used to list object files that ··· 1133 1133 Compress target. Use maximum compression to compress target. 1134 1134 1135 1135 Example: 1136 - #arch/i386/boot/Makefile 1136 + #arch/x86/boot/Makefile 1137 1137 LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary 1138 1138 LDFLAGS_setup := -Ttext 0x0 -s --oformat binary -e begtext 1139 1139 ··· 1193 1193 1194 1194 When updating the $(obj)/bzImage target, the line 1195 1195 1196 - BUILD arch/i386/boot/bzImage 1196 + BUILD arch/x86/boot/bzImage 1197 1197 1198 1198 will be displayed with "make KBUILD_VERBOSE=0". 1199 1199 ··· 1207 1207 kbuild knows .lds files and includes a rule *lds.S -> *lds. 1208 1208 1209 1209 Example: 1210 - #arch/i386/kernel/Makefile 1210 + #arch/x86/kernel/Makefile 1211 1211 always := vmlinux.lds 1212 1212 1213 1213 #Makefile
+1 -1
Documentation/magic-number.txt
··· 66 66 RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h 67 67 SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h 68 68 HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c 69 - APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c 69 + APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c 70 70 CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h 71 71 DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c 72 72 DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c
+2 -2
Documentation/mca.txt
··· 11 11 12 12 The ideal MCA adapter detection is done through the use of the 13 13 Programmable Option Select registers. Generic functions for doing 14 - this have been added in include/linux/mca.h and arch/i386/kernel/mca.c. 14 + this have been added in include/linux/mca.h and arch/x86/kernel/mca_32.c. 15 15 Everything needed to detect adapters and read (and write) configuration 16 16 information is there. A number of MCA-specific drivers already use 17 17 this. The typical probe code looks like the following: ··· 81 81 In general, an interrupt must be acknowledged not only at the ICU (which 82 82 is done automagically by the kernel), but at the device level. In 83 83 particular, IRQ 0 must be reset after a timer interrupt (now done in 84 - arch/i386/kernel/time.c) or the first timer interrupt hangs the system. 84 + arch/x86/kernel/time.c) or the first timer interrupt hangs the system. 85 85 There were also problems with the 1.3.x floppy drivers, but that seems 86 86 to have been fixed. 87 87
+1 -1
Documentation/scheduler/sched-arch.txt
··· 66 66 barrier issued (followed by a test of need_resched with 67 67 interrupts disabled, as explained in 3). 68 68 69 - arch/i386/kernel/process.c has examples of both polling and 69 + arch/x86/kernel/process.c has examples of both polling and 70 70 sleeping idle functions. 71 71 72 72
+1 -1
Documentation/scsi/BusLogic.txt
··· 553 553 make config 554 554 make zImage 555 555 556 - Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if 556 + Then install "arch/x86/boot/zImage" as your standard kernel, run lilo if 557 557 appropriate, and reboot. 558 558 559 559
+1 -1
Documentation/serial/computone.txt
··· 87 87 edit /usr/src/linux/drivers/char/ip2.c 88 88 (Optional - may be specified on kernel command line now) 89 89 d) Run "make zImage" or whatever target you prefer. 90 - e) mv /usr/src/linux/arch/i386/boot/zImage to /boot. 90 + e) mv /usr/src/linux/arch/x86/boot/zImage to /boot. 91 91 f) Add new config for this kernel into /etc/lilo.conf, run "lilo" 92 92 or copy to a floppy disk and boot from that floppy disk. 93 93 g) Reboot using this kernel
+1 -1
Documentation/zh_CN/magic-number.txt
··· 66 66 RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h 67 67 SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h 68 68 HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c 69 - APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c 69 + APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c 70 70 CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h 71 71 DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c 72 72 DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c