Commit d3ec4844 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
parents 0003230e df2e301f
...@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com> ...@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com>
Mark Brown <broonie@sirena.org.uk> Mark Brown <broonie@sirena.org.uk>
Matthieu CASTET <castet.matthieu@free.fr> Matthieu CASTET <castet.matthieu@free.fr>
Mayuresh Janorkar <mayur@ti.com> Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <mb@bu3sch.de> Michael Buesch <m@bues.ch>
Michael Buesch <mbuesch@freenet.de>
Michel Dänzer <michel@tungstengraphics.com> Michel Dänzer <michel@tungstengraphics.com>
Mitesh shah <mshah@teja.com> Mitesh shah <mshah@teja.com>
Morten Welinder <terra@gnome.org> Morten Welinder <terra@gnome.org>
......
...@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++) ...@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++)
<programlisting> <programlisting>
&v4l2-requestbuffers; reqbuf; &v4l2-requestbuffers; reqbuf;
/* Our current format uses 3 planes per buffer */ /* Our current format uses 3 planes per buffer */
#define FMT_NUM_PLANES = 3; #define FMT_NUM_PLANES = 3
struct { struct {
void *start[FMT_NUM_PLANES]; void *start[FMT_NUM_PLANES];
......
...@@ -5,8 +5,8 @@ Although RCU is usually used to protect read-mostly data structures, ...@@ -5,8 +5,8 @@ Although RCU is usually used to protect read-mostly data structures,
it is possible to use RCU to provide dynamic non-maskable interrupt it is possible to use RCU to provide dynamic non-maskable interrupt
handlers, as well as dynamic irq handlers. This document describes handlers, as well as dynamic irq handlers. This document describes
how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer
work in "arch/i386/oprofile/nmi_timer_int.c" and in work in "arch/x86/oprofile/nmi_timer_int.c" and in
"arch/i386/kernel/traps.c". "arch/x86/kernel/traps.c".
The relevant pieces of code are listed below, each followed by a The relevant pieces of code are listed below, each followed by a
brief explanation. brief explanation.
......
...@@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree: ...@@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
make config make config
make bzImage (or zImage) make bzImage (or zImage)
Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your
standard kernel, run lilo if appropriate, and reboot. standard kernel, run lilo if appropriate, and reboot.
To create the necessary devices in /dev, the "make_rd" script included in To create the necessary devices in /dev, the "make_rd" script included in
......
...@@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field ...@@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field
is not required. Bits 11 to 13 are not currently used and may as well be zero. is not required. Bits 11 to 13 are not currently used and may as well be zero.
These numbers are no magical secrets, as seen below: These numbers are no magical secrets, as seen below:
./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF ./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF
./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000 ./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000
./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000 ./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000
Consider a typical two floppy disk setup, where you will have the Consider a typical two floppy disk setup, where you will have the
kernel on disk one, and have already put a RAM disk image onto disk #2. kernel on disk one, and have already put a RAM disk image onto disk #2.
...@@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1" ...@@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1"
Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word. Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word.
So to create disk one of the set, you would do: So to create disk one of the set, you would do:
/usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0 /usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0
/usr/src/linux# rdev /dev/fd0 /dev/fd0 /usr/src/linux# rdev /dev/fd0 /dev/fd0
/usr/src/linux# rdev -r /dev/fd0 49152 /usr/src/linux# rdev -r /dev/fd0 49152
......
...@@ -168,7 +168,7 @@ in-chipset dynamic frequency switching to policy->min, the upper limit ...@@ -168,7 +168,7 @@ in-chipset dynamic frequency switching to policy->min, the upper limit
to policy->max, and -if supported- select a performance-oriented to policy->max, and -if supported- select a performance-oriented
setting when policy->policy is CPUFREQ_POLICY_PERFORMANCE, and a setting when policy->policy is CPUFREQ_POLICY_PERFORMANCE, and a
powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check
the reference implementation in arch/i386/kernel/cpu/cpufreq/longrun.c the reference implementation in drivers/cpufreq/longrun.c
......
File mode changed from 100755 to 100644
...@@ -199,7 +199,7 @@ Files: drivers/staging/cs5535_gpio/* ...@@ -199,7 +199,7 @@ Files: drivers/staging/cs5535_gpio/*
Check: drivers/staging/cs5535_gpio/cs5535_gpio.c Check: drivers/staging/cs5535_gpio/cs5535_gpio.c
Why: A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and Why: A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
integrates with the Linux GPIO subsystem. The old driver has been integrates with the Linux GPIO subsystem. The old driver has been
moved to staging, and will be removed altogether around 2.6.40. moved to staging, and will be removed altogether around 3.0.
Please test the new driver, and ensure that the functionality you Please test the new driver, and ensure that the functionality you
need and any bugfixes from the old driver are available in the new need and any bugfixes from the old driver are available in the new
one. one.
...@@ -294,7 +294,7 @@ When: The schedule was July 2008, but it was decided that we are going to keep t ...@@ -294,7 +294,7 @@ When: The schedule was July 2008, but it was decided that we are going to keep t
Why: The support code for the old firmware hurts code readability/maintainability Why: The support code for the old firmware hurts code readability/maintainability
and slightly hurts runtime performance. Bugfixes for the old firmware and slightly hurts runtime performance. Bugfixes for the old firmware
are not provided by Broadcom anymore. are not provided by Broadcom anymore.
Who: Michael Buesch <mb@bu3sch.de> Who: Michael Buesch <m@bues.ch>
--------------------------- ---------------------------
...@@ -430,7 +430,7 @@ Who: Avi Kivity <avi@redhat.com> ...@@ -430,7 +430,7 @@ Who: Avi Kivity <avi@redhat.com>
---------------------------- ----------------------------
What: iwlwifi 50XX module parameters What: iwlwifi 50XX module parameters
When: 2.6.40 When: 3.0
Why: The "..50" modules parameters were used to configure 5000 series and Why: The "..50" modules parameters were used to configure 5000 series and
up devices; different set of module parameters also available for 4965 up devices; different set of module parameters also available for 4965
with same functionalities. Consolidate both set into single place with same functionalities. Consolidate both set into single place
...@@ -441,7 +441,7 @@ Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> ...@@ -441,7 +441,7 @@ Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---------------------------- ----------------------------
What: iwl4965 alias support What: iwl4965 alias support
When: 2.6.40 When: 3.0
Why: Internal alias support has been present in module-init-tools for some Why: Internal alias support has been present in module-init-tools for some
time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
with no impact. with no impact.
...@@ -482,7 +482,7 @@ Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> ...@@ -482,7 +482,7 @@ Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---------------------------- ----------------------------
What: iwlwifi disable_hw_scan module parameters What: iwlwifi disable_hw_scan module parameters
When: 2.6.40 When: 3.0
Why: Hareware scan is the prefer method for iwlwifi devices for Why: Hareware scan is the prefer method for iwlwifi devices for
scanning operation. Remove software scan support for all the scanning operation. Remove software scan support for all the
iwlwifi devices. iwlwifi devices.
...@@ -493,7 +493,7 @@ Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> ...@@ -493,7 +493,7 @@ Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>
What: access to nfsd auth cache through sys_nfsservctl or '.' files What: access to nfsd auth cache through sys_nfsservctl or '.' files
in the 'nfsd' filesystem. in the 'nfsd' filesystem.
When: 2.6.40 When: 3.0
Why: This is a legacy interface which have been replaced by a more Why: This is a legacy interface which have been replaced by a more
dynamic cache. Continuing to maintain this interface is an dynamic cache. Continuing to maintain this interface is an
unnecessary burden. unnecessary burden.
...@@ -519,7 +519,7 @@ Files: net/netfilter/xt_connlimit.c ...@@ -519,7 +519,7 @@ Files: net/netfilter/xt_connlimit.c
---------------------------- ----------------------------
What: noswapaccount kernel command line parameter What: noswapaccount kernel command line parameter
When: 2.6.40 When: 3.0
Why: The original implementation of memsw feature enabled by Why: The original implementation of memsw feature enabled by
CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
kernel parameter (introduced in 2.6.29-rc1). Later on, this decision kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
...@@ -552,7 +552,7 @@ Who: Jean Delvare <khali@linux-fr.org> ...@@ -552,7 +552,7 @@ Who: Jean Delvare <khali@linux-fr.org>
---------------------------- ----------------------------
What: Support for UVCIOC_CTRL_ADD in the uvcvideo driver What: Support for UVCIOC_CTRL_ADD in the uvcvideo driver
When: 2.6.42 When: 3.2
Why: The information passed to the driver by this ioctl is now queried Why: The information passed to the driver by this ioctl is now queried
dynamically from the device. dynamically from the device.
Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
...@@ -560,7 +560,7 @@ Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> ...@@ -560,7 +560,7 @@ Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---------------------------- ----------------------------
What: Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver What: Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
When: 2.6.42 When: 3.2
Why: Used only by applications compiled against older driver versions. Why: Used only by applications compiled against older driver versions.
Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls. Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
...@@ -568,7 +568,7 @@ Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> ...@@ -568,7 +568,7 @@ Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---------------------------- ----------------------------
What: Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver What: Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
When: 2.6.42 When: 3.2
Why: Superseded by the UVCIOC_CTRL_QUERY ioctl. Why: Superseded by the UVCIOC_CTRL_QUERY ioctl.
Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
......
...@@ -226,7 +226,7 @@ They depend on various facilities being available: ...@@ -226,7 +226,7 @@ They depend on various facilities being available:
cdrecord. cdrecord.
e.g. e.g.
cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso cdrecord dev=ATAPI:1,0,0 arch/x86/boot/image.iso
For more information on isolinux, including how to create bootdisks For more information on isolinux, including how to create bootdisks
for prebuilt kernels, see http://syslinux.zytor.com/ for prebuilt kernels, see http://syslinux.zytor.com/
......
...@@ -110,7 +110,7 @@ V. Getting Logical Configuration Table ...@@ -110,7 +110,7 @@ V. Getting Logical Configuration Table
ENOBUFS Buffer not large enough. If this occurs, the required ENOBUFS Buffer not large enough. If this occurs, the required
buffer length is written into *(lct->reslen) buffer length is written into *(lct->reslen)
VI. Settting Parameters VI. Setting Parameters
SYNOPSIS SYNOPSIS
......
...@@ -506,7 +506,7 @@ to e.g. the Internet: ...@@ -506,7 +506,7 @@ to e.g. the Internet:
<ISDN subsystem - ISDN support -- HiSax> <ISDN subsystem - ISDN support -- HiSax>
make clean; make zImage; make modules; make modules_install make clean; make zImage; make modules; make modules_install
2. Install the new kernel 2. Install the new kernel
cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn cp /usr/src/linux/arch/x86/boot/zImage /etc/kernel/linux.isdn
vi /etc/lilo.conf vi /etc/lilo.conf
<add new kernel in the bootable image section> <add new kernel in the bootable image section>
lilo lilo
......
...@@ -441,7 +441,7 @@ more details, with real examples. ...@@ -441,7 +441,7 @@ more details, with real examples.
specified if first option are not supported. specified if first option are not supported.
Example: Example:
#arch/i386/kernel/Makefile #arch/x86/kernel/Makefile
vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
In the above example, vsyscall-flags will be assigned the option In the above example, vsyscall-flags will be assigned the option
...@@ -460,7 +460,7 @@ more details, with real examples. ...@@ -460,7 +460,7 @@ more details, with real examples.
supported to use an optional second option. supported to use an optional second option.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586) cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586)
In the above example, cflags-y will be assigned the option In the above example, cflags-y will be assigned the option
...@@ -522,7 +522,7 @@ more details, with real examples. ...@@ -522,7 +522,7 @@ more details, with real examples.
even though the option was accepted by gcc. even though the option was accepted by gcc.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
cflags-y += $(shell \ cflags-y += $(shell \
if [ $(call cc-version) -ge 0300 ] ; then \ if [ $(call cc-version) -ge 0300 ] ; then \
echo "-mregparm=3"; fi ;) echo "-mregparm=3"; fi ;)
...@@ -802,7 +802,7 @@ but in the architecture makefiles where the kbuild infrastructure ...@@ -802,7 +802,7 @@ but in the architecture makefiles where the kbuild infrastructure
is not sufficient this sometimes needs to be explicit. is not sufficient this sometimes needs to be explicit.
Example: Example:
#arch/i386/boot/Makefile #arch/x86/boot/Makefile
subdir- := compressed/ subdir- := compressed/
The above assignment instructs kbuild to descend down in the The above assignment instructs kbuild to descend down in the
...@@ -812,12 +812,12 @@ To support the clean infrastructure in the Makefiles that builds the ...@@ -812,12 +812,12 @@ To support the clean infrastructure in the Makefiles that builds the
final bootimage there is an optional target named archclean: final bootimage there is an optional target named archclean:
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
archclean: archclean:
$(Q)$(MAKE) $(clean)=arch/i386/boot $(Q)$(MAKE) $(clean)=arch/x86/boot
When "make clean" is executed, make will descend down in arch/i386/boot, When "make clean" is executed, make will descend down in arch/x86/boot,
and clean as usual. The Makefile located in arch/i386/boot/ may use and clean as usual. The Makefile located in arch/x86/boot/ may use
the subdir- trick to descend further down. the subdir- trick to descend further down.
Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is
...@@ -882,7 +882,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -882,7 +882,7 @@ When kbuild executes, the following steps are followed (roughly):
LDFLAGS_vmlinux uses the LDFLAGS_$@ support. LDFLAGS_vmlinux uses the LDFLAGS_$@ support.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
LDFLAGS_vmlinux := -e stext LDFLAGS_vmlinux := -e stext
OBJCOPYFLAGS objcopy flags OBJCOPYFLAGS objcopy flags
...@@ -920,14 +920,14 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -920,14 +920,14 @@ When kbuild executes, the following steps are followed (roughly):
Often, the KBUILD_CFLAGS variable depends on the configuration. Often, the KBUILD_CFLAGS variable depends on the configuration.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
cflags-$(CONFIG_M386) += -march=i386 cflags-$(CONFIG_M386) += -march=i386
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
Many arch Makefiles dynamically run the target C compiler to Many arch Makefiles dynamically run the target C compiler to
probe supported options: probe supported options:
#arch/i386/Makefile #arch/x86/Makefile
... ...
cflags-$(CONFIG_MPENTIUMII) += $(call cc-option,\ cflags-$(CONFIG_MPENTIUMII) += $(call cc-option,\
...@@ -1038,8 +1038,8 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1038,8 +1038,8 @@ When kbuild executes, the following steps are followed (roughly):
into the arch/$(ARCH)/boot/Makefile. into the arch/$(ARCH)/boot/Makefile.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
boot := arch/i386/boot boot := arch/x86/boot
bzImage: vmlinux bzImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
...@@ -1051,7 +1051,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1051,7 +1051,7 @@ When kbuild executes, the following steps are followed (roughly):
To support this, $(archhelp) must be defined. To support this, $(archhelp) must be defined.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
define archhelp define archhelp
echo '* bzImage - Image (arch/$(ARCH)/boot/bzImage)' echo '* bzImage - Image (arch/$(ARCH)/boot/bzImage)'
endif endif
...@@ -1065,7 +1065,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1065,7 +1065,7 @@ When kbuild executes, the following steps are followed (roughly):
from vmlinux. from vmlinux.
Example: Example:
#arch/i386/Makefile #arch/x86/Makefile
all: bzImage all: bzImage
When "make" is executed without arguments, bzImage will be built. When "make" is executed without arguments, bzImage will be built.
...@@ -1083,7 +1083,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1083,7 +1083,7 @@ When kbuild executes, the following steps are followed (roughly):
2) kbuild knows what files to delete during "make clean" 2) kbuild knows what files to delete during "make clean"
Example: Example:
#arch/i386/kernel/Makefile #arch/x86/kernel/Makefile
extra-y := head.o init_task.o extra-y := head.o init_task.o
In this example, extra-y is used to list object files that In this example, extra-y is used to list object files that
...@@ -1133,7 +1133,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1133,7 +1133,7 @@ When kbuild executes, the following steps are followed (roughly):
Compress target. Use maximum compression to compress target. Compress target. Use maximum compression to compress target.
Example: Example:
#arch/i386/boot/Makefile #arch/x86/boot/Makefile
LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
LDFLAGS_setup := -Ttext 0x0 -s --oformat binary -e begtext LDFLAGS_setup := -Ttext 0x0 -s --oformat binary -e begtext
...@@ -1193,7 +1193,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1193,7 +1193,7 @@ When kbuild executes, the following steps are followed (roughly):
When updating the $(obj)/bzImage target, the line When updating the $(obj)/bzImage target, the line
BUILD arch/i386/boot/bzImage BUILD arch/x86/boot/bzImage
will be displayed with "make KBUILD_VERBOSE=0". will be displayed with "make KBUILD_VERBOSE=0".
...@@ -1207,7 +1207,7 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1207,7 +1207,7 @@ When kbuild executes, the following steps are followed (roughly):
kbuild knows .lds files and includes a rule *lds.S -> *lds. kbuild knows .lds files and includes a rule *lds.S -> *lds.
Example: Example:
#arch/i386/kernel/Makefile #arch/x86/kernel/Makefile
always := vmlinux.lds always := vmlinux.lds
#Makefile #Makefile
......
...@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h ...@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h
SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h
HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c
CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h
DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c
DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c
......
...@@ -11,7 +11,7 @@ Adapter Detection ...@@ -11,7 +11,7 @@ Adapter Detection
The ideal MCA adapter detection is done through the use of the The ideal MCA adapter detection is done through the use of the
Programmable Option Select registers. Generic functions for doing Programmable Option Select registers. Generic functions for doing
this have been added in include/linux/mca.h and arch/i386/kernel/mca.c. this have been added in include/linux/mca.h and arch/x86/kernel/mca_32.c.
Everything needed to detect adapters and read (and write) configuration Everything needed to detect adapters and read (and write) configuration
information is there. A number of MCA-specific drivers already use information is there. A number of MCA-specific drivers already use
this. The typical probe code looks like the following: this. The typical probe code looks like the following:
...@@ -81,7 +81,7 @@ more people use shared IRQs on PCI machines. ...@@ -81,7 +81,7 @@ more people use shared IRQs on PCI machines.
In general, an interrupt must be acknowledged not only at the ICU (which In general, an interrupt must be acknowledged not only at the ICU (which
is done automagically by the kernel), but at the device level. In is done automagically by the kernel), but at the device level. In
particular, IRQ 0 must be reset after a timer interrupt (now done in particular, IRQ 0 must be reset after a timer interrupt (now done in
arch/i386/kernel/time.c) or the first timer interrupt hangs the system. arch/x86/kernel/time.c) or the first timer interrupt hangs the system.
There were also problems with the 1.3.x floppy drivers, but that seems There were also problems with the 1.3.x floppy drivers, but that seems
to have been fixed. to have been fixed.
......
...@@ -66,7 +66,7 @@ Your cpu_idle routines need to obey the following rules: ...@@ -66,7 +66,7 @@ Your cpu_idle routines need to obey the following rules:
barrier issued (followed by a test of need_resched with barrier issued (followed by a test of need_resched with
interrupts disabled, as explained in 3). interrupts disabled, as explained in 3).
arch/i386/kernel/process.c has examples of both polling and arch/x86/kernel/process.c has examples of both polling and
sleeping idle functions. sleeping idle functions.
......
...@@ -553,7 +553,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree: ...@@ -553,7 +553,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
make config make config
make zImage make zImage
Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if Then install "arch/x86/boot/zImage" as your standard kernel, run lilo if
appropriate, and reboot. appropriate, and reboot.
......
...@@ -87,7 +87,7 @@ c) Set address on ISA cards then: ...@@ -87,7 +87,7 @@ c) Set address on ISA cards then:
edit /usr/src/linux/drivers/char/ip2.c edit /usr/src/linux/drivers/char/ip2.c
(Optional - may be specified on kernel command line now) (Optional - may be specified on kernel command line now)
d) Run "make zImage" or whatever target you prefer. d) Run "make zImage" or whatever target you prefer.
e) mv /usr/src/linux/arch/i386/boot/zImage to /boot. e) mv /usr/src/linux/arch/x86/boot/zImage to /boot.
f) Add new config for this kernel into /etc/lilo.conf, run "lilo" f) Add new config for this kernel into /etc/lilo.conf, run "lilo"
or copy to a floppy disk and boot from that floppy disk. or copy to a floppy disk and boot from that floppy disk.
g) Reboot using this kernel g) Reboot using this kernel
......
...@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h ...@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h
SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h
HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c