Skip to content

Commit 742c525

Browse files
David WoodhouseDavid Woodhouse
David Woodhouse
authored and
David Woodhouse
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: include/asm-arm/arch-omap/onenand.h
2 parents 36cd4fb + 10fec20 commit 742c525

File tree

4,043 files changed

+104798
-64409
lines changed

Some content is hidden

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

4,043 files changed

+104798
-64409
lines changed

‎Documentation/00-INDEX

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ cciss.txt
8989
- info, major/minor #'s for Compaq's SMART Array Controllers.
9090
cdrom/
9191
- directory with information on the CD-ROM drivers that Linux has.
92-
cli-sti-removal.txt
93-
- cli()/sti() removal guide.
9492
computone.txt
9593
- info on Computone Intelliport II/Plus Multiport Serial Driver.
9694
connector/

‎Documentation/DocBook/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
1212
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
1313
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
1414
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
15-
mac80211.xml debugobjects.xml
15+
mac80211.xml debugobjects.xml sh.xml
1616

1717
###
1818
# The build process is as follows (targets):

‎Documentation/DocBook/kgdb.tmpl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,24 @@
9898
"Kernel debugging" select "KGDB: kernel debugging with remote gdb".
9999
</para>
100100
<para>
101+
It is advised, but not required that you turn on the
102+
CONFIG_FRAME_POINTER kernel option. This option inserts code to
103+
into the compiled executable which saves the frame information in
104+
registers or on the stack at different points which will allow a
105+
debugger such as gdb to more accurately construct stack back traces
106+
while debugging the kernel.
107+
</para>
108+
<para>
109+
If the architecture that you are using supports the kernel option
110+
CONFIG_DEBUG_RODATA, you should consider turning it off. This
111+
option will prevent the use of software breakpoints because it
112+
marks certain regions of the kernel's memory space as read-only.
113+
If kgdb supports it for the architecture you are using, you can
114+
use hardware breakpoints if you desire to run with the
115+
CONFIG_DEBUG_RODATA option turned on, else you need to turn off
116+
this option.
117+
</para>
118+
<para>
101119
Next you should choose one of more I/O drivers to interconnect debugging
102120
host and debugged target. Early boot debugging requires a KGDB
103121
I/O driver that supports early debugging and the driver must be

‎Documentation/DocBook/s390-drivers.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
the hardware structures represented here, please consult the Principles
101101
of Operation.
102102
</para>
103-
!Iinclude/asm-s390/cio.h
103+
!Iarch/s390/include/asm/cio.h
104104
</sect1>
105105
<sect1 id="ccwdev">
106106
<title>ccw devices</title>
@@ -114,7 +114,7 @@
114114
ccw device structure. Device drivers must not bypass those functions
115115
or strange side effects may happen.
116116
</para>
117-
!Iinclude/asm-s390/ccwdev.h
117+
!Iarch/s390/include/asm/ccwdev.h
118118
!Edrivers/s390/cio/device.c
119119
!Edrivers/s390/cio/device_ops.c
120120
</sect1>
@@ -125,7 +125,7 @@
125125
measurement data which is made available by the channel subsystem
126126
for each channel attached device.
127127
</para>
128-
!Iinclude/asm-s390/cmb.h
128+
!Iarch/s390/include/asm/cmb.h
129129
!Edrivers/s390/cio/cmf.c
130130
</sect1>
131131
</chapter>
@@ -142,7 +142,7 @@
142142
</para>
143143
<sect1 id="ccwgroupdevices">
144144
<title>ccw group devices</title>
145-
!Iinclude/asm-s390/ccwgroup.h
145+
!Iarch/s390/include/asm/ccwgroup.h
146146
!Edrivers/s390/cio/ccwgroup.c
147147
</sect1>
148148
</chapter>

