diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:08:33 -0800 |
| commit | 2d80cb2a5e022225b9512ccc98f7979cc4b92ce8 (patch) | |
| tree | a7f247ba424b5366ce443b3d9cb5b4c7f6538e3f /scripts | |
| parent | 75b566af5cc6f64f9ab5b66608ff8ce18098a2b4 (diff) | |
v2.4.5.8 -> v2.4.5.9
- make sure "sync()" doesn't effectively lock up the machine by
overloading all the IO resources
- fix up some network memory allocations that don't wan tto wait on IO.
- merge with Alan (including MIPS update)
- Jeff Garzik: network driver updates.
- Al Viro: System V FS update (write capability, page cache, mondo cleanups)
- Kai Germaschewski: ISDN cleanups, TURBOPAM driver by Stelian Pop
- Ben Fennema: UDF update (time handling, i_blocks fix)
- Neil Brown: md error handling improvements, knfsd file handle compatibility
- Paul Mackerras: PPC update
- Jakub Jelinek: fix up kernel linker scripts to accept .rodata better
- Patrick Mochel: fix PME handling in pci_enable_wake()
- Chris Mason: reiserfs PF_MEMALLOC handling
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Configure | 1 | ||||
| -rw-r--r-- | scripts/Menuconfig | 1 | ||||
| -rw-r--r-- | scripts/header.tk | 1 | ||||
| -rw-r--r-- | scripts/kernel-doc | 9 |
4 files changed, 10 insertions, 2 deletions
diff --git a/scripts/Configure b/scripts/Configure index f931c4cbfd04..58375f239bbc 100644 --- a/scripts/Configure +++ b/scripts/Configure @@ -92,6 +92,7 @@ ${var}:\\ /^#/b /^[^ ]/q + /<file:\\([^>]*\\)>/s//\\1/g p }" Documentation/Configure.help) if [ -z "$text" ] diff --git a/scripts/Menuconfig b/scripts/Menuconfig index b1d21bb0b666..b48d36bcb974 100644 --- a/scripts/Menuconfig +++ b/scripts/Menuconfig @@ -376,6 +376,7 @@ ${var}:\\ /^#/b /^[^ ]/q s/^ // + /<file:\\([^>]*\\)>/s//\\1/g p }" Documentation/Configure.help) diff --git a/scripts/header.tk b/scripts/header.tk index 94963425a9a5..2cc9c7e534e9 100644 --- a/scripts/header.tk +++ b/scripts/header.tk @@ -466,6 +466,7 @@ ${var}:\\ /^#/b /^\[^ \]/q s/^ // + /<file:\\(\[^>\]*\\)>/s//\\1/g p } " Documentation/Configure.help] diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 32e4d97929e4..1f9a4bdf3a25 100644 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -18,6 +18,11 @@ use strict; # Functions prototyped as foo(void) same as foo() # Stop eval'ing where we don't need to. # -- huggie@earth.li + +# 27/06/2001 - Allowed whitespace after initial "/**" and +# allowed comments before function declarations. +# -- Christian Kreibich <ck@whoop.org> + # Still to do: # - add perldoc documentation # - Look more closely at some of the scarier bits :) @@ -825,7 +830,7 @@ $section = ""; $doc_special = "\@\%\$\&"; -$doc_start = "^/\\*\\*\$"; +$doc_start = "^/\\*\\*\\s*\$"; # Allow whitespace at end of comment start. $doc_end = "\\*/"; $doc_com = "\\s*\\*\\s*"; $doc_func = $doc_com."(\\w+):?"; @@ -975,7 +980,7 @@ sub process_file($) { elsif (/([^\{]*)/) { $prototype .= $1; } - if (/\{/ || /\#/) { # added for #define AK + if (/\{/ || /\#/ || /;/) { # added for #define AK, ';' added for declarations. $prototype =~ s@/\*.*?\*/@@gos; # strip comments. $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's. $prototype =~ s@^ +@@gos; # strip leading spaces |