This is mostly so people can see what I have merged in my tree and what
has gone from it. The patch for the adventurous is in
ftp://ftp.kernel.org/pub/linux/kernel/people/alan/2.4.0test/..
2.4.0test13pre3-ac1 adds
o Handle TLB flush reruns caused by APIC rexmit (me)
o Fix leak in link() syscall (Al Viro)
o Fix ramfs deadlock (Al Viro)
o Fix udf deadlock (Al Viro)
o Improve parport docs (Tim Waugh)
o Document some of the macros (Tim Waugh)
o Fix ppa timing issues (Tim Waugh)
o Mark the parport fifo code as experimental (Tim Waugh)
o Resynch ppa changelog (Tim Waugh)
| Tim please double check as I got offsets
o Fix Yam driver for Linux 2.4test (Hans Grobler)
o Fix AF_ROSE sockets for 2.4 (Hans Grobler)
o Fix AF_NETROM sockets for 2.4 (Hans Grobler)
o Tidy AF_AX25 sockets for 2.4 (Hans Grobler)
o Teach kernel-doc about const (Jani Monoses)
o Add documentation to the PCI api (Jani Monoses)
o Fix inode.c documentation (Jani Monoses)
o Push Davicom support into the main tulip driver (Tobias Ringstrom)
o First block of mkiss driver fixes (Hans Grobler)
o Fix bug in VFAT short name handling (Nicolas Goutte)
o Clean up the i810 driver (Tjeerd Mulder)
o RCPCI45 PCI cleanup fixes (mark 2) (Rasmus Andersen)
o Improve the ALSxxx sound driver documentation (Jonathan Woithe)
o Fix ext2 modular build (Jeff Raubitschek)
o Fix bug in scripts/Configure.in matching (Matthew Wilcox)
o Revert accidental amifb change (Geert Uytterhoeven)
o Fix ext2 file size limiting for large files (Andreas Dilger)
o Clean up misleading indenting in partition code (JAmes Antill)
o Update SiS video drivers (Can-Ru Yeou)
o Yamaha audio doc fix (Pavel Roskin)
o Fix ACPI driver wakeup races (David Woodhouse)
o Remove bogus asserts in 8139too driver (Jeff Garzik)
o Fix timeout problms with rocktports at 249 days
o Update acenic patches (Jes Sorensen)
o Fix i810 tco locking (me)
o Fix media makefiles (me)
o Fix drm makefiles (Peter Samuelson)
2.4.0test12-ac1 adds
o ARM bootup/initd fixes (Russell King)
o Fix ymf_sb setup bug (Pavel Roskin)
o Correctly print names of md10+ (me)
[Based on code from Roberto Ragusa]
o Fix sound crashes in various drivers (Tjeerd Mulder)
o Update epic100 to new pci api (Francois Romieu)
o Fix IOC/SIOC ioctl problems in ac97 code (Dick Streefland)
To merge
o Fix Ruffian Alpha boot (Ivan Kokshaysky)
o Bridge handling patches needed for Alpha (Ivan Kokshaysky /
Richard Henderson)
o FPU emulator source set for m68k (Geert Uytterhoeven)
o Fix m68k build with rmw disabled (Geert Uytterhoeven)
o Cleanup ramdisk namespace (Jeff Garzik)
o Link correctly with ACPI on ACPI_INTERPRETER off
o Ramdisk missing blkdev_put
o Acenic update
o Epic100 update
o Support mixed pnp and legacy sb cards
o Hopefully fix the bugs in the FAT and HPFS file systems that
caused fs corruption
o Fix cramfs vanishing data bug
o Fix NLS config.in bug for SMB
o Power management locking fixes
o filemap posix compliance fix
o Fix pte handling race
o Remove unneeded inits to 0 in ide code (Bartlomiej Zolnierkiewicz)
o IDE documentation fixes (Bartlomiej Zolnierkiewicz)
Submitted to Linus
o Add firestream ATM driver (Patrick van de Lageweg)
o Add the powermac extras to the input and (Franz Sirl)
keyboard drivers
o Fix reference counting in ATM (Patrick van de Lageweg)
o Update Changes to give correct modutils rev (Steven Cole)
o Fix xconfig/menuconfig problems with config (Andrzej Krzysztofowicz)
scripts in 2.4test
o Fix kd_mksound declaration (Geert Uytterhoeven)
o Fix warning in sim710 driver (Pavel Rabel)
o Merge bttv 0.7.50 (Gerd Knorr)
o Clean it up to use pci_pci_quirks properly (me)
o SMC token ring driver update (Jay Schulist)
o Support kgcc autodetect
o Rusty's fixes/review of unsafe set_bit usage
(A few left to go)
o I2C bus driver updates (Frodo Looijaard)
o Fix pcmcia ordering on socket remove (David Woodhouse)
o Update USB documentation (Greg Kroah-Hartmann)
o Tidy the tachyon 5526 driver (Rasmus Andersen)
o Clean old old compile time config stuff from (Pavel Rabel)
mad16 driver
o Tidy riscom8 and sx namespace (Jeff Garzik)
o Rename block_til_ready in generic_serial (Patrick van de Lageweg)
Merged by Linus from -ac or direct
o Add clocking option to maestro (broken laptop (me)
stuff again)
o Put back the module locking in soundcore (David Schleef)
that someone disabled
o Abyss driver cleanup (Jeff Garzik)
o Fix most of the tq changes (Mohammad A. Haque)
o DOC1000 driver fixes (David Woodhouse)
o Switch tvaudio and msp3400 to use up_and_exit (David Woodhouse)
o usb-uhci was using constants not flags for (Jeff Garzik)
pci interface
o Small fix for kdoc (Tim Waugh)
o Fix nubus build (Geert Uytterhoeven)
o atari/sun3lance update (Geert Uytterhoeven)
o Amiga gayle pcmcia fixups (Geert Uytterhoeven)
o Fixes for amiga scsi drivers (Geert Uytterhoeven)
o Simplify amiga irq handling code (Geert Uytterhoeven)
o Amiga sound/fb driver update (Geert Uytterhoeven)
o Amiga/Mac/Atari keyboard driver changes (Geert Uytterhoeven)
o Integrate atari stram with bootmem (Geert Uytterhoeven)
o Restore atafb_fix that someone deleted (Geert Uytterhoeven)
o m68k include updates for 64bit structs (Geert Uytterhoeven)
o Add driver for MVME147 onboard scsi (Geert Uytterhoeven)
o Enable Q40 ide interface (Geert Uytterhoeven)
o Replace init with initdata in places on m68k (Geert Uytterhoeven)
o MMU code changes for m68k (Geert Uytterhoeven)
o dma_addr_t and other minor updates for m68k (Geert Uytterhoeven)
o m68k ptrace update (Geert Uytterhoeven)
o Fix pmc551 when used without bugfix enabled (David Woodhouse)
o Fix endianness on ftl layer (David Woodhouse)
o Fix atm build (Markus Kossmann)
o Update 8139too driver (Jeff Garzik)
o Fix readdir returns on procfs (Matt Kraai)
o Make SET_MODULE_OWNER macro safer (Jeff Garzik)
o Hisax needed __init (Jeff Garzik)
o APM updates, fix the Dell 5000e check for APM=m (Stephen Rothwell)
o Fix module initialization oops (Keith Owens)
o Clean up Abyss driver (Jeff Garzik)
o Fix raid linking order (Neil Brown)
o Cleanup console_verbose() duplication
o Radio driver cleanups
o BTTV radio config option
o Fix qcam VIDIOCGWIN bugs
o 8390 seperate tx timeout path
o Tulip crash fix on weird eeproms
o ISAPnP hang on boot port fix
o Maestro pci_enable fix
o Fix function prototype in wacom drivr
o Fix SCSI / PCI dependancies (Jeff Garzik)
o m68k config fixes (Geert Uytterhoeven)
o Fix dquot overflow/recovery (Jan Kara)
o Make uid16 macros safer (Andreas Schwab)
o Fix missing Config doc and sound doc error (Thierry Vignaud)
o APM update (Stephen Rothwell)
o Fix SMP build on x86 (Steven Cole)
o Maestro ioctl locking fix (Zach Brown)
o Make console_* static inline not extern (Jeff Garzik)
o Work arounds for broken Dell laptop APM (me)
o Fix aha1542 memory scribbles (Phil Stracchino)
o Fix ide scsi printk (Geert Uytterhoeven)
o Update EATA driver and Ultrastor driver (Dario Ballabio)
o Clean up printk formatting in a few drivers (me)
o Documentation for CONFIG_TOSHIBA
o Updated version of Rusty's kernel-hacking doc
o Updated SubmittingDrivers
o Added SubmittingPatches
o Updated procfs docs
o Updated initrd docs
o Tidy network drivers module locking (Jeff Garzik)
(Some in, a few to go)
o Alpha PCI fixes (update resource not __init, (Ivan Kokshaysky)
off by one on check)
o Fix warning in rclan driver (Rasmus Andersen)
o Clean up rcpci driver (new style pci etc) (Jeff Garzik)
o Fix generic bitops bugs
o Fix pcnet32 printk problems (Vojtech Pavlik)
o Network driver check/request region fixes
o MDAcon cleanup (Pavel Rabel)
o Tidy up mad16 driver (Pavel Rabel)
Superceded by other fixes
o Features is back to flags for compatibility (me)
o MTRR updates (36bit etc)
o Dont crash on boot with a dual cpu board holding a non intel cpu
o CS46xx update
o NFS atomic fixes (Trond Myklebust)
o Fix O_SYNC for ext2fs (Stephen Tweedie)
[ I believe so anyway ]
o Disable PMC511 driver - its obviously broken (me)
o kbuild documentation improvements (Neil Brown)
o Fix ppa and imm hangs on io_request_lock (Tim Waugh)
o Fix pport reverse/forward logic error (Tim Waugh)
---
Alan Cox <[email protected]>
Red Hat Kernel Hacker
& Linux 2.2 Maintainer Brainbench MVP for TCP/IP
http://www.linux.org.uk/diary http://www.brainbench.com
On Mon, 18 Dec 2000, Alan Cox wrote:
> o Teach kernel-doc about const (Jani Monoses)
Tim Waugh pointed out this wasn't good as 'const' is part of the function
signature and he now has a better patch.
> o Add documentation to the PCI api (Jani Monoses)
> o Fix inode.c documentation (Jani Monoses)
For these I've sent Tim more cleaned up patches as I thought nobody picked
them up from the list.Looks like I was wrong ;-)
Jani.
On Mon, Dec 18, 2000 at 10:17:17PM +0200, Jani Monoses wrote:
> Tim Waugh pointed out this wasn't good as 'const' is part of the function
> signature and he now has a better patch.
I'll sync up with Alan.
Tim.
*/
On Mon, Dec 18, 2000 at 07:40:03PM +0000, Alan Cox wrote:
> o Mark the parport fifo code as experimental (Tim Waugh)
Needs this:
--- linux-2.4.0test13pre3-ac1/drivers/parport/Config.in Mon Dec 18 20:45:54 2000
+++ linux-2.4.0-test13-pre3+/drivers/parport/Config.in Mon Dec 18 16:56:36 2000
@@ -12,8 +12,8 @@
if [ "$CONFIG_PARPORT" != "n" ]; then
dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT
if [ "$CONFIG_PARPORT_PC" != "n" ]; then
- bool ' Use FIFO/DMA if available (EXPERIMENTAL)' CONFIG_PARPORT_PC_FIFO
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool ' Use FIFO/DMA if available (EXPERIMENTAL)' CONFIG_PARPORT_PC_FIFO
bool ' SuperIO chipset support (EXPERIMENTAL)' CONFIG_PARPORT_PC_SUPERIO
fi
fi
Tim.
*/
On Mon, Dec 18, 2000 at 07:40:03PM +0000, Alan Cox wrote:
> o Teach kernel-doc about const (Jani Monoses)
Needs this (also cleans up kernel-doc macro handling and fixes some
regexps):
--- linux-2.4.0test13pre3-ac1/scripts/kernel-doc Mon Dec 18 20:46:11 2000
+++ linux-2.4.0-test13-pre3+/scripts/kernel-doc Mon Dec 18 16:56:36 2000
@@ -668,23 +668,42 @@
sub dump_function {
my $prototype = shift @_;
- $prototype =~ s/^const+ //;
- $prototype =~ s/^static+ //;
- $prototype =~ s/^extern+ //;
- $prototype =~ s/^inline+ //;
- $prototype =~ s/^__inline__+ //;
- $prototype =~ s/^#define+ //; #ak added
+ $prototype =~ s/^static +//;
+ $prototype =~ s/^extern +//;
+ $prototype =~ s/^inline +//;
+ $prototype =~ s/^__inline__ +//;
+ $prototype =~ s/^#define +//; #ak added
+
+ # Yes, this truly is vile. We are looking for:
+ # 1. Return type (may be nothing if we're looking at a macro)
+ # 2. Function name
+ # 3. Function parameters.
+ #
+ # All the while we have to watch out for function pointer parameters
+ # (which IIRC is what the two sections are for), C types (these
+ # regexps don't even start to express all the possibilities), and
+ # so on.
+ #
+ # If you mess with these regexps, it's a good idea to check that
+ # the following functions' documentation still comes out right:
+ # - parport_register_device (function pointer parameters)
+ # - atomic_set (macro)
+ # - pci_match_device (long return type)
if ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
$prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
$prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
$prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
$prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+ $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+ $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
$prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
$prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
$prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
$prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
- $prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/) {
+ $prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+ $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+ $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/) {
$return_type = $1;
$function_name = $2;
$args = $3;
@@ -729,13 +748,13 @@
$param="...";
$parameters{"..."} = "variable arguments";
}
- if ($type eq "")
+ elsif ($type eq "" && $param eq "")
{
$type="";
$param="void";
$parameters{void} = "no arguments";
}
- if ($parameters{$param} eq "") {
+ if ($type ne "" && $parameters{$param} eq "") {
$parameters{$param} = "-- undescribed --";
print STDERR "Warning($file:$lineno): Function parameter '$param' not described in '$function_name'\n";
}
On Mon, Dec 18, 2000 at 07:40:03PM +0000, Alan Cox wrote:
> o Add documentation to the PCI api (Jani Monoses)
Needs this:
--- linux-2.4.0test13pre3-ac1/drivers/pci/pci.c.pcidoc Mon Dec 18 20:46:08 2000
+++ linux-2.4.0test13pre3-ac1/drivers/pci/pci.c Mon Dec 18 20:51:20 2000
@@ -73,7 +73,7 @@
* found with a matching @vendor, @device, @ss_vendor and @ss_device, a pointer to its
* device structure is returned. Otherwise, %NULL is returned.
* A new search is initiated by passing %NULL to the @from argument.
- * Otherwise if @from is not %NULL, searches continue from that point.
+ * Otherwise if @from is not %NULL, searches continue from next device on the global list.
*/
struct pci_dev *
pci_find_subsys(unsigned int vendor, unsigned int device,
@@ -105,7 +105,7 @@
* found with a matching @vendor and @device, a pointer to its device structure is
* returned. Otherwise, %NULL is returned.
* A new search is initiated by passing %NULL to the @from argument.
- * Otherwise if @from is not %NULL, searches continue from that point.
+ * Otherwise if @from is not %NULL, searches continue from next device on the global list.
*/
struct pci_dev *
pci_find_device(unsigned int vendor, unsigned int device, const struct pci_dev *from)
@@ -123,7 +123,7 @@
* found with a matching @class, a pointer to its device structure is
* returned. Otherwise, %NULL is returned.
* A new search is initiated by passing %NULL to the @from argument.
- * Otherwise if @from is not %NULL, searches continue from that point.
+ * Otherwise if @from is not %NULL, searches continue from next device on the global list.
*/
struct pci_dev *
pci_find_class(unsigned int class, const struct pci_dev *from)
@@ -370,7 +370,7 @@
*
* Adds the driver structure to the list of registered drivers
* Returns the number of pci devices which were claimed by the driver
- * during registration
+ * during registration.
*/
int
pci_register_driver(struct pci_driver *drv)
@@ -392,7 +392,7 @@
*
* Deletes the driver structure from the list of registered PCI drivers,
* gives it a chance to clean up and marks the devices for which it
- * was responsible as driverless
+ * was responsible as driverless.
*/
void
@@ -461,7 +461,7 @@
* @dev: the device to insert
* @bus: where to insert it
*
- * Add a new device to the device lists and notify userspace (/sbin/hotplug)
+ * Add a new device to the device lists and notify userspace (/sbin/hotplug).
*/
void
pci_insert_device(struct pci_dev *dev, struct pci_bus *bus)
@@ -500,7 +500,7 @@
* @dev: the device to remove
*
* Delete the device structure from the device lists and
- * notify userspace (/sbin/hotplug)
+ * notify userspace (/sbin/hotplug).
*/
void
pci_remove_device(struct pci_dev *dev)
@@ -532,7 +532,7 @@
* @dev: the device to query
*
* Returns the appropriate pci_driver structure or %NULL if there is no
- * registered driver for the device
+ * registered driver for the device.
*/
struct pci_driver *
pci_dev_driver(const struct pci_dev *dev)
@@ -590,7 +590,7 @@
* @dev: the PCI device to enable
*
* Enables bus-mastering on the device and calls pcibios_set_master()
- * to do the needed arch specific settings
+ * to do the needed arch specific settings.
*/
void
pci_set_master(struct pci_dev *dev)
@@ -940,7 +940,7 @@
* vendor,class,memory and IO-space addresses,IRQ lines etc.
* Called at initialisation of the PCI subsystem and by CardBus services.
* Returns 0 on success and -1 if unknown type of device (not normal, bridge
- * or CardBus)
+ * or CardBus).
*/
int pci_setup_device(struct pci_dev * dev)
{
Tim.
*/
> On Mon, 18 Dec 2000, Alan Cox wrote:
> > o Teach kernel-doc about const (Jani Monoses)
>
> Tim Waugh pointed out this wasn't good as 'const' is part of the function
> signature and he now has a better patch.
> For these I've sent Tim more cleaned up patches as I thought nobody picked
> them up from the list.Looks like I was wrong ;-)
Thanks for the info. I'll pick up the changes when Tim sends them on
On Mon, 18 Dec 2000, Alan Cox wrote:
> o Fix leak in link() syscall (Al Viro)
^^^^^^^
Originally - by Christopher Yeoh.