‎Documentation/DocBook/sh.tmpl

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
3+
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
4+
5+
<book id="sh-drivers">
6+
<bookinfo>
7+
<title>SuperH Interfaces Guide</title>
8+
9+
<authorgroup>
10+
<author>
11+
<firstname>Paul</firstname>
12+
<surname>Mundt</surname>
13+
<affiliation>
14+
<address>
15+
<email>lethal@linux-sh.org</email>
16+
</address>
17+
</affiliation>
18+
</author>
19+
</authorgroup>
20+
21+
<copyright>
22+
<year>2008</year>
23+
<holder>Paul Mundt</holder>
24+
</copyright>
25+
<copyright>
26+
<year>2008</year>
27+
<holder>Renesas Technology Corp.</holder>
28+
</copyright>
29+
30+
<legalnotice>
31+
<para>
32+
This documentation is free software; you can redistribute
33+
it and/or modify it under the terms of the GNU General Public
34+
License version 2 as published by the Free Software Foundation.
35+
</para>
36+
37+
<para>
38+
This program is distributed in the hope that it will be
39+
useful, but WITHOUT ANY WARRANTY; without even the implied
40+
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
41+
See the GNU General Public License for more details.
42+
</para>
43+
44+
<para>
45+
You should have received a copy of the GNU General Public
46+
License along with this program; if not, write to the Free
47+
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
48+
MA 02111-1307 USA
49+
</para>
50+
51+
<para>
52+
For more details see the file COPYING in the source
53+
distribution of Linux.
54+
</para>
55+
</legalnotice>
56+
</bookinfo>
57+
58+
<toc></toc>
59+
60+
<chapter id="mm">
61+
<title>Memory Management</title>
62+
<sect1 id="sh4">
63+
<title>SH-4</title>
64+
<sect2 id="sq">
65+
<title>Store Queue API</title>
66+
!Earch/sh/kernel/cpu/sh4/sq.c
67+
</sect2>
68+
</sect1>
69+
<sect1 id="sh5">
70+
<title>SH-5</title>
71+
<sect2 id="tlb">
72+
<title>TLB Interfaces</title>
73+
!Iarch/sh/mm/tlb-sh5.c
74+
!Iarch/sh/include/asm/tlb_64.h
75+
</sect2>
76+
</sect1>
77+
</chapter>
78+
<chapter id="clk">
79+
<title>Clock Framework Extensions</title>
80+
!Iarch/sh/include/asm/clock.h
81+
</chapter>
82+
<chapter id="mach">
83+
<title>Machine Specific Interfaces</title>
84+
<sect1 id="dreamcast">
85+
<title>mach-dreamcast</title>
86+
!Iarch/sh/boards/mach-dreamcast/rtc.c
87+
</sect1>
88+
<sect1 id="x3proto">
89+
<title>mach-x3proto</title>
90+
!Earch/sh/boards/mach-x3proto/ilsel.c
91+
</sect1>
92+
</chapter>
93+
<chapter id="busses">
94+
<title>Busses</title>
95+
<sect1 id="superhyway">
96+
<title>SuperHyway</title>
97+
!Edrivers/sh/superhyway/superhyway.c
98+
</sect1>
99+
100+
<sect1 id="maple">
101+
<title>Maple</title>
102+
!Edrivers/sh/maple/maple.c
103+
</sect1>
104+
</chapter>
105+
</book>

‎Documentation/DocBook/videobook.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb;
16481648

16491649
<chapter id="pubfunctions">
16501650
<title>Public Functions Provided</title>
1651-
!Edrivers/media/video/videodev.c
1651+
!Edrivers/media/video/v4l2-dev.c
16521652
</chapter>
16531653

16541654
</book>

‎Documentation/DocBook/z8530book.tmpl

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
device to be used as both a tty interface and as a synchronous
7070
controller is a project for Linux post the 2.4 release
7171
</para>
72-
<para>
73-
The support code handles most common card configurations and
74-
supports running both Cisco HDLC and Synchronous PPP. With extra
75-
glue the frame relay and X.25 protocols can also be used with this
76-
driver.
77-
</para>
7872
</chapter>
7973

8074
<chapter id="Driver_Modes">
@@ -179,35 +173,27 @@
179173
<para>
180174
If you wish to use the network interface facilities of the driver,
181175
then you need to attach a network device to each channel that is
182-
present and in use. In addition to use the SyncPPP and Cisco HDLC
176+
present and in use. In addition to use the generic HDLC
183177
you need to follow some additional plumbing rules. They may seem
184178
complex but a look at the example hostess_sv11 driver should
185179
reassure you.
186180
</para>
187181
<para>
188182
The network device used for each channel should be pointed to by
189-
the netdevice field of each channel. The dev-&gt; priv field of the
183+
the netdevice field of each channel. The hdlc-&gt; priv field of the
190184
network device points to your private data - you will need to be
191-
able to find your ppp device from this. In addition to use the
192-
sync ppp layer the private data must start with a void * pointer
193-
to the syncppp structures.
185+
able to find your private data from this.
194186
</para>
195187
<para>
196188
The way most drivers approach this particular problem is to
197189
create a structure holding the Z8530 device definition and
198-
put that and the syncppp pointer into the private field of
199-
the network device. The network device fields of the channels
200-
then point back to the network devices. The ppp_device can also
201-
be put in the private structure conveniently.
190+
put that into the private field of the network device. The
191+
network device fields of the channels then point back to the
192+
network devices.
202193
</para>
203194
<para>
204-
If you wish to use the synchronous ppp then you need to attach
205-
the syncppp layer to the network device. You should do this before
206-
you register the network device. The
207-
<function>sppp_attach</function> requires that the first void *
208-
pointer in your private data is pointing to an empty struct
209-
ppp_device. The function fills in the initial data for the
210-
ppp/hdlc layer.
195+
If you wish to use the generic HDLC then you need to register
196+
the HDLC device.
211197
</para>
212198
<para>
213199
Before you register your network device you will also need to
@@ -314,10 +300,10 @@
314300
buffer in sk_buff format and queues it for transmission. The
315301
caller must provide the entire packet with the exception of the
316302
bitstuffing and CRC. This is normally done by the caller via
317-
the syncppp interface layer. It returns 0 if the buffer has been
318-
queued and non zero values for queue full. If the function accepts
319-
the buffer it becomes property of the Z8530 layer and the caller
320-
should not free it.
303+
the generic HDLC interface layer. It returns 0 if the buffer has been
304+
queued and non zero values for queue full. If the function accepts
305+
the buffer it becomes property of the Z8530 layer and the caller
306+
should not free it.
321307
</para>
322308
<para>
323309
The function <function>z8530_get_stats</function> returns a pointer

‎Documentation/arm/IXP4xx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips:
3232
- Flash access (MTD/JFFS)
3333
- I2C through GPIO on IXP42x
3434
- GPIO for input/output/interrupts
35-
See include/asm-arm/arch-ixp4xx/platform.h for access functions.
35+
See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.
3636
- Timers (watchdog, OS)
3737

3838
The following components of the chips are not supported by Linux and

‎Documentation/arm/Interrupts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ So, what's changed?
158158
be re-checked for pending events. (see the Neponset IRQ handler for
159159
details).
160160

161-
7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h
161+
7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h
162162

163163
Please note that this will not solve all problems - some of them are
164164
hardware based. Mixing level-based and edge-based IRQs on the same

‎Documentation/arm/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Machine/Platform support
7979
To this end, we now have arch/arm/mach-$(MACHINE) directories which are
8080
designed to house the non-driver files for a particular machine (eg, PCI,
8181
memory management, architecture definitions etc). For all future
82-
machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)
82+
machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach
8383
directory.
8484

8585

@@ -176,7 +176,7 @@ Kernel entry (head.S)
176176
class typically based around one or more system on a chip devices, and
177177
acts as a natural container around the actual implementations. These
178178
classes are given directories - arch/arm/mach-<class> and
179-
include/asm-arm/arch-<class> - which contain the source files to
179+
arch/arm/mach-<class> - which contain the source files to/include/mach
180180
support the machine class. This directories also contain any machine
181181
specific supporting code.
182182

‎Documentation/arm/Samsung-S3C24XX/GPIO.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ Introduction
1616
Headers
1717
-------
1818

19-
See include/asm-arm/arch-s3c2410/regs-gpio.h for the list
19+
See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list
2020
of GPIO pins, and the configuration values for them. This
21-
is included by using #include <asm/arch/regs-gpio.h>
21+
is included by using #include <mach/regs-gpio.h>
2222

2323
The GPIO management functions are defined in the hardware
24-
header include/asm-arm/arch-s3c2410/hardware.h which can be
25-
included by #include <asm/arch/hardware.h>
24+
header arch/arm/mach-s3c2410/include/mach/hardware.h which can be
25+
included by #include <mach/hardware.h>
2626

2727
A useful amount of documentation can be found in the hardware
2828
header on how the GPIO functions (and others) work.

‎Documentation/arm/Samsung-S3C24XX/Overview.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Layout
3636
in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440
3737

3838
Register, kernel and platform data definitions are held in the
39-
include/asm-arm/arch-s3c2410 directory.
39+
arch/arm/mach-s3c2410 directory./include/mach
4040

4141

4242
Machines

‎Documentation/arm/Samsung-S3C24XX/USB-Host.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Board Support
4949
Platform Data
5050
-------------
5151

52-
See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
52+
See arch/arm/mach-s3c2410/include/mach/usb-control.h for the
5353
descriptions of the platform device data. An implementation
5454
can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .
5555

‎Documentation/cciss.txt

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,27 +112,18 @@ Hot plug support for SCSI tape drives
112112

113113
Hot plugging of SCSI tape drives is supported, with some caveats.
114114
The cciss driver must be informed that changes to the SCSI bus
115-
have been made, in addition to and prior to informing the SCSI
116-
mid layer. This may be done via the /proc filesystem. For example:
115+
have been made. This may be done via the /proc filesystem.
116+
For example:
117117

118118
echo "rescan" > /proc/scsi/cciss0/1
119119

120-
This causes the adapter to query the adapter about changes to the
121-
physical SCSI buses and/or fibre channel arbitrated loop and the
120+
This causes the driver to query the adapter about changes to the
121+
physical SCSI buses and/or fibre channel arbitrated loop and the
122122
driver to make note of any new or removed sequential access devices
123123
or medium changers. The driver will output messages indicating what
124124
devices have been added or removed and the controller, bus, target and
125-
lun used to address the device. Once this is done, the SCSI mid layer
126-
can be informed of changes to the virtual SCSI bus which the driver
127-
presents to it in the usual way. For example:
128-
129-
echo scsi add-single-device 3 2 1 0 > /proc/scsi/scsi
130-
131-
to add a device on controller 3, bus 2, target 1, lun 0. Note that
132-
the driver makes an effort to preserve the devices positions
133-
in the virtual SCSI bus, so if you are only moving tape drives
134-
around on the same adapter and not adding or removing tape drives
135-
from the adapter, informing the SCSI mid layer may not be necessary.
125+
lun used to address the device. It then notifies the SCSI mid layer
126+
of these changes.
136127

137128
Note that the naming convention of the /proc filesystem entries
138129
contains a number in addition to the driver name. (E.g. "cciss0"

0 commit comments

Comments
 (0)