Linux 2.6.23.8
Subsystems (47)
We (the -stable team) are announcing the release of the 2.6.23.8 kernel. It contains a few serious security fixes, as well as a raft of other bugfixes and stuff from the last 2.6.23.1 kernel release.
Wait, what happened to versions 2.6.23.2 - 7 you might ask? Well, they too are released, and I'll be responding to this message with those individual changelogs and diffs. They corrispond to the different patch groups that I sent out for review of the stable tree in order to handle the huge number of overall patches. This way, if problems occur, it will be easier for people to track down where the regression might have happened.
I'll also be replying to this message with a copy of the patch between 2.6.23.7 and 2.6.23.8
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 +- kernel/exit.c | 3 +-- net/ipv4/tcp_input.c | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-)
Summary of changes from v2.6.23.7 to v2.6.23.8
==============================================
Greg Kroah-Hartman (1):
Linux 2.6.23.8
Ilpo Järvinen (1):
TCP: Make sure write_queue_from does not begin with NULL ptr (CVE-2007-5501)
Roland McGrath (1):
wait_task_stopped: Check p->exit_state instead of TASK_TRACED (CVE-2007-5500)
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .7 +EXTRAVERSION = .8 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
kernel/exit.c +1 -2
@@ -1362,8 +1362,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,int why = (p->ptrace &PT_PTRACED ) ?CLD_TRAPPED :CLD_STOPPED ; exit_code = p->exit_code; -if (unlikely (!exit_code) || -unlikely (p->state &TASK_TRACED )) +if (unlikely (!exit_code) ||unlikely (p->exit_state)) goto bail_ref; return wait_noreap_copyout(p, pid, uid, why, (exit_code << 8) | 0x7f,
net/ipv4/tcp_input.c +5 -0
@@ -1012,6 +1012,9 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_if (before (TCP_SKB_CB (ack_skb)->ack_seq, prior_snd_una - tp->max_window))return 0 ; +if (!tp->packets_out) + goto out; +/* SACK fastpath: * if the only SACK change is the increase of the end_seq of * the first block then only apply that SACK block
@@ -1280,6 +1283,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark)))tcp_update_reordering (sk, ((tp->fackets_out +1 ) - reord),0 ); +out: +#if FASTRETRANS_DEBUG >0 BUG_TRAP ((int )tp->sacked_out >=0 );BUG_TRAP ((int )tp->lost_out >=0 );
Linux 2.6.23.2
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.2 kernel. It contains a number of bugfixes for the core kernel code.
I'll also be replying to this message with a copy of the patch between 2.6.23.1 and 2.6.23.2
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Documentation/ja_JP/HOWTO | 84 ++++++++++++++++++++++++---------------------- Makefile | 2 - block/ll_rw_blk.c | 8 +--- fs/locks.c | 11 ++++++ fs/proc/array.c | 6 ++- fs/splice.c | 2 - include/linux/blkdev.h | 2 - include/linux/sched.h | 1 kernel/fork.c | 2 + kernel/futex_compat.c | 27 ++++++++++---- kernel/lockdep.c | 10 ++--- kernel/params.c | 9 +++- kernel/softlockup.c | 7 ++- mm/filemap.c | 13 +------ mm/page-writeback.c | 4 +- mm/shmem.c | 15 ++++++++ mm/slub.c | 22 ------------ 17 files changed, 125 insertions(+), 100 deletions(-)
Summary of changes from v2.6.23.1 to v2.6.23.2
==============================================
Andrew Morton (1):
writeback: don't propagate AOP_WRITEPAGE_ACTIVATE
Christoph Lameter (1):
SLUB: Fix memory leak by not reusing cpu_slab
Dave Young (1):
param_sysfs_builtin memchr argument fix
David Miller (1):
Fix compat futex hangs.
Frans Pop (1):
sched: keep utime/stime monotonic
Greg Kroah-Hartman (1):
Linux 2.6.23.2
Gregory Haskins (1):
lockdep: fix mismatched lockdep_depth/curr_chain_hash
Hugh Dickins (1):
fix tmpfs BUG and AOP_WRITEPAGE_ACTIVATE
Ingo Molnar (1):
fix the softlockup watchdog to actually work
J. Bruce Fields (1):
locks: fix possible infinite loop in posix deadlock detection
Jan Kiszka (1):
fix param_sysfs_builtin name length check
Jens Axboe (2):
splice: fix double kunmap() in vmsplice copy path
BLOCK: Fix bad sharing of tag busy list on queues with shared tag maps
Linus Torvalds (1):
Remove broken ptrace() special-case code from file mapping
Tsugikazu Shibata (1):
HOWTO: update ja_JP/HOWTO with latest changes
Re: Linux 2.6.23.2
Documentation/ja_JP/HOWTO +45 -39
@@ -1,4 +1,4 @@ -NOTE: +NOTE: This is a version of Documentation/HOWTO translated into Japanese. This document is maintained by Tsugikazu Shibata <[email protected]> and the JF Project team <www.linux.or.jp/JF>.
@@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a fork. So if you have any comments or updates for this file, please try to update the original English file first. -Last Updated: 2007/07/18 +Last Updated: 2007/09/23 ================================== ããã¯ã -linux-2.6.22/Documentation/HOWTO +linux-2.6.23/Documentation/HOWTO ã®å訳ã§ãã 翻訳å£ä½ï¼ JF ããã¸ã§ã¯ã < http://www.linux.or.jp/JF/ > -翻訳æ¥ï¼ 2007/07/16 +翻訳æ¥ï¼ 2007/09/19 翻訳è ï¼ Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> æ ¡æ£è ï¼ æ¾åãã <nbh--mats at nifty dot com> å°æ é å ¸ãã (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
@@ -27,6 +27,7 @@ linux-2.6.22/Documentation/HOWTO éå£ãã (Kenji Noguchi) <tokyo246 at gmail dot com> æ²³å ãã (Takayoshi Kochi) <t-kochi at bq dot jp dot nec dot com> 岩æ¬ãã (iwamoto) <iwamoto.kn at ncos dot nec dot co dot jp> + å ç°ãã (Satoshi Uchida) <s-uchida at ap dot jp dot nec dot com> ================================== Linux ã«ã¼ãã«éçºã®ããæ¹
@@ -40,7 +41,7 @@ Linux ã«ã¼ãã«éçºã³ãã¥ããã£ã¨å ±ã«æ´»åããããæ¹ãå¦ã æå©ãã«ãªãã¾ãã ããããã®ããã¥ã¡ã³ãã®ã©ãããå¤ããªã£ã¦ããå ´åã«ã¯ããã®ããã¥ã¡ã³ -ãã®æå¾ã«ãªã¹ãããã¡ã³ããã¼ã«ããããéã£ã¦ãã ããã +ãã®æå¾ã«ãªã¹ãããã¡ã³ããã«ããããéã£ã¦ãã ããã ã¯ããã« ---------
@@ -59,7 +60,7 @@ Linux ã«ã¼ãã«éçºã³ãã¥ããã£ã¨å ±ã«æ´»åããããæ¹ãå¦ã ãã«éçºè ã«ã¯å¿ è¦ã§ããã¢ã¼ããã¯ãã£åãã®ä½ã¬ãã«é¨åã®éçºãããã® ã§ãªããã°ã(ã©ããªã¢ã¼ããã¯ãã£ã§ã)ã¢ã»ã³ããª(訳注: è¨èª)ã¯å¿ è¦ãã ã¾ããã以ä¸ã®æ¬ã¯ãC è¨èªã®ååãªç¥èãä½å¹´ãã®çµé¨ã«åã£ã¦ä»£ãããã® -ã§ã¯ããã¾ããããå°ãªãã¨ããªãã¡ã¬ã³ã¹ã¨ãã¦ã¯ããæ¬ã§ãã +ã§ã¯ããã¾ããããå°ãªãã¨ããªãã¡ã¬ã³ã¹ã¨ãã¦ã¯è¯ãæ¬ã§ãã - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall] -ãããã°ã©ãã³ã°è¨èªï¼£ç¬¬2çã(B.W. ã«ã¼ããã³/D.M. ãªããã¼è ç³ç°æ´ä¹ 訳) [å ±ç«åºç] - "Practical C Programming" by Steve Oualline [O'Reilly]
@@ -76,7 +77,7 @@ Linux ã«ã¼ãã«éçºã³ãã¥ããã£ã¨å ±ã«æ´»åããããæ¹ãå¦ã ã¨ãã©ããã«ã¼ãã«ããã¼ã«ãã§ã¤ã³ã C è¨èªæ¡å¼µã«ç½®ãã¦ããåæãã©ã ãªã£ã¦ããã®ããããã«ãããã¨ããããã¾ããæ®å¿µãªãã¨ã«æ±ºå®çãªãªãã¡ ã¬ã³ã¹ã¯åå¨ãã¾ãããæ å ±ãå¾ãã«ã¯ãgcc ã® info ãã¼ã¸( info gcc )ã -ã¿ã¦ãã ããã +è¦ã¦ãã ããã ããªãã¯æ¢åã®éçºã³ãã¥ããã£ã¨ä¸ç·ã«ä½æ¥ããæ¹æ³ãå¦ã¼ãã¨ãã¦ããã ã¨ã«çæãã¦ãã ããããã®ã³ãã¥ããã£ã¯ãã³ã¼ãã£ã³ã°ãã¹ã¿ã¤ã«ã
@@ -92,7 +93,7 @@ Linux ã«ã¼ãã«éçºã³ãã¥ããã£ã¨å ±ã«æ´»åããããæ¹ãå¦ã Linux ã«ã¼ãã«ã®ã½ã¼ã¹ã³ã¼ã㯠GPL ã©ã¤ã»ã³ã¹ã®ä¸ã§ãªãªã¼ã¹ããã¦ãã¾ ããã©ã¤ã»ã³ã¹ã®è©³ç´°ã«ã¤ãã¦ã¯ãã½ã¼ã¹ããªã¼ã®ã¡ã¤ã³ãã£ã¬ã¯ããªã«åå¨ -ãããCOPYING ã®ãã¡ã¤ã«ãã¿ã¦ãã ãããããã©ã¤ã»ã³ã¹ã«ã¤ãã¦ããã«è³ª +ãããCOPYING ã®ãã¡ã¤ã«ãè¦ã¦ãã ãããããã©ã¤ã»ã³ã¹ã«ã¤ãã¦ããã«è³ª åãããã°ãLinux Kernel ã¡ã¼ãªã³ã°ãªã¹ãã«è³ªåããã®ã§ã¯ãªããã©ãã æ³å¾å®¶ã«ç¸è«ãã¦ãã ãããã¡ã¼ãªã³ã°ãªã¹ãã®äººéã¯æ³å¾å®¶ã§ã¯ãªããæ³ç åé¡ã«ã¤ãã¦ã¯å½¼ãã®å£°æã¯ãã¦ã«ããã¹ãã§ã¯ããã¾ããã
@@ -109,7 +110,8 @@ Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã¯å¹ åºãç¯å²ã®ããã¥ã¡ã³ããå æ°ããããã¥ã¡ã³ããã¡ã¤ã«ã追å ãããã¨ãå§ãã¾ãã ã«ã¼ãã«ã®å¤æ´ããã«ã¼ãã«ãã¦ã¼ã¶ç©ºéã«å ¬éãã¦ããã¤ã³ã¿ã¼ãã§ã¤ã¹ã® 夿´ãå¼ãèµ·ããå ´åããã®å¤æ´ã説æããããã¥ã¢ã«ãã¼ã¸ã®ããããæ å ± -ãããã¥ã¢ã«ãã¼ã¸ã®ã¡ã³ãã [email protected] ã«éããã¨ãå§ãã¾ãã +ãããã¥ã¢ã«ãã¼ã¸ã®ã¡ã³ãã [email protected] ã«éããã¨ãå§ãã¾ +ãã 以ä¸ã¯ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã«å«ã¾ãã¦ããèªãã§ããã¹ããã¡ã¤ã«ã®ä¸è¦§ã§ ã-
@@ -117,7 +119,7 @@ Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã¯å¹ åºãç¯å²ã®ããã¥ã¡ã³ããå README ãã®ãã¡ã¤ã«ã¯ Linuxã«ã¼ãã«ã®ç°¡åãªèæ¯ã¨ã«ã¼ãã«ãè¨å®(訳注 configure )ããçæ(訳注 build )ããããã«å¿ è¦ãªãã¨ã¯ä½ããæ¸ãã - ã¦ãã¾ããã«ã¼ãã«ã«é¢ãã¦åãã¦ã®äººã¯ããããã¹ã¿ã¼ãããã¨ããã§ + ã¦ãã¾ããã«ã¼ãã«ã«é¢ãã¦åãã¦ã®äººã¯ããããã¹ã¿ã¼ãããã¨è¯ãã§ ãããã Documentation/Changes
@@ -128,7 +130,7 @@ Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã¯å¹ åºãç¯å²ã®ããã¥ã¡ã³ããå Documentation/CodingStyle ãã㯠Linux ã«ã¼ãã«ã®ã³ã¼ãã£ã³ã°ã¹ã¿ã¤ã«ã¨èæ¯ã«ããçç±ãè¨è¿° ãã¦ãã¾ããå ¨ã¦ã®æ°ããã³ã¼ãã¯ãã®ããã¥ã¡ã³ãã«ããã¬ã¤ãã©ã¤ã³ - ã«å¾ã£ã¦ãããã¨ãæå¾ ããã¦ãã¾ãã大é¨åã®ã¡ã³ããã¼ã¯ãããã®ã«ã¼ + ã«å¾ã£ã¦ãããã¨ãæå¾ ããã¦ãã¾ãã大é¨åã®ã¡ã³ããã¯ãããã®ã«ã¼ ã«ã«å¾ã£ã¦ãããã®ã ããåãä»ããå¤ãã®äººã¯æ£ããã¹ã¿ã¤ã«ã®ã³ã¼ã ã ããã¬ãã¥ã¼ãã¾ãã
@@ -168,16 +170,16 @@ Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã¯å¹ åºãç¯å²ã®ããã¥ã¡ã³ããå æ¯æ´ãã¦ãã ããã Documentation/ManagementStyle - ãã®ããã¥ã¡ã³ã㯠Linux ã«ã¼ãã«ã®ã¡ã³ããã¼éãã©ãè¡åãããã + ãã®ããã¥ã¡ã³ã㯠Linux ã«ã¼ãã«ã®ã¡ã³ããéãã©ãè¡åãããã å½¼ãã®ææ³ã®èæ¯ã«ããå ±æããã¦ããç²¾ç¥ã«ã¤ãã¦è¨è¿°ãã¦ãã¾ããã ãã¯ã«ã¼ãã«éçºã®åå¿è ãªãï¼ãããã¯ãåã«èå³ãããã ãã®äººã§ãï¼ - éè¦ã§ãããªããªããã®ããã¥ã¡ã³ãã¯ãã«ã¼ãã«ã¡ã³ããã¼éã®ç¬ç¹ãª + éè¦ã§ãããªããªããã®ããã¥ã¡ã³ãã¯ãã«ã¼ãã«ã¡ã³ããéã®ç¬ç¹ãª è¡åã«ã¤ãã¦ã®å¤ãã®èª¤è§£ãæ··ä¹±ãè§£æ¶ããããã§ãã Documentation/stable_kernel_rules.txt ãã®ãã¡ã¤ã«ã¯ã©ã®ããã« stable ã«ã¼ãã«ã®ãªãªã¼ã¹ãè¡ããããã®ã«ã¼ ã«ãè¨è¿°ããã¦ãã¾ããããã¦ãããã®ãªãªã¼ã¹ã®ä¸ã®ã©ããã§å¤æ´ãå - ãå ¥ãã¦ãããããå ´åã«ä½ãããã°ãããã示ããã¦ãã¾ãã + ãå ¥ãã¦ãããããå ´åã«ä½ãããã°è¯ããã示ããã¦ãã¾ãã Documentation/kernel-docs.txt ããã«ã¼ãã«éçºã«ä»éããå¤é¨ããã¥ã¡ã³ãã®ãªã¹ãã§ããããããªãã
@@ -218,9 +220,9 @@ web ãµã¤ãã«ã¯ãã³ã¼ãã®æ§æããµãã·ã¹ãã ãç¾å¨åå¨ãã ããã«ã¯ãã¾ããã«ã¼ãã«ã®ã³ã³ãã¤ã«ã®ããæ¹ããããã®å½ã¦æ¹ãªã©ã®éæ¥ çãªåºæ¬æ å ±ãè¨è¿°ããã¦ãã¾ãã -ããªããã©ãããã¹ã¿ã¼ããã¦ãããããããªãããLinux ã«ã¼ãã«éçºã³ã㥠+ããªããã©ãããã¹ã¿ã¼ããã¦è¯ããããããªãããLinux ã«ã¼ãã«éçºã³ã㥠ããã£ã«åå ãã¦ä½ããããã¨ããããã¦ããå ´åã«ã¯ãLinux kernel -Janitor's ããã¸ã§ã¯ãã«ããã°ããã§ããã - +Janitor's ããã¸ã§ã¯ãã«ããã°è¯ãã§ããã - http://janitor.kernelnewbies.org/ ããã¯ãã®ãããªã¹ã¿ã¼ããããã®ã«ãã£ã¦ã¤ãã®å ´æã§ããããã«ã¯ã Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã®ä¸ã«å«ã¾ããããããã«ããä¿®æ£ããªããã°ãª
@@ -243,7 +245,7 @@ Linux ã«ã¼ãã«ã½ã¼ã¹ããªã¼ã®ä¸ã«å«ã¾ããããããã«ããä¿ èªå·±åç §æ¹å¼ã§ãç´¢å¼ãã¤ãã web å½¢å¼ã§ãã½ã¼ã¹ã³ã¼ããåç §ãããã¨ã ã§ãã¾ãããã®ææ°ã®ç´ æ´ããã«ã¼ãã«ã³ã¼ãã®ãªãã¸ããªã¯ä»¥ä¸ã§è¦ã¤ãã ã¾ã- - http://sosdg.org/~coywolf/lxr/ + http://sosdg.org/~qiyong/lxr/ éçºããã»ã¹ -----------------------
@@ -265,9 +267,9 @@ Linux ã«ã¼ãã«ã®éçºããã»ã¹ã¯ç¾å¨å¹¾ã¤ãã®ç°ãªãã¡ã¤ã³ã 以ä¸ã®ã¨ãã- - æ°ããã«ã¼ãã«ããªãªã¼ã¹ãããç´å¾ã«ã2é±éã®ç¹å¥æéãè¨ãããã - ãã®æéä¸ã«ãã¡ã³ããã¼é㯠Linus ã«å¤§ããªå·®åãéããã¨ãã§ãã¾ - ãããã®ãããªå·®åã¯é常 -mm ã«ã¼ãã«ã«æ°é±éå«ã¾ãã¦ãããããã§ - ãã 大ããªå¤æ´ã¯ git(ã«ã¼ãã«ã®ã½ã¼ã¹ç®¡çãã¼ã«ã詳細㯠+ ãã®æéä¸ã«ãã¡ã³ããé㯠Linus ã«å¤§ããªå·®åãéããã¨ãã§ãã¾ãã + ãã®ãããªå·®åã¯é常 -mm ã«ã¼ãã«ã«æ°é±éå«ã¾ãã¦ãããããã§ãã + 大ããªå¤æ´ã¯ git(ã«ã¼ãã«ã®ã½ã¼ã¹ç®¡çãã¼ã«ã詳細㯠http://git.or.cz/ åç §) ã使ã£ã¦éãã®ã好ã¾ããããæ¹ã§ããããã ããã¡ã¤ã«ã®å½¢å¼ã®ã¾ã¾éãã®ã§ãååã§ãã
@@ -285,6 +287,10 @@ Linux ã«ã¼ãã«ã®éçºããã»ã¹ã¯ç¾å¨å¹¾ã¤ãã®ç°ãªãã¡ã¤ã³ã ã«å®å®ããç¶æ ã«ããã¨å¤æããã¨ãã«ãªãªã¼ã¹ããã¾ããç®æ¨ã¯æ¯é±æ° ãã -rc ã«ã¼ãã«ããªãªã¼ã¹ãããã¨ã§ãã + - 以ä¸ã® URL ã§å -rc ãªãªã¼ã¹ã«åå¨ããæ¢ç¥ã®å¾æ»ãåé¡ã®ãªã¹ã + ã追跡ããã¾ã- + http://kernelnewbies.org/known_regressions + - ãã®ããã»ã¹ã¯ã«ã¼ãã«ã ãæºåãã§ãããã¨èããããã¾ã§ç¶ç¶ãã¾ ãããã®ããã»ã¹ã¯ã ããã 6é±éç¶ç¶ãã¾ãã
@@ -331,8 +337,8 @@ Andrew ã¯åå¥ã®ãµãã·ã¹ãã ã«ã¼ãã«ããªã¼ã¨ããããå ¨ã¦é linux-kernel ã¡ã¼ãªã³ã°ãªã¹ãã§åéããã夿°ã®ãããã¨åæã«ä¸ã¤ã«ã¾ ã¨ãã¾ãã ãã®ããªã¼ã¯æ°æ©è½ã¨ããããæ¤è¨¼ãããå ´ã¨ãªãã¾ããããæéã®éããã -ã -mm ã«å ¥ã£ã¦ä¾¡å¤ã証æãããããAndrew ããµãã·ã¹ãã ã¡ã³ããããã¡ -ã¤ã³ã©ã¤ã³ã¸å ¥ããããã« Linus ã«ããã·ã¥ãã¾ãã +ã -mm ã«å ¥ã£ã¦ä¾¡å¤ã証æãããããAndrew ããµãã·ã¹ãã ã¡ã³ãããã +ã¡ã¤ã³ã©ã¤ã³ã¸å ¥ããããã« Linus ã«ããã·ã¥ãã¾ãã ã¡ã¤ã³ã«ã¼ãã«ããªã¼ã«å«ããããã« Linus ã«éãåã«ããã¹ã¦ã®æ°ãããã ãã -mm ããªã¼ã§ãã¹ãããããã¨ãå¼·ãæ¨å¥¨ããã¾ãã
@@ -460,7 +466,7 @@ MAINTAINERS ãã¡ã¤ã«ã«ãªã¹ããããã¾ãã®ã§åç §ãã¦ãã ãã ãã- å½¼ãã¯ããªãã®ãããã®è¡æ¯ã«ã³ã¡ã³ããå ¥ãããã®ã§ããã®ããã«ã¯ããã ãããããã¾ãããããªãã®ã¡ã¼ã«ããã°ã©ã ã空ç½ãã¿ããå§ç¸®ããªããã -ã«ç¢ºèªããæ¹ãããã§ããæåã®è¯ããã¹ãã¨ãã¦ã¯ãèªåã«ã¡ã¼ã«ãéã£ã¦ +ã«ç¢ºèªããæ¹ãè¯ãã§ããæåã®è¯ããã¹ãã¨ãã¦ã¯ãèªåã«ã¡ã¼ã«ãéã£ã¦ ã¿ã¦ããã®ããããèªåã§å½ã¦ã¦ã¿ããã¨ã§ããããããããã¾ãè¡ããªã㪠ããããªãã®ã¡ã¼ã«ããã°ã©ã ãç´ãã¦ãããããæ£ããåãããã«å¤ããã¹ ãã§ãã
@@ -507,14 +513,14 @@ MAINTAINERS ãã¡ã¤ã«ã«ãªã¹ããããã¾ãã®ã§åç §ãã¦ãã ãã ã¨ãæ®éã®ãã¨ã§ããããã¯ããªãã®ããããåãå ¥ããããªãã¨ãããã¨ã§ 㯠*ããã¾ãã*ãããã¦ããªãèªèº«ã«å対ãããã¨ãæå³ããã®ã§ã *ããã¾ ãã*ãåã«èªåã®ãããã«å¯¾ãã¦ææãããåé¡ãå ¨ã¦ä¿®æ£ãã¦åéããã° -ããã®ã§ãã +è¯ãã®ã§ãã ã«ã¼ãã«ã³ãã¥ããã£ã¨ä¼æ¥çµç¹ã®ã¡ãã ----------------------------------------------------------------- ã«ã¼ãã«ã³ãã¥ããã£ã¯å¤§é¨åã®ä¼çµ±çãªä¼ç¤¾ã®éçºç°å¢ã¨ã¯ç°ã£ãããæ¹ã§ -åãã¦ãã¾ãã以ä¸ã¯åé¡ãé¿ããããã«ã§ããã¨ãããã¨ã®ã®ãªã¹ãã§ã- +åãã¦ãã¾ãã以ä¸ã¯åé¡ãé¿ããããã«ã§ããã¨è¯ããã¨ã®ãªã¹ãã§ã- ããªãã®ææ¡ãã夿´ã«ã¤ãã¦è¨ãã¨ãã®ãã¾ãè¨ãæ¹ï¼
@@ -525,7 +531,7 @@ MAINTAINERS ãã¡ã¤ã«ã«ãªã¹ããããã¾ãã®ã§åç §ãã¦ãã ãã - "以ä¸ã¯ä¸é£ã®å°ããªããã群ã§ãã..." - "ããã¯å ¸åçãªãã·ã³ã§ã®æ§è½ãåä¸ããã¾ã.." - ãããæ¹ãããæªãè¨ãæ¹ï¼ + ãããæ¹ãè¯ãæªãè¨ãæ¹ï¼ - ãã®ããæ¹ã§ AIX/ptx/Solaris ã§ã¯ã§ããã®ã§ãã§ããã¯ãã - ç§ã¯ããã20å¹´ãã®éãã£ã¦ãããã ãã
@@ -575,10 +581,10 @@ Linux ã«ã¼ãã«ã³ãã¥ããã£ã¯ãä¸åº¦ã«å¤§éã®ã³ã¼ãã®å¡ãå 1) å°ãããããã¯ããªãã®ããããé©ç¨ãããè¦è¾¼ã¿ã大ãããã¾ããã«ã¼ ãã«ã®äººéã¯ããããæ£ãããã©ããã確èªããæéãå´åããããªãã - ãã§ãã5è¡ã®ãããã¯ã¡ã³ããããã£ã1ç§è¦ãã ãã§é©ç¨ã§ãã¾ããã - ããã500è¡ã®ãããã¯ãæ£ãããã¨ãã¬ãã¥ã¼ããã®ã«æ°æéããããã - ããã¾ãã(æéã¯ãããã®ãµã¤ãºãªã©ã«ããææ°é¢æ°ã«æ¯ä¾ãã¦ãããã¾ - ã) + ãã§ãã5è¡ã®ãããã¯ã¡ã³ããããã£ã1ç§è¦ãã ãã§é©ç¨ã§ãã¾ãã + ãããã500è¡ã®ãããã¯ãæ£ãããã¨ãã¬ãã¥ã¼ããã®ã«æ°æéãããã + ãããã¾ãã(æéã¯ãããã®ãµã¤ãºãªã©ã«ããææ°é¢æ°ã«æ¯ä¾ãã¦ããã + ã¾ã) å°ãããããã¯ä½ããã£ãã¨ãã«ãããã°ãã¨ã¦ãç°¡åã«ãªãã¾ãããã ãã1å1ååãé¤ãã®ã¯ãã¨ã¦ã大ããªããããå½ã¦ãå¾ã«(ãã¤ãä½ãã
@@ -587,23 +593,23 @@ Linux ã«ã¼ãã«ã³ãã¥ããã£ã¯ãä¸åº¦ã«å¤§éã®ã³ã¼ãã®å¡ãå 2) å°ããããããéãã ãã§ãªããéãã¾ãã«ãæ¸ãç´ãã¦ãã·ã³ãã«ã«ã ã(ãããã¯ãåã«é çªãå¤ããã ãã§ã)ãã¨ããã¨ã¦ãéè¦ã§ãã -以ä¸ã¯ã«ã¼ãã«éçºè ã® Al Viro ã®ãã¨ã話ãã§ãï¼ +以ä¸ã¯ã«ã¼ãã«éçºè ã® Al Viro ã®ãã¨ã話ã§ãï¼ "çå¾ã®æ°å¦ã®å®¿é¡ãæ¡ç¹ããå çã®ãã¨ãèãã¦ã¿ã¦ãã ãããå - çã¯çå¾ãè§£ã«å°éããã¾ã§ã®è©¦è¡é¯èª¤ãã¿ããã¨ã¯æããªãã§ãã - ããå çã¯ç°¡æ½ãªæé«ã®è§£ãã¿ããã®ã§ããè¯ãçå¾ã¯ãããç¥ã£ã¦ + çã¯çå¾ãè§£ã«å°éããã¾ã§ã®è©¦è¡é¯èª¤ãè¦ããã¨ã¯æããªãã§ãã + ããå çã¯ç°¡æ½ãªæé«ã®è§£ãè¦ããã®ã§ããè¯ãçå¾ã¯ãããç¥ã£ã¦ ãããããã¦æçµè§£ã®åã®ä¸é使¥ãæåºãããã¨ã¯æ±ºãã¦ãªãã®ã§ ã" - ã«ã¼ãã«éçºã§ãããã¯åãã§ããã¡ã³ããã¼éã¨ã¬ãã¥ã¼ã¢éã¯ã - åé¡ã解決ããè§£ã®èå¾ã«ãªãæèããã»ã¹ãã¿ããã¨ã¯æãã¾ããã - å½¼ãã¯åç´ã§ãããããªè§£æ±ºæ¹æ³ãã¿ããã®ã§ãã + ã«ã¼ãã«éçºã§ãããã¯åãã§ããã¡ã³ããéã¨ã¬ãã¥ã¼ã¢éã¯ã + åé¡ã解決ããè§£ã®èå¾ã«ãªãæèããã»ã¹ãè¦ããã¨ã¯æãã¾ããã + å½¼ãã¯åç´ã§ãããããªè§£æ±ºæ¹æ³ãè¦ããã®ã§ãã ãããããªè§£ã説æããã®ã¨ãã³ãã¥ããã£ã¨å ±ã«ä»äºãããæªè§£æ±ºã®ä»äºã è°è«ãããã¨ã®ãã©ã³ã¹ããã¼ãããã®ã¯é£ããããããã¾ããã ã§ããããéçºããã»ã¹ã®æ©ææ®µéã§æ¹åã®ããã®ãã£ã¼ãããã¯ããããã -ãã«ããã®ãããã§ããã夿´ç¹ãå°ããé¨åã«åå²ãã¦å ¨ä½ã§ã¯ã¾ã 宿ã -ã¦ããªãä»äºã(é¨åçã«)åãè¾¼ãã§ããããããã«ãããã¨ããããã¨ã§ãã +ãã«ããã®ãè¯ãã§ããã夿´ç¹ãå°ããé¨åã«åå²ãã¦å ¨ä½ã§ã¯ã¾ã 宿ã +ã¦ããªãä»äºã(é¨åçã«)åãè¾¼ãã§ããããããã«ãããã¨ãè¯ããã¨ã§ãã ã¾ããã§ãä¸ãã£ã¦ããªããã®ãã"å°æ¥ç´ã" ãããªãããããæ¬æµã«å«ã ã¦ãããããã«éã£ã¦ããããã¯åãä»ããããªããã¨ãçè§£ãã¦ãã ããã
@@ -629,7 +635,7 @@ Linux ã«ã¼ãã«ã³ãã¥ããã£ã¯ãä¸åº¦ã«å¤§éã®ã³ã¼ãã®å¡ãå - ãã¹ãçµæ ããã«ã¤ãã¦å ¨ã¦ãã©ã®ããã«ããã¹ããã«ã¤ãã¦ã®è©³ç´°ã¯ã以ä¸ã®ããã¥ã¡ -ã³ãã® ChangeLog ã»ã¯ã·ã§ã³ãã¿ã¦ãã ãã- +ã³ãã® ChangeLog ã»ã¯ã·ã§ã³ãè¦ã¦ãã ãã- "The Perfect Patch" http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .1 +EXTRAVERSION = .2 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
block/ll_rw_blk.c +3 -5
@@ -819,7 +819,6 @@ static int __blk_free_tags(struct blk_queue_tag *bqt) retval =atomic_dec_and_test (&bqt->refcnt);if (retval) {BUG_ON (bqt->busy); -BUG_ON (!list_empty (&bqt->busy_list));kfree (bqt->tag_index); bqt->tag_index =NULL ;
@@ -931,7 +930,6 @@ static struct blk_queue_tag *__blk_queue_init_tags(struct request_queue *q,if (init_tag_map (q, tags, depth)) goto fail; -INIT_LIST_HEAD (&tags->busy_list); tags->busy =0 ;atomic_set (&tags->refcnt,1 );return tags;
@@ -982,6 +980,7 @@ int blk_queue_init_tags(struct request_queue *q, int depth,*/ q->queue_tags = tags; q->queue_flags |= (1 <<QUEUE_FLAG_QUEUED ); +INIT_LIST_HEAD (&q->tag_busy_list);return 0 ; fail:kfree (tags);
@@ -1152,7 +1151,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq) rq->tag = tag; bqt->tag_index[tag] = rq;blkdev_dequeue_request (rq); -list_add (&rq->queuelist, &bqt->busy_list); +list_add (&rq->queuelist, &q->tag_busy_list); bqt->busy++;return 0 ; }
@@ -1173,11 +1172,10 @@ EXPORT_SYMBOL(blk_queue_start_tag);**/ void blk_queue_invalidate_tags (struct request_queue *q) { -struct blk_queue_tag *bqt = q->queue_tags;struct list_head *tmp, *n;struct request *rq; -list_for_each_safe (tmp, n, &bqt->busy_list) { +list_for_each_safe (tmp, n, &q->tag_busy_list) { rq =list_entry_rq (tmp);if (rq->tag ==-1 ) {
fs/locks.c +11 -0
@@ -694,11 +694,20 @@ EXPORT_SYMBOL(posix_test_lock);* Note: the above assumption may not be true when handling lock requests * from a broken NFS client. But broken NFS clients have a lot more to * worry about than proper deadlock detection anyway... --okir +* +* However, the failure of this assumption (also possible in the case of +* multiple tasks sharing the same open file table) also means there's no +* guarantee that the loop below will terminate. As a hack, we give up +* after a few iterations. */ + +#define MAX_DEADLK_ITERATIONS 10 +static int posix_locks_deadlock (struct file_lock *caller_fl,struct file_lock *block_fl) {struct list_head *tmp; +int i =0 ; next_task:if (posix_same_owner (caller_fl, block_fl))
@@ -706,6 +715,8 @@ next_task:list_for_each (tmp, &blocked_list) { struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);if (posix_same_owner (fl, block_fl)) { +if (i++ >MAX_DEADLK_ITERATIONS ) +return 0 ; fl = fl->fl_next; block_fl = fl; goto next_task;
fs/proc/array.c +4 -2
@@ -351,7 +351,8 @@ static cputime_t task_utime(struct task_struct *p) } utime = (clock_t )temp; -return clock_t_to_cputime (utime); + p->prev_utime =max (p->prev_utime,clock_t_to_cputime (utime)); +return p->prev_utime; }static cputime_t task_stime (struct task_struct *p)
@@ -366,7 +367,8 @@ static cputime_t task_stime(struct task_struct *p) stime =nsec_to_clock_t (p->se.sum_exec_runtime) -cputime_to_clock_t (task_utime (p)); - return clock_t_to_cputime(stime); + p->prev_stime =max (p->prev_stime,clock_t_to_cputime (stime)); + return p->prev_stime; }#endif
fs/splice.c +1 -1
@@ -1390,10 +1390,10 @@ static int pipe_to_user(struct pipe_inode_info *pipe, struct pipe_buffer *buf,if (copy_to_user (sd->u.userptr, src + buf->offset, sd->len)) ret = -EFAULT ; + buf->ops->unmap (pipe, buf, src); out:if (ret >0 ) sd->u.userptr += ret; - buf->ops->unmap (pipe, buf, src);return ret; }
include/linux/blkdev.h +1 -1
@@ -356,7 +356,6 @@ enum blk_queue_state {struct blk_queue_tag {struct request **tag_index;/* map of busy tags */ unsigned long *tag_map;/* bit map of free/busy tags */ -struct list_head busy_list;/* fifo list of busy tags */ int busy;/* current depth */ int max_depth;/* what we will send to device */ int real_max_depth;/* what the array can hold */
@@ -451,6 +450,7 @@ struct request_queueunsigned int dma_alignment;struct blk_queue_tag *queue_tags; +struct list_head tag_busy_list;unsigned int nr_sorted;unsigned int in_flight;
include/linux/sched.h +1 -0
@@ -1022,6 +1022,7 @@ struct task_struct {unsigned int rt_priority;cputime_t utime, stime; +cputime_t prev_utime, prev_stime;unsigned long nvcsw, nivcsw;/* context switch counts */ struct timespec start_time;/* monotonic time */ struct timespec real_start_time;/* boot based time */
kernel/fork.c +2 -0
@@ -1045,6 +1045,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->utime = cputime_zero; p->stime = cputime_zero; + p->prev_utime = cputime_zero; + p->prev_stime = cputime_zero;#ifdef CONFIG_TASK_XACCT p->rchar =0 ;/* I/O counter: bytes read */
kernel/futex_compat.c +20 -7
@@ -29,6 +29,15 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,return 0 ; } +static void __user *futex_uaddr (struct robust_list *entry, +compat_long_t futex_offset) +{ +compat_uptr_t base =ptr_to_compat (entry); +void __user *uaddr =compat_ptr (base + futex_offset); + +return uaddr; +} +/* * Walk curr->robust_list (very carefully, it's a userspace list!) * and mark any locks found there dead, and notify any waiters.
@@ -75,11 +84,13 @@ void compat_exit_robust_list(struct task_struct *curr)* A pending lock might already be on the list, so * dont process it twice: */ -if (entry != pending) -if (handle_futex_death ((void __user *)entry + futex_offset, - curr, pi)) -return ; +if (entry != pending) { +void __user *uaddr =futex_uaddr (entry, + futex_offset); +if (handle_futex_death (uaddr, curr, pi)) +return ; + }if (rc)return ; uentry = next_uentry;
@@ -93,9 +104,11 @@ void compat_exit_robust_list(struct task_struct *curr)cond_resched (); } -if (pending) -handle_futex_death ((void __user *)pending + futex_offset, - curr, pip); +if (pending) { +void __user *uaddr =futex_uaddr (pending, futex_offset); + +handle_futex_death (uaddr, curr, pip); + } }asmlinkage long
kernel/lockdep.c +5 -5
@@ -1521,7 +1521,7 @@ cache_hit: }static int validate_chain (struct task_struct *curr,struct lockdep_map *lock, -struct held_lock *hlock,int chain_head) +struct held_lock *hlock,int chain_head,u64 chain_key) {/* * Trylock needs to maintain the stack of held locks, but it
@@ -1534,7 +1534,7 @@ static int validate_chain(struct task_struct *curr, struct lockdep_map *lock,* graph_lock for us) */ if (!hlock->trylock && (hlock->check ==2 ) && -lookup_chain_cache (curr->curr_chain_key, hlock->class)) { +lookup_chain_cache (chain_key, hlock->class)) {/* * Check whether last held lock: *
@@ -1576,7 +1576,7 @@ static int validate_chain(struct task_struct *curr, struct lockdep_map *lock,#else static inline int validate_chain (struct task_struct *curr,struct lockdep_map *lock,struct held_lock *hlock, -int chain_head) +int chain_head,u64 chain_key) {return 1 ; }
@@ -2450,11 +2450,11 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, chain_head =1 ; } chain_key =iterate_chain_key (chain_key, id); - curr->curr_chain_key = chain_key; -if (!validate_chain (curr, lock, hlock, chain_head)) +if (!validate_chain (curr, lock, hlock, chain_head, chain_key))return 0 ; + curr->curr_chain_key = chain_key; curr->lockdep_depth++;check_chain_key (curr);#ifdef CONFIG_DEBUG_LOCKDEP
kernel/params.c +6 -3
@@ -595,13 +595,16 @@ static void __init param_sysfs_builtin(void)for (i=0 ; i < __stop___param - __start___param; i++) {char *dot; +size_t max_name_len; kp = &__start___param[i]; + max_name_len = +min_t (size_t,MAX_KBUILD_MODNAME ,strlen (kp->name)); -/* We do not handle args without periods. */ - dot =memchr (kp->name,'.' ,MAX_KBUILD_MODNAME ); + dot =memchr (kp->name,'.' , max_name_len);if (!dot) { -DEBUGP ("couldn't find period in %s\n" , kp->name); +DEBUGP ("couldn't find period in first %d characters " +"of %s\n" ,MAX_KBUILD_MODNAME , kp->name);continue ; } name_len = dot - kp->name;
kernel/softlockup.c +4 -3
@@ -80,10 +80,11 @@ void softlockup_tick(void) print_timestamp =per_cpu (print_timestamp, this_cpu);/* report at most once a second */ -if (print_timestamp < (touch_timestamp +1 ) || - did_panic || - !per_cpu (watchdog_task, this_cpu)) +if ((print_timestamp >= touch_timestamp && + print_timestamp < (touch_timestamp +1 )) || + did_panic || !per_cpu (watchdog_task, this_cpu)) {return ; + }/* do not print during early bootup: */ if (unlikely (system_state !=SYSTEM_RUNNING )) {
mm/filemap.c +2 -11
@@ -1312,7 +1312,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) size = (i_size_read (inode) +PAGE_CACHE_SIZE -1 ) >>PAGE_CACHE_SHIFT ;if (vmf->pgoff >= size) - goto outside_data_content; +return VM_FAULT_SIGBUS ;/* If we don't want any read-ahead, don't bother */ if (VM_RandomReadHint (vma))
@@ -1389,7 +1389,7 @@ retry_find:if (unlikely (vmf->pgoff >= size)) {unlock_page (page);page_cache_release (page); - goto outside_data_content; +return VM_FAULT_SIGBUS ; }/*
@@ -1400,15 +1400,6 @@ retry_find: vmf->page = page;return ret |VM_FAULT_LOCKED ; -outside_data_content: -/* -* An external ptracer can access pages that normally aren't -* accessible.. -*/ -if (vma->vm_mm == current->mm) -return VM_FAULT_SIGBUS ; - -/* Fall through to the non-read-ahead case */ no_cached_page:/* * We're only likely to ever get here if MADV_RANDOM is in
mm/page-writeback.c +3 -1
@@ -672,8 +672,10 @@ retry: ret = (*writepage)(page, wbc, data); -if (unlikely (ret ==AOP_WRITEPAGE_ACTIVATE )) +if (unlikely (ret ==AOP_WRITEPAGE_ACTIVATE )) {unlock_page (page); + ret =0 ; + }if (ret || (--(wbc->nr_to_write) <=0 )) done =1 ;if (wbc->nonblocking &&bdi_write_congested (bdi)) {
mm/shmem.c +15 -0
@@ -916,6 +916,21 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)struct inode *inode;BUG_ON (!PageLocked (page)); +/* +* shmem_backing_dev_info's capabilities prevent regular writeback or +* sync from ever calling shmem_writepage; but a stacking filesystem +* may use the ->writepage of its underlying filesystem, in which case +* we want to do nothing when that underlying filesystem is tmpfs +* (writing out to swap is useful as a response to memory pressure, but +* of no use to stabilize the data) - just redirty the page, unlock it +* and claim success in this case. AOP_WRITEPAGE_ACTIVATE, and the +* page_mapped check below, must be avoided unless we're in reclaim. +*/ +if (!wbc->for_reclaim) { +set_page_dirty (page); +unlock_page (page); +return 0 ; + }BUG_ON (page_mapped (page)); mapping = page->mapping;
mm/slub.c +1 -21
@@ -1501,28 +1501,8 @@ new_slab: page =new_slab (s, gfpflags, node);if (page) { cpu =smp_processor_id (); -if (s->cpu_slab[cpu]) { -/* -* Someone else populated the cpu_slab while we -* enabled interrupts, or we have gotten scheduled -* on another cpu. The page may not be on the -* requested node even if __GFP_THISNODE was -* specified. So we need to recheck. -*/ -if (node ==-1 || -page_to_nid (s->cpu_slab[cpu]) == node) { -/* -* Current cpuslab is acceptable and we -* want the current one since its cache hot -*/ -discard_slab (s, page); - page = s->cpu_slab[cpu]; -slab_lock (page); - goto load_freelist; - } -/* New slab does not fit our expectations */ +if (s->cpu_slab[cpu])flush_slab (s, s->cpu_slab[cpu], cpu); - }slab_lock (page);SetSlabFrozen (page); s->cpu_slab[cpu] = page;
Re: Linux 2.6.23.2
In reply to Greg Kroah-HartmanQuoted 5 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.2 kernel. It contains a number of bugfixes for the core kernel code.
I'll also be replying to this message with a copy of the patch between 2.6.23.1 and 2.6.23.2
..
Quoted 2 lines
Tsugikazu Shibata (1):
HOWTO: update ja_JP/HOWTO with latest changes
..
So what is the magic command to apply this patch successfully? It keeps rejecting the Documentation/ja_JP/HOWTO updates here.
Re: Linux 2.6.23.2
Quoted 5 lines · Mark Lord
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.2 kernel. It contains a number of bugfixes for the core kernel code. I'll also be replying to this message with a copy of the patch between 2.6.23.1 and 2.6.23.2
Quoted 7 lines
..
Quoted 2 lines
Tsugikazu Shibata (1):
HOWTO: update ja_JP/HOWTO with latest changes..
So what is the magic command to apply this patch successfully? It keeps rejecting the
Documentation/ja_JP/HOWTOupdates here.
Hammer GIT coders into sensibility to add proper MIME headers on these patch post. Then, perhaps, things will just work. (and postmaster won't get tons of rejects..)
/Matti Aarnio -- one of <[email protected]>
Re: Linux 2.6.23.2
Quoted 9 lines · Matti Aarnio
Quoted 8 lines · Mark Lord
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.2 kernel. It contains a number of bugfixes for the core kernel code. I'll also be replying to this message with a copy of the patch between 2.6.23.1 and 2.6.23.2
..
Quoted 2 lines
Tsugikazu Shibata (1):
HOWTO: update ja_JP/HOWTO with latest changes
Quoted 7 lines
Quoted 4 lines
..
So what is the magic command to apply this patch successfully? It keeps rejecting the
Documentation/ja_JP/HOWTOupdates here.Hammer GIT coders into sensibility to add proper MIME headers on these patch post. Then, perhaps, things will just work.
What is the proper encoding for a patch that contains hunks in multiple character sets?
Signature · 1 line
Mathematics is the supreme nostalgia of our time.
Re: Linux 2.6.23.2
Quoted 2 lines · Matt Mackall
What is the proper encoding for a patch that contains hunks in multiple character sets?
That should only happen when we're fixing legacy crap to become UTF-8 -- and in that case, it's probably best to just handle it with a git-pull rather than mailing patches around.
Normally, we should see only UTF-8 in patches.
Signature · 1 line
dwmw2
Re: Linux 2.6.23.2
In reply to Matt MackallQuoted 2 lines · Matt Mackall
What is the proper encoding for a patch that contains hunks in multiple character sets?
8-bit binary encoding, the same for single charset patch - we don't want mail systems to change the encoding.
Unfortunately you can't display anything like that inline I think. That means email may be unreliable in such cases (except maybe when both sides use UTF-8 and the patch contains only UTF-8), git/ftp/etc. will be fine.
Signature · 1 line
Krzysztof Halasa
Re: Linux 2.6.23.2
In reply to Matti AarnioQuoted 9 lines · Matti Aarnio
Quoted 8 lines · Mark Lord
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.2 kernel. It contains a number of bugfixes for the core kernel code. I'll also be replying to this message with a copy of the patch between 2.6.23.1 and 2.6.23.2
..
Quoted 2 lines
Tsugikazu Shibata (1):
HOWTO: update ja_JP/HOWTO with latest changes
Quoted 8 lines
Quoted 4 lines
..
So what is the magic command to apply this patch successfully? It keeps rejecting the
Documentation/ja_JP/HOWTOupdates here.Hammer GIT coders into sensibility to add proper MIME headers on these patch post. Then, perhaps, things will just work. (and postmaster won't get tons of rejects..)
GIT was only involved in creating the raw patch, which was then compressed with gzip, then uncompressed and directly included in vim into a raw email message when then mutt sent out.
So, if the mime headers were wrong on the patch that I sent out, it is mutts fault, not git.
If you are trying to apply the patch directly from somewhere else, where did it come from?
thanks,
greg k-h
Linux 2.6.23.3
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.3 kernel. It contains a number of bugfixes for a number of architecture specific issues.
I'll also be replying to this message with a copy of the patch between 2.6.23.2 and 2.6.23.3
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 - arch/i386/boot/boot.h | 8 ++-- arch/i386/boot/header.S | 62 +++++++++++++++++++++++---------- arch/i386/boot/video-bios.c | 2 - arch/i386/boot/video-vesa.c | 2 - arch/i386/boot/video.c | 2 - arch/i386/kernel/tsc.c | 5 +- arch/i386/xen/enlighten.c | 57 ++++++++++++++++++++---------- arch/i386/xen/mmu.c | 29 +++++++++++++-- arch/i386/xen/multicalls.c | 29 +++++++++++++-- arch/i386/xen/multicalls.h | 3 + arch/i386/xen/xen-ops.h | 1 arch/mips/mm/c-r4k.c | 21 +++++++++-- arch/powerpc/math-emu/math.c | 13 ++++-- arch/powerpc/platforms/cell/axon_msi.c | 4 +- arch/sparc64/kernel/sys_sparc.c | 2 - arch/sparc64/lib/xor.S | 12 +++--- arch/um/Makefile | 3 + arch/um/include/common-offsets.h | 1 arch/um/include/sysdep-i386/stub.h | 3 - arch/um/kernel/skas/clone.c | 1 arch/um/os-Linux/main.c | 1 arch/um/os-Linux/skas/mem.c | 1 arch/um/os-Linux/skas/process.c | 2 - arch/um/os-Linux/start_up.c | 1 arch/um/os-Linux/tt.c | 1 arch/um/os-Linux/util.c | 38 ++++++++++++++++++++ arch/um/sys-i386/user-offsets.c | 6 +-- arch/um/sys-x86_64/user-offsets.c | 9 ---- arch/x86_64/mm/init.c | 6 --- arch/x86_64/mm/pageattr.c | 9 +++- fs/xfs/linux-2.6/xfs_buf.c | 13 ++++++ include/asm-mips/hazards.h | 54 ++++++++++++++++++++++++++++ include/linux/bootmem.h | 1 include/xen/interface/vcpu.h | 5 +- mm/sparse.c | 11 ----- 36 files changed, 308 insertions(+), 112 deletions(-)
Summary of changes from v2.6.23.2 to v2.6.23.3
==============================================
Chris Wright (1):
Fix sparc64 MAP_FIXED handling of framebuffer mmaps
Dave Johnson (1):
x86: fix TSC clock source calibration error
David Miller (1):
Fix sparc64 niagara optimized RAID xor asm
Greg Kroah-Hartman (1):
Linux 2.6.23.3
H. Peter Anvin (2):
x86 setup: handle boot loaders which set up the stack incorrectly x86 setup: sizeof() is unsigned, unbreak comparisons
Ingo Molnar (1):
x86: fix global_flush_tlb() bug
Jeff Dike (3):
UML - Stop using libc asm/page.h
UML - Fix kernel vs libc symbols clash
UML - stop using libc asm/user.h
Jeremy Fitzhardinge (4):
xen: add batch completion callbacks
xen: deal with stale cr3 values when unpinning pagetables
xen: fix incorrect vcpu_register_vcpu_info hypercall argument
xfs: eagerly remove vmap mappings to avoid upsetting Xen
Kumar Gala (1):
POWERPC: Fix handling of stfiwx math emulation
Lepton Wu (1):
UML - kill subprocesses on exit
Linus Torvalds (1):
revert "x86_64: allocate sparsemem memmap above 4G"
Michael Ellerman (1):
POWERPC: Make sure to of_node_get() the result of pci_device_to_OF_node()
Ralf Baechle (2):
MIPS: MT: Fix bug in multithreaded kernels.
MIPS: R1: Fix hazard barriers to make kernels work on R2 also.
Re: Linux 2.6.23.3
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .2 +EXTRAVERSION = .3 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
arch/i386/boot/boot.h +4 -4
@@ -17,6 +17,8 @@#ifndef BOOT_BOOT_H #define BOOT_BOOT_H +#define STACK_SIZE 512/* Minimum number of bytes for stack */ +#ifndef __ASSEMBLY__#include <stdarg.h>
@@ -198,8 +200,6 @@ static inline int isdigit(int ch) }/* Heap -- available for dynamic lists. */ -#define STACK_SIZE 512/* Minimum number of bytes for stack */ -extern char _end[];extern char *HEAP ;extern char *heap_end;
@@ -216,9 +216,9 @@ static inline char *__get_heap(size_t s, size_t a, size_t n)#define GET_HEAP (type, n) \ ((type *)__get_heap(sizeof(type),__alignof__(type),(n))) -static inline int heap_free (void ) +static inline bool heap_free (size_t n) { -return heap_end-HEAP ; +return (int )(heap_end-HEAP ) >= (int )n; }/* copy.S */
arch/i386/boot/header.S +44 -18
79 lines not on this page · raw message
arch/i386/boot/video-bios.c +1 -1
@@ -79,7 +79,7 @@ static int bios_probe(void) video_bios.modes = GET_HEAP(struct mode_info, 0);for (mode =0x14 ; mode <=0x7f ; mode++) { -if (heap_free () <sizeof (struct mode_info )) +if (!heap_free (sizeof (struct mode_info )))break ;if (mode_defined (VIDEO_FIRST_BIOS +mode))
arch/i386/boot/video-vesa.c +1 -1
@@ -57,7 +57,7 @@ static int vesa_probe(void)while ((mode =rdfs16 (mode_ptr)) !=0xffff ) { mode_ptr +=2 ; -if (heap_free () <sizeof (struct mode_info )) +if (!heap_free (sizeof (struct mode_info )))break ;/* Heap full, can't save mode info */ if (mode & ~0x1ff )
arch/i386/boot/video.c +1 -1
@@ -371,7 +371,7 @@ static void save_screen(void) saved.curx = boot_params.screen_info.orig_x; saved.cury = boot_params.screen_info.orig_y; -if (heap_free () < saved.x*saved.y*sizeof (u16)+512 ) +if (!heap_free (saved.x*saved.y*sizeof (u16)+512 ))return ;/* Not enough heap to save the screen */ saved.data =GET_HEAP (u16, saved.x*saved.y);
arch/i386/kernel/tsc.c +2 -3
@@ -137,7 +137,7 @@ unsigned long native_calculate_cpu_khz(void) {unsigned long long start, end;unsigned long count; -u64 delta64; +u64 delta64 = (u64 )ULLONG_MAX ;int i;unsigned long flags;
@@ -149,6 +149,7 @@ unsigned long native_calculate_cpu_khz(void)rdtscll (start);mach_countup (&count);rdtscll (end); + delta64 =min (delta64, (end - start)); }/* * Error: ECTCNEVERSET
@@ -159,8 +160,6 @@ unsigned long native_calculate_cpu_khz(void)if (count <=1 ) goto err; - delta64 = end - start; -/* cpu freq too fast: */ if (delta64 > (1ULL <<32 )) goto err;
arch/i386/xen/enlighten.c +39 -18
91 lines not on this page · raw message
arch/i386/xen/mmu.c +26 -3
@@ -515,20 +515,43 @@ static void drop_other_mm_ref(void *info)if (__get_cpu_var (cpu_tlbstate).active_mm == mm)leave_mm (smp_processor_id ()); + +/* If this cpu still has a stale cr3 reference, then make sure +it has been flushed. */ +if (x86_read_percpu (xen_current_cr3) ==__pa (mm->pgd)) { +load_cr3 (swapper_pg_dir); +arch_flush_lazy_cpu_mode (); + } }static void drop_mm_ref (struct mm_struct *mm) { +cpumask_t mask; +unsigned cpu; +if (current->active_mm == mm) {if (current->mm == mm)load_cr3 (swapper_pg_dir);else leave_mm (smp_processor_id ()); +arch_flush_lazy_cpu_mode (); + } + +/* Get the "official" set of cpus referring to our pagetable. */ + mask = mm->cpu_vm_mask; + +/* It's possible that a vcpu may have a stale reference to our +cr3, because its in lazy mode, and it hasn't yet flushed +its set of pending hypercalls yet. In this case, we can +look at its actual current cr3 value, and force it to flush +if needed. */ +for_each_online_cpu (cpu) { +if (per_cpu (xen_current_cr3, cpu) ==__pa (mm->pgd)) +cpu_set (cpu, mask); } -if (!cpus_empty (mm->cpu_vm_mask)) -xen_smp_call_function_mask (mm->cpu_vm_mask, drop_other_mm_ref, - mm,1 ); +if (!cpus_empty (mask)) +xen_smp_call_function_mask (mask, drop_other_mm_ref, mm,1 ); }#else static void drop_mm_ref (struct mm_struct *mm)
arch/i386/xen/multicalls.c +26 -3
@@ -32,7 +32,11 @@struct mc_buffer {struct multicall_entry entries[MC_BATCH ];u64 args[MC_ARGS ]; -unsigned mcidx, argidx; +struct callback { +void (*fn)(void *); +void *data; + } callbacks[MC_BATCH ]; +unsigned mcidx, argidx, cbidx; }; static DEFINE_PER_CPU(struct mc_buffer, mc_buffer);
@@ -43,6 +47,7 @@ void xen_mc_flush(void)struct mc_buffer *b = &__get_cpu_var (mc_buffer);int ret =0 ;unsigned long flags; +int i;BUG_ON (preemptible ());
@@ -51,8 +56,6 @@ void xen_mc_flush(void)local_irq_save (flags);if (b->mcidx) { -int i; -if (HYPERVISOR_multicall (b->entries, b->mcidx) !=0 )BUG ();for (i =0 ; i < b->mcidx; i++)
@@ -65,6 +68,13 @@ void xen_mc_flush(void)local_irq_restore (flags); +for (i =0 ; i < b->cbidx; i++) { +struct callback *cb = &b->callbacks[i]; + + (*cb->fn)(cb->data); + } + b->cbidx =0 ; +BUG_ON (ret); }
@@ -88,3 +98,16 @@ struct multicall_space __xen_mc_entry(size_t args)return ret; } + +void xen_mc_callback (void (*fn)(void *),void *data) +{ +struct mc_buffer *b = &__get_cpu_var (mc_buffer); +struct callback *cb; + +if (b->cbidx ==MC_BATCH ) +xen_mc_flush (); + + cb = &b->callbacks[b->cbidx++]; + cb->fn = fn; + cb->data = data; +}
arch/i386/xen/multicalls.h +3 -0
@@ -42,4 +42,7 @@ static inline void xen_mc_issue(unsigned mode) local_irq_restore(x86_read_percpu(xen_mc_irq_flags)); } +/* Set up a callback to be called when the current batch is flushed */ +void xen_mc_callback (void (*fn)(void *),void *data); +#endif /* _XEN_MULTICALLS_H */
arch/i386/xen/xen-ops.h +1 -0
@@ -11,6 +11,7 @@ void xen_copy_trap_info(struct trap_info *traps); DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); DECLARE_PER_CPU(unsigned long, xen_cr3); +DECLARE_PER_CPU(unsigned long, xen_current_cr3);extern struct start_info *xen_start_info;extern struct shared_info *HYPERVISOR_shared_info;
arch/mips/mm/c-r4k.c +18 -3
@@ -360,11 +360,26 @@ static void r4k___flush_cache_all(void)r4k_on_each_cpu (local_r4k___flush_cache_all,NULL ,1 ,1 ); } +static inline int has_valid_asid (const struct mm_struct *mm) +{ +#if defined(CONFIG_MIPS_MT_SMP ) || defined(CONFIG_MIPS_MT_SMTC ) +int i; + +for_each_online_cpu (i) +if (cpu_context (i, mm)) +return 1 ; + +return 0 ; +#else +return cpu_context (smp_processor_id (), mm); +#endif +} +static inline void local_r4k_flush_cache_range (void * args) {struct vm_area_struct *vma = args; -if (!(cpu_context (smp_processor_id (), vma->vm_mm))) +if (!(has_valid_asid (vma->vm_mm)))return ;r4k_blast_dcache ();
@@ -383,7 +398,7 @@ static inline void local_r4k_flush_cache_mm(void * args) {struct mm_struct *mm = args; -if (!cpu_context (smp_processor_id (), mm)) +if (!has_valid_asid (mm))return ;/*
@@ -434,7 +449,7 @@ static inline void local_r4k_flush_cache_page(void *args)* If ownes no valid ASID yet, cannot possibly have gotten * this page into the cache. */ -if (cpu_context (smp_processor_id (), mm) ==0 ) +if (!has_valid_asid (mm))return ; addr &=PAGE_MASK ;
arch/powerpc/math-emu/math.c +9 -4
@@ -407,11 +407,16 @@ do_mathemu(struct pt_regs *regs)case XE : idx = (insn >>16 ) &0x1f ; -if (!idx) - goto illegal; - op0 = (void *)¤t->thread.fpr[(insn >>21 ) &0x1f ]; - op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >>11 ) &0x1f ]); +if (!idx) { +if (((insn >>1 ) &0x3ff ) ==STFIWX ) + op1 = (void *)(regs->gpr[(insn >>11 ) &0x1f ]); +else + goto illegal; + }else { + op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >>11 ) &0x1f ]); + } +break ;case XEU :
arch/powerpc/platforms/cell/axon_msi.c +2 -2
@@ -126,7 +126,7 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)const phandle *ph;struct axon_msic *msic =NULL ; - dn =pci_device_to_OF_node (dev); + dn =of_node_get (pci_device_to_OF_node (dev));if (!dn) {dev_dbg (&dev->dev,"axon_msi: no pci_dn found\n" );return NULL ;
@@ -183,7 +183,7 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)int len;const u32 *prop; - dn =pci_device_to_OF_node (dev); + dn =of_node_get (pci_device_to_OF_node (dev));if (!dn) {dev_dbg (&dev->dev,"axon_msi: no pci_dn found\n" );return -ENODEV ;
arch/sparc64/kernel/sys_sparc.c +1 -1
@@ -319,7 +319,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, uif (flags &MAP_FIXED ) {/* Ok, don't mess with it. */ -return get_unmapped_area (NULL , addr, len, pgoff, flags); +return get_unmapped_area (NULL , orig_addr, len, pgoff, flags); } flags &= ~MAP_SHARED ;
arch/sparc64/lib/xor.S +6 -6
@@ -491,12 +491,12 @@ xor_niagara_4: /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ ldda [%i1 + 0x10] %asi, %i2 /* %i2/%i3 = src1 + 0x10 */ xor %g2, %i4, %g2 xor %g3, %i5, %g3 - ldda [%i7 + 0x10] %asi, %i4 /* %i4/%i5 = src2 + 0x10 */ + ldda [%l7 + 0x10] %asi, %i4 /* %i4/%i5 = src2 + 0x10 */ xor %l0, %g2, %l0 xor %l1, %g3, %l1 stxa %l0, [%i0 + 0x00] %asi stxa %l1, [%i0 + 0x08] %asi - ldda [%i6 + 0x10] %asi, %g2 /* %g2/%g3 = src3 + 0x10 */ + ldda [%l6 + 0x10] %asi, %g2 /* %g2/%g3 = src3 + 0x10 */ ldda [%i0 + 0x10] %asi, %l0 /* %l0/%l1 = dest + 0x10 */ xor %i4, %i2, %i4
@@ -504,12 +504,12 @@ xor_niagara_4: /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ ldda [%i1 + 0x20] %asi, %i2 /* %i2/%i3 = src1 + 0x20 */ xor %g2, %i4, %g2 xor %g3, %i5, %g3 - ldda [%i7 + 0x20] %asi, %i4 /* %i4/%i5 = src2 + 0x20 */ + ldda [%l7 + 0x20] %asi, %i4 /* %i4/%i5 = src2 + 0x20 */ xor %l0, %g2, %l0 xor %l1, %g3, %l1 stxa %l0, [%i0 + 0x10] %asi stxa %l1, [%i0 + 0x18] %asi - ldda [%i6 + 0x20] %asi, %g2 /* %g2/%g3 = src3 + 0x20 */ + ldda [%l6 + 0x20] %asi, %g2 /* %g2/%g3 = src3 + 0x20 */ ldda [%i0 + 0x20] %asi, %l0 /* %l0/%l1 = dest + 0x20 */ xor %i4, %i2, %i4
@@ -517,12 +517,12 @@ xor_niagara_4: /* %o0=bytes, %o1=dest, %o2=src1, %o3=src2, %o4=src3 */ ldda [%i1 + 0x30] %asi, %i2 /* %i2/%i3 = src1 + 0x30 */ xor %g2, %i4, %g2 xor %g3, %i5, %g3 - ldda [%i7 + 0x30] %asi, %i4 /* %i4/%i5 = src2 + 0x30 */ + ldda [%l7 + 0x30] %asi, %i4 /* %i4/%i5 = src2 + 0x30 */ xor %l0, %g2, %l0 xor %l1, %g3, %l1 stxa %l0, [%i0 + 0x20] %asi stxa %l1, [%i0 + 0x28] %asi - ldda [%i6 + 0x30] %asi, %g2 /* %g2/%g3 = src3 + 0x30 */ + ldda [%l6 + 0x30] %asi, %g2 /* %g2/%g3 = src3 + 0x30 */ ldda [%i0 + 0x30] %asi, %l0 /* %l0/%l1 = dest + 0x30 */ prefetch [%i1 + 0x40], #one_read
arch/um/Makefile +2 -1
@@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ - -Din6addr_loopback=kernel_in6addr_loopback + -Din6addr_loopback=kernel_in6addr_loopback \ + -Din6addr_any=kernel_in6addr_any AFLAGS += $(ARCH_INCLUDE)
arch/um/include/common-offsets.h +1 -0
@@ -10,6 +10,7 @@ OFFSET(HOST_TASK_PID, task_struct, pid);DEFINE (UM_KERN_PAGE_SIZE ,PAGE_SIZE );DEFINE (UM_KERN_PAGE_MASK ,PAGE_MASK ); +DEFINE (UM_KERN_PAGE_SHIFT ,PAGE_SHIFT );DEFINE (UM_NSEC_PER_SEC ,NSEC_PER_SEC );DEFINE_STR (UM_KERN_EMERG ,KERN_EMERG );
arch/um/include/sysdep-i386/stub.h +1 -2
@@ -9,7 +9,6 @@#include <sys/mman.h> #include <asm/ptrace.h> #include <asm/unistd.h> -#include <asm/page.h> #include "stub-data.h" #include "kern_constants.h" #include "uml-config.h"
@@ -19,7 +18,7 @@ extern void stub_clone_handler(void);#define STUB_SYSCALL_RET EAX#define STUB_MMAP_NR __NR_mmap2 -#define MMAP_OFFSET (o) ((o) >> PAGE_SHIFT) +#define MMAP_OFFSET (o) ((o) >> UM_KERN_PAGE_SHIFT)static inline long stub_syscall0 (long syscall) {
arch/um/kernel/skas/clone.c +0 -1
@@ -3,7 +3,6 @@#include <sys/mman.h> #include <sys/time.h> #include <asm/unistd.h> -#include <asm/page.h> #include "ptrace_user.h" #include "skas.h" #include "stub-data.h"
arch/um/os-Linux/main.c +0 -1
@@ -12,7 +12,6 @@#include <sys/resource.h> #include <sys/mman.h> #include <sys/user.h> -#include <asm/page.h> #include "kern_util.h" #include "as-layout.h" #include "mem_user.h"
arch/um/os-Linux/skas/mem.c +0 -1
@@ -9,7 +9,6 @@#include <unistd.h> #include <sys/mman.h> #include <sys/wait.h> -#include <asm/page.h> #include <asm/unistd.h> #include "mem_user.h" #include "mem.h"
arch/um/os-Linux/skas/process.c +1 -1
@@ -182,7 +182,7 @@ static int userspace_tramp(void *stack)ptrace (PTRACE_TRACEME ,0 ,0 ,0 ); -init_new_thread_signals (); +signal (SIGTERM ,SIG_DFL ); err =set_interval (1 );if (err) panic("userspace_tramp - setting timer failed, errno = %d\n",
arch/um/os-Linux/start_up.c +0 -1
@@ -19,7 +19,6 @@#include <sys/mman.h> #include <sys/resource.h> #include <asm/unistd.h> -#include <asm/page.h> #include <sys/types.h> #include "kern_util.h" #include "user.h"
arch/um/os-Linux/tt.c +0 -1
@@ -17,7 +17,6 @@#include <sys/mman.h> #include <asm/ptrace.h> #include <asm/unistd.h> -#include <asm/page.h> #include "kern_util.h" #include "user.h" #include "signal_kern.h"
arch/um/os-Linux/util.c +38 -0
@@ -105,6 +105,44 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...)void os_dump_core (void ) { +int pid; +signal (SIGSEGV ,SIG_DFL ); + +/* +* We are about to SIGTERM this entire process group to ensure that +* nothing is around to run after the kernel exits. The +* kernel wants to abort, not die through SIGTERM, so we +* ignore it here. +*/ + +signal (SIGTERM ,SIG_IGN ); +kill (0 ,SIGTERM ); +/* +* Most of the other processes associated with this UML are +* likely sTopped, so give them a SIGCONT so they see the +* SIGTERM. +*/ +kill (0 ,SIGCONT ); + +/* +* Now, having sent signals to everyone but us, make sure they +* die by ptrace. Processes can survive what's been done to +* them so far - the mechanism I understand is receiving a +* SIGSEGV and segfaulting immediately upon return. There is +* always a SIGSEGV pending, and (I'm guessing) signals are +* processed in numeric order so the SIGTERM (signal 15 vs +* SIGSEGV being signal 11) is never handled. +* +* Run a waitpid loop until we get some kind of error. +* Hopefully, it's ECHILD, but there's not a lot we can do if +* it's something else. Tell os_kill_ptraced_process not to +* wait for the child to report its death because there's +* nothing reasonable to do if that fails. +*/ + +while ((pid =waitpid (-1 ,NULL ,WNOHANG )) >0 ) +os_kill_ptraced_process (pid,0 ); +abort (); }
arch/um/sys-i386/user-offsets.c +3 -3
@@ -2,9 +2,9 @@#include <stddef.h> #include <signal.h> #include <sys/poll.h> +#include <sys/user.h> #include <sys/mman.h> #include <asm/ptrace.h> -#include <asm/user.h> #define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -48,8 +48,8 @@ void foo(void)OFFSET (HOST_SC_FP_ST , _fpstate, _st);OFFSET (HOST_SC_FXSR_ENV , _fpstate, _fxsr_env); -DEFINE_LONGS (HOST_FP_SIZE ,sizeof (struct user_i387_struct )); -DEFINE_LONGS (HOST_XFP_SIZE ,sizeof (struct user_fxsr_struct )); +DEFINE_LONGS (HOST_FP_SIZE ,sizeof (struct user_fpregs_struct )); +DEFINE_LONGS (HOST_XFP_SIZE ,sizeof (struct user_fpxregs_struct ));DEFINE (HOST_IP ,EIP );DEFINE (HOST_SP ,UESP );
arch/um/sys-x86_64/user-offsets.c +1 -8
@@ -3,17 +3,10 @@#include <signal.h> #include <sys/poll.h> #include <sys/mman.h> +#include <sys/user.h> #define __FRAME_OFFSETS#include <asm/ptrace.h> #include <asm/types.h> -/* For some reason, x86_64 defines u64 and u32 only in <pci/types.h>, which I -* refuse to include here, even though they're used throughout the headers. -* These are used in asm/user.h, and that include can't be avoided because of -* the sizeof(struct user_regs_struct) below. -*/ -typedef __u64 u64 ; -typedef __u32 u32 ; -#include <asm/user.h> #define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
arch/x86_64/mm/init.c +0 -6
@@ -734,12 +734,6 @@ int in_gate_area_no_task(unsigned long addr)return (addr >=VSYSCALL_START ) && (addr <VSYSCALL_END ); } -void *__init alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size) -{ -return __alloc_bootmem_core (pgdat->bdata, size, -SMP_CACHE_BYTES , (4UL *1024 *1024 *1024 ),0 ); -} -const char *arch_vma_name (struct vm_area_struct *vma) {if (vma->vm_mm && vma->vm_start == (long )vma->vm_mm->context.vdso)
arch/x86_64/mm/pageattr.c +7 -2
@@ -229,9 +229,14 @@ void global_flush_tlb(void)struct page *pg, *next;struct list_head l; -down_read (&init_mm.mmap_sem); +/* +* Write-protect the semaphore, to exclude two contexts +* doing a list_replace_init() call in parallel and to +* exclude new additions to the deferred_pages list: +*/ +down_write (&init_mm.mmap_sem);list_replace_init (&deferred_pages, &l); -up_read (&init_mm.mmap_sem); +up_write (&init_mm.mmap_sem);flush_map (&l);
fs/xfs/linux-2.6/xfs_buf.c +13 -0
@@ -187,6 +187,19 @@ free_address( {a_list_t *aentry; +#ifdef CONFIG_XEN +/* +* Xen needs to be able to make sure it can get an exclusive +* RO mapping of pages it wants to turn into a pagetable. If +* a newly allocated page is also still being vmap()ed by xfs, +* it will cause pagetable construction to fail. This is a +* quick workaround to always eagerly unmap pages so that Xen +* is happy. +*/ +vunmap (addr); +return ; +#endif + aentry =kmalloc (sizeof (a_list_t),GFP_NOWAIT );if (likely (aentry)) {spin_lock (&as_lock);
include/asm-mips/hazards.h +53 -1
70 lines not on this page · raw message
include/linux/bootmem.h +0 -1
@@ -59,7 +59,6 @@ extern void *__alloc_bootmem_core(struct bootmem_data *bdata,unsigned long align, unsigned long goal, unsigned long limit); -extern void *alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE extern void reserve_bootmem (unsigned long addr,unsigned long size);
include/xen/interface/vcpu.h +3 -2
@@ -160,8 +160,9 @@ struct vcpu_set_singleshot_timer {*/ #define VCPUOP_register_vcpu_info 10/* arg == struct vcpu_info */ struct vcpu_register_vcpu_info { -uint32_t mfn;/* mfn of page to place vcpu_info */ -uint32_t offset;/* offset within page */ +uint64_t mfn;/* mfn of page to place vcpu_info */ +uint32_t offset;/* offset within page */ +uint32_t rsvd;/* unused */ };#endif /* __XEN_PUBLIC_VCPU_H__ */
mm/sparse.c +0 -11
@@ -215,12 +215,6 @@ static int __meminit sparse_init_one_section(struct mem_section *ms,return 1 ; } -__attribute__((weak))__init -void *alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size) -{ -return NULL ; -} -static struct page __init *sparse_early_mem_map_alloc (unsigned long pnum) {struct page *map;
@@ -231,11 +225,6 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)if (map)return map; - map =alloc_bootmem_high_node (NODE_DATA (nid), -sizeof (struct page ) *PAGES_PER_SECTION ); -if (map) -return map; - map =alloc_bootmem_node (NODE_DATA (nid),sizeof (struct page ) *PAGES_PER_SECTION );if (map)
Re: Linux 2.6.23.3
In reply to Greg Kroah-HartmanQuoted 3 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.3 kernel. It contains a number of bugfixes for a number of architecture specific issues.
[.4, .5, .6 and .7 follows after .2 and .3]
I've seen the bunch of patches posted for review - split to several series. But - out of curiocity - what's the reason to roll each series into each own stable release? Can't all .2...7 be combined into a single release (not counting .8 wich contains urgent security fixes)? (I mean, not with already rolled out stuff, but the original reasoning for split-releasing them (as opposed to split-reviewing))
Thanks.
/mjt
Re: Linux 2.6.23.3
Quoted 4 lines · Michael Tokarev
Quoted 3 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.23.3 kernel. It contains a number of bugfixes for a number of architecture specific issues.
Quoted 8 lines
[.4, .5, .6 and .7 follows after .2 and .3]
I've seen the bunch of patches posted for review - split to several series. But - out of curiocity - what's the reason to roll each series into each own stable release? Can't all .2...7 be combined into a single release (not counting .8 wich contains urgent security fixes)? (I mean, not with already rolled out stuff, but the original reasoning for split-releasing them (as opposed to split-reviewing))
Is there something "sacred" about version numbers that we need to be stingy with them as they are a finite resource? :)
This way, we have specific, easy to identify points in the development process to help users in case they report problems to let the developers easily narrow down the potential problem.
That, and I couldn't think of some other way to name the -rc patches, so I used the minor version number. Because of that, I was forced to name the final releases with the same minor number to keep everyone sane over time.
thanks,
greg k-h
Linux 2.6.23.4
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.4 kernel. It contains a number of bugfixes for the core networking and wireless code.
I'll also be replying to this message with a copy of the patch between 2.6.23.3 and 2.6.23.4
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 include/linux/netlink.h | 2 include/linux/skbuff.h | 3 include/net/9p/9p.h | 12 ++ include/net/sock.h | 10 +- ipc/mqueue.c | 6 - net/8021q/vlan.c | 5 + net/ieee80211/ieee80211_crypt_tkip.c | 2 net/ieee80211/softmac/ieee80211softmac_wx.c | 2 net/ipv4/ipcomp.c | 3 net/ipv6/ipcomp6.c | 3 net/mac80211/ieee80211.c | 55 +++++++----- net/mac80211/ieee80211_ioctl.c | 11 ++ net/mac80211/ieee80211_sta.c | 128 +++++++++++----------------- net/netfilter/nf_conntrack_proto_tcp.c | 38 +++----- net/netlink/af_netlink.c | 10 +- net/sched/cls_u32.c | 4 net/sched/sch_api.c | 5 - net/sched/sch_teql.c | 3 net/socket.c | 6 + 20 files changed, 168 insertions(+), 142 deletions(-)
Summary of changes from v2.6.23.3 to v2.6.23.4
==============================================
Andy Green (2):
mac80211: Improve sanity checks on injected packets Add get_unaligned to ieee80211_get_radiotap_len
Bill Moss (1):
mac80211: honor IW_SCAN_THIS_ESSID in siwscan ioctl
David Miller (1):
Fix error returns in sys_socketpair()
Evgeniy Polyakov (1):
Fix TEQL oops.
Greg Kroah-Hartman (1):
Linux 2.6.23.4
Herbert Xu (3):
Fix SKB_WITH_OVERHEAD calculations.
TCP: Fix size calculation in sk_stream_alloc_pskb Fix crypto_alloc_comp() error checking.
Ingo Molnar (1):
Fix 9P protocol build
Johannes Berg (3):
softmac: fix wext MLME request reason code endianness
ieee80211: fix TKIP QoS bug
mac80211: reorder association debug output
John W. Linville (5):
mac80211: filter locally-originated multicast frames
mac80211: store channel info in sta_bss_list
mac80211: store SSID in sta_bss_list
mac80211: only honor IW_SCAN_THIS_ESSID in STA, IBSS, and AP modes
mac80211: make ieee802_11_parse_elems return void
Jozsef Kadlecsik (1):
NETFILTER: nf_conntrack_tcp: fix connection reopening
Patrick McHardy (4):
Fix advertised packet scheduler timer resolution Fix VLAN address syncing.
Fix SET_VLAN_INGRESS_PRIORITY_CMD error return. Fix netlink timeouts.
Radu Rendec (1):
Fix endianness bug in U32 classifier.
Tony Battersby (1):
Fix kernel_accept() return handling.
Re: Linux 2.6.23.4
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
include/linux/netlink.h +1 -1
@@ -175,7 +175,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb);/* finegrained unicast helpers: */ struct sock *netlink_getsockbyfilp (struct file *filp);int netlink_attachskb (struct sock *sk,struct sk_buff *skb,int nonblock, -long timeo,struct sock *ssk); +long *timeo,struct sock *ssk);void netlink_detachskb (struct sock *sk,struct sk_buff *skb);int netlink_sendskb (struct sock *sk,struct sk_buff *skb,int protocol);
include/linux/skbuff.h +1 -2
@@ -41,8 +41,7 @@#define SKB_DATA_ALIGN (X ) (((X) + (SMP_CACHE_BYTES - 1)) & \ ~(SMP_CACHE_BYTES - 1))#define SKB_WITH_OVERHEAD (X ) \ - (((X) - sizeof(struct skb_shared_info)) & \ - ~(SMP_CACHE_BYTES - 1)) + ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))#define SKB_MAX_ORDER (X ,ORDER ) \ SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X))#define SKB_MAX_HEAD (X ) (SKB_MAX_ORDER((X), 0))
include/net/9p/9p.h +12 -0
@@ -412,6 +412,18 @@ int p9_idpool_check(int id, struct p9_idpool *p);int p9_error_init (void );int p9_errstr2errno (char *,int ); + +#ifdef CONFIG_SYSCTL int __init p9_sysctl_register (void ); void __exit p9_sysctl_unregister(void); +#else +static inline int p9_sysctl_register (void ) +{ +return 0 ; +} +static inline void p9_sysctl_unregister (void ) +{ +} +#endif +#endif /* NET_9P_H */
include/net/sock.h +6 -4
@@ -1199,14 +1199,16 @@ static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk, gfp_t gfp) {struct sk_buff *skb; -int hdr_len; - hdr_len =SKB_DATA_ALIGN (sk->sk_prot->max_header); - skb =alloc_skb_fclone (size + hdr_len, gfp); + skb =alloc_skb_fclone (size + sk->sk_prot->max_header, gfp);if (skb) { skb->truesize += mem;if (sk_stream_wmem_schedule (sk, skb->truesize)) { -skb_reserve (skb, hdr_len); +/* +* Make sure that we have exactly size bytes +* available to the caller, no more, no less. +*/ +skb_reserve (skb,skb_tailroom (skb) - size);return skb; }__kfree_skb (skb);
ipc/mqueue.c +4 -2
@@ -1014,6 +1014,8 @@ asmlinkage long sys_mq_notify(mqd_t mqdes,return -EINVAL ; }if (notification.sigev_notify ==SIGEV_THREAD ) { +long timeo; +/* create the notify skb */ nc =alloc_skb (NOTIFY_COOKIE_LEN ,GFP_KERNEL ); ret = -ENOMEM ;
@@ -1042,8 +1044,8 @@ retry: goto out; } - ret =netlink_attachskb (sock, nc,0 , -MAX_SCHEDULE_TIMEOUT ,NULL ); + timeo =MAX_SCHEDULE_TIMEOUT ; + ret =netlink_attachskb (sock, nc,0 , &timeo,NULL );if (ret ==1 ) goto retry;if (ret) {
net/8021q/vlan.c +5 -0
@@ -629,6 +629,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,if (!vlandev)continue ; + flgs = vlandev->flags; +if (!(flgs &IFF_UP )) +continue ; +vlan_sync_address (dev, vlandev); }break ;
@@ -740,6 +744,7 @@ static int vlan_ioctl_handler(void __user *arg)vlan_dev_set_ingress_priority (dev, args.u.skb_priority, args.vlan_qos); + err =0 ;break ;case SET_VLAN_EGRESS_PRIORITY_CMD :
net/ieee80211/ieee80211_crypt_tkip.c +1 -1
@@ -584,7 +584,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)if (stype &IEEE80211_STYPE_QOS_DATA ) {const struct ieee80211_hdr_3addrqos *qoshdr = (struct ieee80211_hdr_3addrqos *)skb->data; - hdr[12 ] = qoshdr->qos_ctl &cpu_to_le16 (IEEE80211_QCTL_TID ); + hdr[12 ] =le16_to_cpu (qoshdr->qos_ctl) &IEEE80211_QCTL_TID ; }else hdr[12 ] =0 ;/* priority */
net/ieee80211/softmac/ieee80211softmac_wx.c +1 -1
@@ -469,7 +469,7 @@ ieee80211softmac_wx_set_mlme(struct net_device *dev, {struct ieee80211softmac_device *mac =ieee80211_priv (dev);struct iw_mlme *mlme = (struct iw_mlme *)extra; -u16 reason =cpu_to_le16 (mlme->reason_code); +u16 reason = mlme->reason_code;struct ieee80211softmac_network *net;int err = -EINVAL ;
net/ipv4/ipcomp.c +2 -1
@@ -17,6 +17,7 @@#include <asm/scatterlist.h> #include <asm/semaphore.h> #include <linux/crypto.h> +#include <linux/err.h> #include <linux/pfkeyv2.h> #include <linux/percpu.h> #include <linux/smp.h>
@@ -355,7 +356,7 @@ static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)for_each_possible_cpu (cpu) {struct crypto_comp *tfm =crypto_alloc_comp (alg_name,0 ,CRYPTO_ALG_ASYNC ); -if (!tfm) +if (IS_ERR (tfm)) goto error; *per_cpu_ptr (tfms, cpu) = tfm; }
net/ipv6/ipcomp6.c +2 -1
@@ -37,6 +37,7 @@#include <asm/scatterlist.h> #include <asm/semaphore.h> #include <linux/crypto.h> +#include <linux/err.h> #include <linux/pfkeyv2.h> #include <linux/random.h> #include <linux/percpu.h>
@@ -366,7 +367,7 @@ static struct crypto_comp **ipcomp6_alloc_tfms(const char *alg_name)for_each_possible_cpu (cpu) {struct crypto_comp *tfm =crypto_alloc_comp (alg_name,0 ,CRYPTO_ALG_ASYNC ); -if (!tfm) +if (IS_ERR (tfm)) goto error; *per_cpu_ptr (tfms, cpu) = tfm; }
net/mac80211/ieee80211.c +32 -23
94 lines not on this page · raw message
net/mac80211/ieee80211_ioctl.c +10 -1
@@ -687,10 +687,11 @@ static int ieee80211_ioctl_giwap(struct net_device *dev,static int ieee80211_ioctl_siwscan (struct net_device *dev,struct iw_request_info *info, -struct iw_point *data,char *extra) +union iwreq_data *wrqu,char *extra) {struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct iw_scan_req *req =NULL ;u8 *ssid =NULL ;size_t ssid_len =0 ;
@@ -715,6 +716,14 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,return -EOPNOTSUPP ; } +/* if SSID was specified explicitly then use that */ +if (wrqu->data.length ==sizeof (struct iw_scan_req ) && + wrqu->data.flags &IW_SCAN_THIS_ESSID ) { + req = (struct iw_scan_req *)extra; + ssid = req->essid; + ssid_len = req->essid_len; + } +return ieee80211_sta_req_scan (dev, ssid, ssid_len); }
net/mac80211/ieee80211_sta.c +54 -74
323 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_tcp.c +17 -21
@@ -831,6 +831,22 @@ static int tcp_packet(struct nf_conn *conntrack, tuple = &conntrack->tuplehash[dir].tuple;switch (new_state) { +case TCP_CONNTRACK_SYN_SENT : +if (old_state <TCP_CONNTRACK_TIME_WAIT ) +break ; +if ((conntrack->proto.tcp.seen[!dir].flags & +IP_CT_TCP_FLAG_CLOSE_INIT ) + || (conntrack->proto.tcp.last_dir == dir + && conntrack->proto.tcp.last_index ==TCP_RST_SET )) { +/* Attempt to reopen a closed/aborted connection. +* Delete this connection and look up again. */ +write_unlock_bh (&tcp_lock); +if (del_timer (&conntrack->timeout)) + conntrack->timeout.function ((unsigned long ) + conntrack); +return -NF_REPEAT ; + } +/* Fall through */ case TCP_CONNTRACK_IGNORE :/* Ignored packets: *
@@ -879,27 +895,6 @@ static int tcp_packet(struct nf_conn *conntrack,nf_log_packet (pf,0 , skb,NULL ,NULL ,NULL ,"nf_ct_tcp: invalid state " );return -NF_ACCEPT ; -case TCP_CONNTRACK_SYN_SENT : -if (old_state <TCP_CONNTRACK_TIME_WAIT ) -break ; -if ((conntrack->proto.tcp.seen[dir].flags & -IP_CT_TCP_FLAG_CLOSE_INIT ) - ||after (ntohl (th->seq), - conntrack->proto.tcp.seen[dir].td_end)) { -/* Attempt to reopen a closed connection. -* Delete this connection and look up again. */ -write_unlock_bh (&tcp_lock); -if (del_timer (&conntrack->timeout)) - conntrack->timeout.function ((unsigned long ) - conntrack); -return -NF_REPEAT ; - }else { -write_unlock_bh (&tcp_lock); -if (LOG_INVALID (IPPROTO_TCP )) -nf_log_packet (pf,0 , skb,NULL ,NULL , -NULL ,"nf_ct_tcp: invalid SYN" ); -return -NF_ACCEPT ; - }case TCP_CONNTRACK_CLOSE : if (index == TCP_RST_SET && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status)
@@ -932,6 +927,7 @@ static int tcp_packet(struct nf_conn *conntrack, in_window:/* From now on we have got in-window packets */ conntrack->proto.tcp.last_index = index; + conntrack->proto.tcp.last_dir = dir;pr_debug ("tcp_conntracks: " );NF_CT_DUMP_TUPLE (tuple);
net/netlink/af_netlink.c +5 -5
@@ -744,7 +744,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp)* 1: repeat lookup - reference dropped while waiting for socket memory. */ int netlink_attachskb (struct sock *sk,struct sk_buff *skb,int nonblock, -long timeo,struct sock *ssk) +long *timeo,struct sock *ssk) {struct netlink_sock *nlk;
@@ -753,7 +753,7 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,if (atomic_read (&sk->sk_rmem_alloc) > sk->sk_rcvbuf ||test_bit (0 , &nlk->state)) {DECLARE_WAITQUEUE (wait, current); -if (!timeo) { +if (!*timeo) {if (!ssk ||nlk_sk (ssk)->pid ==0 )netlink_overrun (sk);sock_put (sk);
@@ -767,7 +767,7 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,if ((atomic_read (&sk->sk_rmem_alloc) > sk->sk_rcvbuf ||test_bit (0 , &nlk->state)) && !sock_flag (sk,SOCK_DEAD )) - timeo =schedule_timeout (timeo); + *timeo =schedule_timeout (*timeo);__set_current_state (TASK_RUNNING );remove_wait_queue (&nlk->wait, &wait);
@@ -775,7 +775,7 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,if (signal_pending (current)) {kfree_skb (skb); -return sock_intr_errno (timeo); +return sock_intr_errno (*timeo); }return 1 ; }
@@ -839,7 +839,7 @@ retry:kfree_skb (skb);return PTR_ERR (sk); } - err =netlink_attachskb (sk, skb, nonblock, timeo, ssk); + err =netlink_attachskb (sk, skb, nonblock, &timeo, ssk);if (err ==1 ) goto retry;if (err)
net/sched/cls_u32.c +2 -2
@@ -91,7 +91,7 @@ static struct tc_u_common *u32_list;static __inline__unsigned u32_hash_fold (u32 key,struct tc_u32_sel *sel,u8 fshift) { -unsigned h = (key & sel->hmask)>>fshift; +unsigned h =ntohl (key & sel->hmask)>>fshift;return h; }
@@ -615,7 +615,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, n->handle = handle; {u8 i =0 ; -u32 mask = s->hmask; +u32 mask =ntohl (s->hmask);if (mask) {while (!(mask &1 )) { i++;
net/sched/sch_api.c +4 -1
@@ -1225,10 +1225,13 @@ EXPORT_SYMBOL(tcf_destroy_chain);#ifdef CONFIG_PROC_FS static int psched_show (struct seq_file *seq,void *v) { +struct timespec ts; + +hrtimer_get_res (CLOCK_MONOTONIC , &ts);seq_printf (seq,"%08x %08x %08x %08x\n" , (u32 )NSEC_PER_USEC , (u32 )PSCHED_US2NS (1 ),1000000 , - (u32 )NSEC_PER_SEC /(u32 )ktime_to_ns (KTIME_MONOTONIC_RES )); + (u32 )NSEC_PER_SEC /(u32 )ktime_to_ns (timespec_to_ktime (ts)));return 0 ; }
net/sched/sch_teql.c +3 -0
@@ -249,6 +249,9 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *static __inline__int teql_resolve (struct sk_buff *skb,struct sk_buff *skb_res,struct net_device *dev) { +if (dev->qdisc == &noop_qdisc) +return -ENODEV ; +if (dev->hard_header ==NULL || skb->dst ==NULL || skb->dst->neighbour ==NULL )
net/socket.c +5 -1
@@ -1245,11 +1245,14 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, goto out_release_both; fd1 =sock_alloc_fd (&newfile1); -if (unlikely (fd1 <0 )) +if (unlikely (fd1 <0 )) { + err = fd1; goto out_release_both; + } fd2 =sock_alloc_fd (&newfile2);if (unlikely (fd2 <0 )) { + err = fd2;put_filp (newfile1);put_unused_fd (fd1); goto out_release_both;
@@ -2230,6 +2233,7 @@ int kernel_accept(struct socket *sock, struct socket **newsock, int flags) err = sock->ops->accept (sock, *newsock, flags);if (err <0 ) {sock_release (*newsock); + *newsock =NULL ; goto done; }
Linux 2.6.23.5
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.5 kernel. It contains a number of bugfixes for networking drivers.
I'll also be replying to this message with a copy of the patch between 2.6.23.4 and 2.6.23.5
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 drivers/net/ehea/ehea_qmr.c | 20 ++----- drivers/net/ehea/ehea_qmr.h | 2 drivers/net/forcedeth.c | 35 +++++++++--- drivers/net/pppol2tp.c | 25 ++++++--- drivers/net/skge.c | 90 +++++++++++++++++---------------- drivers/net/skge.h | 6 -- drivers/net/sky2.c | 87 +++++++++++++++++++++++++------ drivers/net/tg3.c | 10 ++- drivers/net/wireless/ipw2100.c | 39 ++++++++++++++ drivers/net/wireless/ipw2100.h | 4 + drivers/net/wireless/libertas/11d.c | 2 drivers/net/wireless/libertas/cmd.c | 6 -- drivers/net/wireless/libertas/wext.c | 8 +- drivers/net/wireless/rtl8187_dev.c | 31 +++++------ drivers/net/wireless/zd1201.c | 4 - drivers/net/wireless/zd1211rw/zd_usb.c | 7 +- include/linux/pci_ids.h | 4 + 18 files changed, 260 insertions(+), 122 deletions(-)
Summary of changes from v2.6.23.4 to v2.6.23.5
==============================================
Al Viro (2):
libertas: more endianness breakage
libertas: fix endianness breakage
Ayaz Abdulla (1):
forcedeth: add MCP77 device IDs
Dan Williams (1):
ipw2100: send WEXT scan events
Greg Kroah-Hartman (1):
Linux 2.6.23.5
James Chapman (1):
Fix L2TP oopses.
Jan-Bernd Themann (1):
ehea: 64K page kernel support fix
John W. Linville (1):
zd1201: avoid null ptr access of skb->dev
Manfred Spraul (1):
forcedeth msi bugfix
Marc Pignat (1):
zd1211rw, fix oops when ejecting install media
Michael Chan (1):
TG3: Fix performance regression on 5705.
Michael Wu (1):
rtl8187: Fix more frag bit checking, rts duration calc
Stephen Hemminger (4):
skge: XM PHY handling fixes
sky2: status ring race fix
sky2: ethtool register reserved area blackout
sky2: fix power settings on Yukon XL
Re: Linux 2.6.23.5
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
drivers/net/ehea/ehea_qmr.c +8 -12
@@ -563,8 +563,7 @@ int ehea_destroy_qp(struct ehea_qp *qp)int ehea_create_busmap (void ) {u64 vaddr =EHEA_BUSMAP_START ; -unsigned long abs_max_pfn =0 ; -unsigned long sec_max_pfn; +unsigned long high_section_index =0 ;int i;/*
@@ -574,14 +573,10 @@ int ehea_create_busmap( void ) ehea_bmap.valid_sections =0 ;for (i =0 ; i <NR_MEM_SECTIONS ; i++) -if (valid_section_nr (i)) { - sec_max_pfn =section_nr_to_pfn (i); -if (sec_max_pfn > abs_max_pfn) - abs_max_pfn = sec_max_pfn; - ehea_bmap.valid_sections++; - } +if (valid_section_nr (i)) + high_section_index = i; - ehea_bmap.entries = abs_max_pfn /EHEA_PAGES_PER_SECTION +1 ; + ehea_bmap.entries = high_section_index +1 ; ehea_bmap.vaddr =vmalloc (ehea_bmap.entries *sizeof (*ehea_bmap.vaddr));if (!ehea_bmap.vaddr)
@@ -593,6 +588,7 @@ int ehea_create_busmap( void )if (pfn_valid (pfn)) { ehea_bmap.vaddr[i] = vaddr; vaddr +=EHEA_SECTSIZE ; + ehea_bmap.valid_sections++; }else ehea_bmap.vaddr[i] =0 ; }
@@ -637,7 +633,7 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr) mr_len = ehea_bmap.valid_sections *EHEA_SECTSIZE ; - pt =kzalloc (EHEA_MAX_RPAGE *sizeof (u64),GFP_KERNEL ); + pt =kzalloc (PAGE_SIZE ,GFP_KERNEL );if (!pt) {ehea_error ("no mem" ); ret = -ENOMEM ;
@@ -660,8 +656,8 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)void *sectbase =__va (i <<SECTION_SIZE_BITS );unsigned long k =0 ; -for (j =0 ; j < (PAGES_PER_SECTION /EHEA_MAX_RPAGE ); - j++) { +for (j =0 ; j < (EHEA_PAGES_PER_SECTION / +EHEA_MAX_RPAGE ); j++) {for (m =0 ; m <EHEA_MAX_RPAGE ; m++) { pg = sectbase + ((k++) *EHEA_PAGESIZE );
drivers/net/ehea/ehea_qmr.h +1 -1
@@ -39,7 +39,7 @@#define EHEA_PAGESHIFT 12#define EHEA_PAGESIZE (1UL << EHEA_PAGESHIFT)#define EHEA_SECTSIZE (1UL << 24) -#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> PAGE_SHIFT) +#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)#if (1UL <<SECTION_SIZE_BITS ) <EHEA_SECTSIZE #error eHEA module can't work if kernel sectionsize < ehea sectionsize
drivers/net/forcedeth.c +27 -8
@@ -988,7 +988,7 @@ static void nv_enable_irq(struct net_device *dev)if (np->msi_flags &NV_MSI_X_ENABLED )enable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -enable_irq (dev->irq); +enable_irq (np->pci_dev->irq); }else {enable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_RX ].vector);enable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_TX ].vector);
@@ -1004,7 +1004,7 @@ static void nv_disable_irq(struct net_device *dev)if (np->msi_flags &NV_MSI_X_ENABLED )disable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -disable_irq (dev->irq); +disable_irq (np->pci_dev->irq); }else {disable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_RX ].vector);disable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_TX ].vector);
@@ -1601,7 +1601,7 @@ static void nv_do_rx_refill(unsigned long data)if (np->msi_flags &NV_MSI_X_ENABLED )disable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -disable_irq (dev->irq); +disable_irq (np->pci_dev->irq); }else {disable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_RX ].vector); }
@@ -1619,7 +1619,7 @@ static void nv_do_rx_refill(unsigned long data)if (np->msi_flags &NV_MSI_X_ENABLED )enable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -enable_irq (dev->irq); +enable_irq (np->pci_dev->irq); }else {enable_irq (np->msi_x_entry[NV_MSI_X_VECTOR_RX ].vector); }
@@ -3557,10 +3557,12 @@ static int nv_request_irq(struct net_device *dev, int intr_test)if (ret !=0 && np->msi_flags &NV_MSI_CAPABLE ) {if ((ret =pci_enable_msi (np->pci_dev)) ==0 ) { np->msi_flags |=NV_MSI_ENABLED ; + dev->irq = np->pci_dev->irq;if (request_irq (np->pci_dev->irq, handler,IRQF_SHARED , dev->name, dev) !=0 ) {printk (KERN_INFO "forcedeth: request_irq failed %d\n" , ret);pci_disable_msi (np->pci_dev); np->msi_flags &= ~NV_MSI_ENABLED ; + dev->irq = np->pci_dev->irq; goto out_err; }
@@ -3623,7 +3625,7 @@ static void nv_do_nic_poll(unsigned long data)if (np->msi_flags &NV_MSI_X_ENABLED )disable_irq_lockdep (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -disable_irq_lockdep (dev->irq); +disable_irq_lockdep (np->pci_dev->irq); mask = np->irqmask; }else {if (np->nic_poll_irq &NVREG_IRQ_RX_ALL ) {
@@ -3641,6 +3643,8 @@ static void nv_do_nic_poll(unsigned long data) } np->nic_poll_irq =0 ; +/* disable_irq() contains synchronize_irq, thus no irq handler can run now */ +if (np->recover_error) { np->recover_error =0 ;printk (KERN_INFO "forcedeth: MAC in recoverable error state\n" );
@@ -3677,7 +3681,6 @@ static void nv_do_nic_poll(unsigned long data) } } -/* FIXME: Do we need synchronize_irq(dev->irq) here? */ writel (mask, base + NvRegIrqMask);pci_push (base);
@@ -3690,7 +3693,7 @@ static void nv_do_nic_poll(unsigned long data)if (np->msi_flags &NV_MSI_X_ENABLED )enable_irq_lockdep (np->msi_x_entry[NV_MSI_X_VECTOR_ALL ].vector);else -enable_irq_lockdep (dev->irq); +enable_irq_lockdep (np->pci_dev->irq); }else {if (np->nic_poll_irq &NVREG_IRQ_RX_ALL ) {nv_nic_irq_rx (0 , dev);
@@ -4943,7 +4946,7 @@ static int nv_close(struct net_device *dev) np->in_shutdown =1 ;spin_unlock_irq (&np->lock);netif_poll_disable (dev); -synchronize_irq (dev->irq); +synchronize_irq (np->pci_dev->irq);del_timer_sync (&np->oom_kick);del_timer_sync (&np->nic_poll);
@@ -5563,6 +5566,22 @@ static struct pci_device_id pci_tbl[] = { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_31), .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR, }, + {/* MCP77 Ethernet Controller */ + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32), + .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER |DEV_HAS_CHECKSUM |DEV_HAS_HIGH_DMA |DEV_HAS_MSI |DEV_HAS_POWER_CNTRL |DEV_HAS_PAUSEFRAME_TX |DEV_HAS_STATISTICS_V2 |DEV_HAS_TEST_EXTENDED |DEV_HAS_MGMT_UNIT , + }, + { /* MCP77 Ethernet Controller */ +PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_33 ), + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, + }, + { /* MCP77 Ethernet Controller */ +PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_34 ), + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, + }, + { /* MCP77 Ethernet Controller */ +PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_DEVICE_ID_NVIDIA_NVENET_35 ), + .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT, + }, {0,}, };
drivers/net/pppol2tp.c +18 -7
@@ -487,7 +487,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb) {struct pppol2tp_session *session =NULL ;struct pppol2tp_tunnel *tunnel; -unsigned char *ptr; +unsigned char *ptr, *optr;u16 hdrflags;u16 tunnel_id, session_id;int length;
@@ -495,7 +495,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb) tunnel =pppol2tp_sock_to_tunnel (sock);if (tunnel ==NULL ) - goto error; + goto no_tunnel;/* UDP always verifies the packet length. */ __skb_pull (skb,sizeof (struct udphdr ));
@@ -508,7 +508,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb) }/* Point to L2TP header */ - ptr = skb->data; + optr = ptr = skb->data;/* Get L2TP header flags */ hdrflags =ntohs (*(__be16 *)ptr);
@@ -636,12 +636,14 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)/* If offset bit set, skip it. */ if (hdrflags &L2TP_HDRFLAG_O ) { offset =ntohs (*(__be16 *)ptr); - skb->transport_header +=2 + offset; -if (!pskb_may_pull (skb,skb_transport_offset (skb) +2 )) - goto discard; + ptr +=2 + offset; } -__skb_pull (skb,skb_transport_offset (skb)); + offset = ptr - optr; +if (!pskb_may_pull (skb, offset)) + goto discard; + +__skb_pull (skb, offset);/* Skip PPP header, if present. In testing, Microsoft L2TP clients * don't send the PPP header (PPP header compression enabled), but
@@ -651,6 +653,9 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)* Note that skb->data[] isn't dereferenced from a u16 ptr here since * the field may be unaligned. */ +if (!pskb_may_pull (skb,2 )) + goto discard; +if ((skb->data[0 ] ==0xff ) && (skb->data[1 ] ==0x03 ))skb_pull (skb,2 );
@@ -708,6 +713,10 @@ discard:return 0 ; error: +/* Put UDP header back */ +__skb_push (skb,sizeof (struct udphdr )); + +no_tunnel:return 1 ; }
@@ -1049,6 +1058,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)/* Get routing info from the tunnel socket */ dst_release (skb->dst); skb->dst =sk_dst_get (sk_tun); +skb_orphan (skb); + skb->sk = sk_tun;/* Queue the packet to IP for output */ len = skb->len;
drivers/net/skge.c +49 -41
200 lines not on this page · raw message
drivers/net/skge.h +2 -4
@@ -2193,11 +2193,9 @@ enum {XM_IS_TXF_UR =1 <<2 ,/* Bit 2: Transmit FIFO Underrun */ XM_IS_TX_COMP =1 <<1 ,/* Bit 1: Frame Tx Complete */ XM_IS_RX_COMP =1 <<0 ,/* Bit 0: Frame Rx Complete */ -}; - -#define XM_DEF_MSK (~(XM_IS_INP_ASS | XM_IS_LIPA_RC | \ - XM_IS_RXF_OV | XM_IS_TXF_UR)) + XM_IMSK_DISABLE = 0xffff, +};/* XM_HW_CFG 16 bit r/w Hardware Config Register */ enum {
drivers/net/sky2.c +69 -18
137 lines not on this page · raw message
drivers/net/tg3.c +8 -2
@@ -64,8 +64,8 @@#define DRV_MODULE_NAME "tg3"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.81" -#define DRV_MODULE_RELDATE "September 5, 2007" +#define DRV_MODULE_VERSION "3.81.1" +#define DRV_MODULE_RELDATE "October 18, 2007"#define TG3_DEF_MAC_MODE 0#define TG3_DEF_RX_MODE 0
@@ -4874,6 +4874,12 @@ static void tg3_restore_pci_state(struct tg3 *tp)pci_write_config_dword (tp->pdev,TG3PCI_COMMAND , tp->pci_cmd); +if (!(tp->tg3_flags2 &TG3_FLG2_PCI_EXPRESS )) { +pci_write_config_byte (tp->pdev,PCI_CACHE_LINE_SIZE , + tp->pci_cacheline_sz); +pci_write_config_byte (tp->pdev,PCI_LATENCY_TIMER , + tp->pci_lat_timer); + }/* Make sure PCI-X relaxed ordering bit is clear. */ pci_read_config_dword (tp->pdev,TG3PCI_X_CAPS , &val); val &= ~PCIX_CAPS_RELAXED_ORDERING ;
drivers/net/wireless/ipw2100.c +39 -0
@@ -2102,12 +2102,46 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)queue_delayed_work (priv->workqueue, &priv->rf_kill,round_jiffies (HZ )); } +static void send_scan_event (void *data) +{ +struct ipw2100_priv *priv = data; +union iwreq_data wrqu; + + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +wireless_send_event (priv->net_dev,SIOCGIWSCAN , &wrqu,NULL ); +} + +static void ipw2100_scan_event_later (struct work_struct *work) +{ +send_scan_event (container_of(work ,struct ipw2100_priv , + scan_event_later.work)); +} + +static void ipw2100_scan_event_now (struct work_struct *work) +{ +send_scan_event (container_of(work ,struct ipw2100_priv , +scan_event_now )); +} +static void isr_scan_complete (struct ipw2100_priv *priv,u32 status) {IPW_DEBUG_SCAN ("scan complete\n" );/* Age the scan results... */ priv->ieee->scans++; priv->status &= ~STATUS_SCANNING ; + +/* Only userspace-requested scan completion events go out immediately */ +if (!priv->user_requested_scan) { +if (!delayed_work_pending (&priv->scan_event_later)) +queue_delayed_work (priv->workqueue, + &priv->scan_event_later, +round_jiffies (msecs_to_jiffies (4000 ))); + }else { + priv->user_requested_scan =0 ; +cancel_delayed_work (&priv->scan_event_later); +queue_work (priv->workqueue, &priv->scan_event_now); + } }#ifdef CONFIG_IPW2100_DEBUG
@@ -4376,6 +4410,7 @@ static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)cancel_delayed_work (&priv->wx_event_work);cancel_delayed_work (&priv->hang_check);cancel_delayed_work (&priv->rf_kill); +cancel_delayed_work (&priv->scan_event_later);destroy_workqueue (priv->workqueue); priv->workqueue =NULL ; }
@@ -6118,6 +6153,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,INIT_DELAYED_WORK (&priv->wx_event_work, ipw2100_wx_event_work);INIT_DELAYED_WORK (&priv->hang_check, ipw2100_hang_check);INIT_DELAYED_WORK (&priv->rf_kill, ipw2100_rf_kill); +INIT_WORK (&priv->scan_event_now, ipw2100_scan_event_now); +INIT_DELAYED_WORK (&priv->scan_event_later, ipw2100_scan_event_later);tasklet_init (&priv->irq_tasklet, (void (*)(unsigned long )) ipw2100_irq_tasklet, (unsigned long )priv);
@@ -7427,6 +7464,8 @@ static int ipw2100_wx_set_scan(struct net_device *dev, }IPW_DEBUG_WX ("Initiating scan...\n" ); + + priv->user_requested_scan =1 ;if (ipw2100_set_scan_options (priv) ||ipw2100_start_scan (priv)) {IPW_DEBUG_WX ("Start scan failed.\n" );
drivers/net/wireless/ipw2100.h +4 -0
@@ -588,6 +588,10 @@ struct ipw2100_priv {struct delayed_work wx_event_work;struct delayed_work hang_check;struct delayed_work rf_kill; +struct work_struct scan_event_now; +struct delayed_work scan_event_later; + +int user_requested_scan;u32 interrupts;int tx_interrupts;
drivers/net/wireless/libertas/11d.c +1 -1
@@ -562,7 +562,7 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv, nr_subband * sizeof(struct ieeetypes_subbandset)); cmd->size =cpu_to_le16 (sizeof (pdomaininfo->action) + - domain->header.len + +le16_to_cpu (domain->header.len) +sizeof (struct mrvlietypesheader ) +S_DS_GEN ); }else {
drivers/net/wireless/libertas/cmd.c +2 -4
@@ -185,14 +185,12 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,switch (pkey->len) {case KEY_LEN_WEP_40 : - wep->keytype[i] = -cpu_to_le16 (cmd_type_wep_40_bit); + wep->keytype[i] = cmd_type_wep_40_bit;memmove (&wep->keymaterial[i], pkey->key, pkey->len);break ;case KEY_LEN_WEP_104 : - wep->keytype[i] = -cpu_to_le16 (cmd_type_wep_104_bit); + wep->keytype[i] = cmd_type_wep_104_bit;memmove (&wep->keymaterial[i], pkey->key, pkey->len);break ;
drivers/net/wireless/libertas/wext.c +4 -4
@@ -973,7 +973,7 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)/* Quality by TX errors */ priv->wstats.discard.retries = priv->stats.tx_errors; - tx_retries =le16_to_cpu (adapter->logmsg.retry); + tx_retries =le32_to_cpu (adapter->logmsg.retry);if (tx_retries >75 ) tx_qual = (90 - tx_retries) *POOR /15 ;
@@ -989,10 +989,10 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev) (PERFECT -VERY_GOOD ) /50 +VERY_GOOD ; quality =min (quality, tx_qual); - priv->wstats.discard.code =le16_to_cpu (adapter->logmsg.wepundecryptable); - priv->wstats.discard.fragment =le16_to_cpu (adapter->logmsg.rxfrag); + priv->wstats.discard.code =le32_to_cpu (adapter->logmsg.wepundecryptable); + priv->wstats.discard.fragment =le32_to_cpu (adapter->logmsg.rxfrag); priv->wstats.discard.retries = tx_retries; - priv->wstats.discard.misc =le16_to_cpu (adapter->logmsg.ackfailure); + priv->wstats.discard.misc =le32_to_cpu (adapter->logmsg.ackfailure);/* Calculate quality */ priv->wstats.qual.qual =max (quality, (u32 )100 );
drivers/net/wireless/rtl8187_dev.c +16 -15
@@ -78,7 +78,8 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,struct rtl8187_tx_hdr *hdr;struct rtl8187_tx_info *info;struct urb *urb; -u32 tmp; +__le16 rts_dur =0 ; +u32 flags; urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!urb) {
@@ -86,24 +87,24 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,return 0 ; } - hdr = (struct rtl8187_tx_hdr *)skb_push (skb,sizeof (*hdr)); - tmp = skb->len -sizeof (*hdr); - tmp |=RTL8187_TX_FLAG_NO_ENCRYPT ; - tmp |= control->rts_cts_rate <<19 ; - tmp |= control->tx_rate <<24 ; -if (ieee80211_get_morefrag ((struct ieee80211_hdr *)skb)) - tmp |=RTL8187_TX_FLAG_MORE_FRAG ; + flags = skb->len; + flags |=RTL8187_TX_FLAG_NO_ENCRYPT ; + flags |= control->rts_cts_rate <<19 ; + flags |= control->tx_rate <<24 ; +if (ieee80211_get_morefrag ((struct ieee80211_hdr *)skb->data)) + flags |=RTL8187_TX_FLAG_MORE_FRAG ;if (control->flags &IEEE80211_TXCTL_USE_RTS_CTS ) { - tmp |=RTL8187_TX_FLAG_RTS ; - hdr->rts_duration = -ieee80211_rts_duration (dev, skb->len, control); + flags |=RTL8187_TX_FLAG_RTS ; + rts_dur =ieee80211_rts_duration (dev, skb->len, control); }if (control->flags &IEEE80211_TXCTL_USE_CTS_PROTECT ) - tmp |=RTL8187_TX_FLAG_CTS ; - hdr->flags =cpu_to_le32 (tmp); + flags |=RTL8187_TX_FLAG_CTS ; + + hdr = (struct rtl8187_tx_hdr *)skb_push (skb,sizeof (*hdr)); + hdr->flags =cpu_to_le32 (flags); hdr->len =0 ; - tmp = control->retry_limit <<8 ; - hdr->retry =cpu_to_le32 (tmp); + hdr->rts_duration = rts_dur; + hdr->retry =cpu_to_le32 (control->retry_limit <<8 ); info = (struct rtl8187_tx_info *)skb->cb; info->control =kmemdup (control,sizeof (*control),GFP_ATOMIC );
drivers/net/wireless/zd1201.c +2 -2
@@ -327,8 +327,8 @@ static void zd1201_usbrx(struct urb *urb)memcpy (skb_put (skb,6 ), &data[datalen-8 ],6 );memcpy (skb_put (skb,2 ), &data[datalen-24 ],2 );memcpy (skb_put (skb, len), data, len); - skb->dev->last_rx = jiffies; skb->protocol =eth_type_trans (skb, zd->dev); + skb->dev->last_rx = jiffies; zd->stats.rx_packets++; zd->stats.rx_bytes += skb->len;netif_rx (skb);
@@ -384,8 +384,8 @@ static void zd1201_usbrx(struct urb *urb)memcpy (skb_put (skb,2 ), &data[6 ],2 );memcpy (skb_put (skb, len), data+8 , len); } - skb->dev->last_rx = jiffies; skb->protocol =eth_type_trans (skb, zd->dev); + skb->dev->last_rx = jiffies; zd->stats.rx_packets++; zd->stats.rx_bytes += skb->len;netif_rx (skb);
drivers/net/wireless/zd1211rw/zd_usb.c +5 -2
@@ -1041,14 +1041,17 @@ error:static void disconnect (struct usb_interface *intf) {struct net_device *netdev =zd_intf_to_netdev (intf); -struct zd_mac *mac =zd_netdev_mac (netdev); -struct zd_usb *usb = &mac->chip.usb; +struct zd_mac *mac; +struct zd_usb *usb;/* Either something really bad happened, or we're just dealing with * a DEVICE_INSTALLER. */ if (netdev ==NULL )return ; + mac =zd_netdev_mac (netdev); + usb = &mac->chip.usb; +dev_dbg_f (zd_usb_dev (usb),"\n" );zd_netdev_disconnect (netdev);
include/linux/pci_ids.h +4 -0
@@ -1233,6 +1233,10 @@#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE 0x056C#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759 +#define PCI_DEVICE_ID_NVIDIA_NVENET_32 0x0760 +#define PCI_DEVICE_ID_NVIDIA_NVENET_33 0x0761 +#define PCI_DEVICE_ID_NVIDIA_NVENET_34 0x0762 +#define PCI_DEVICE_ID_NVIDIA_NVENET_35 0x0763#define PCI_VENDOR_ID_IMS 0x10e0#define PCI_DEVICE_ID_IMS_TT128 0x9128
Linux 2.6.23.6
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.6 kernel. It contains a number of bugfixes for drivers other than networking (networking driver fixes were in 2.6.23.5).
I'll also be replying to this message with a copy of the patch between 2.6.23.5 and 2.6.23.6
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 drivers/acpi/sleep/main.c | 5 - drivers/ata/ahci.c | 143 ++++++++++++++++++++++++++++++++ drivers/ata/libata-core.c | 9 +- drivers/ata/libata-eh.c | 32 +++++-- drivers/char/drm/i915_irq.c | 2 drivers/char/drm/radeon_cp.c | 5 - drivers/char/drm/radeon_drv.h | 1 drivers/char/moxa.c | 4 drivers/char/rocket.c | 14 ++- drivers/hwmon/lm87.c | 4 drivers/hwmon/w83627hf.c | 78 +++++++++-------- drivers/ide/pci/cs5535.c | 2 drivers/ide/pci/serverworks.c | 1 drivers/ide/pci/siimage.c | 2 drivers/infiniband/core/uverbs_cmd.c | 8 + drivers/infiniband/hw/mthca/mthca_cmd.c | 6 + drivers/isdn/hardware/avm/b1.c | 28 ++---- drivers/isdn/hardware/avm/c4.c | 14 ++- drivers/md/bitmap.c | 2 drivers/md/dm-delay.c | 2 drivers/md/dm.c | 4 drivers/md/raid5.c | 17 +++ drivers/pci/msi.c | 2 drivers/scsi/hptiop.c | 5 - drivers/usb/core/hcd.h | 8 + drivers/usb/core/hub.c | 15 +++ drivers/usb/core/quirks.c | 81 ------------------ drivers/usb/core/urb.c | 2 drivers/usb/gadget/ether.c | 12 ++ drivers/usb/host/ehci-hcd.c | 8 + drivers/usb/serial/generic.c | 7 - drivers/video/platinumfb.c | 48 +++++----- include/linux/ide.h | 7 + include/linux/libata.h | 2 include/linux/usb/quirks.h | 7 - sound/core/Makefile | 3 sound/core/memalloc.c | 6 + sound/pci/emu10k1/emumixer.c | 4 sound/pci/hda/patch_sigmatel.c | 29 ++++-- sound/pci/rme9652/hdsp.c | 3 sound/usb/usbmixer.c | 2 42 files changed, 419 insertions(+), 217 deletions(-)
Summary of changes from v2.6.23.5 to v2.6.23.6
==============================================
Alan Stern (2):
USB: remove USB_QUIRK_NO_AUTOSUSPEND
USB: mutual exclusion for EHCI init and port resets
Alexey Starikovskiy (2):
ACPI: sleep: Fix GPE suspend cleanup
ACPI: suspend: Wrong order of GPE restore.
Benedikt Spranger (1):
usb-gadget-ether: prevent oops caused by error interrupt race
Benjamin Herrenschmidt (4):
POWERPC: Fix platinumfb framebuffer
ide: Add ide_get_paired_drive() helper
ide: Fix siimage driver accessing beyond array boundary
ide: Fix cs5535 driver accessing beyond array boundary
Dan Williams (1):
md: raid5: fix clearing of biofill operations
Dave Airlie (2):
i915: fix vbl swap allocation size.
radeon: set the address to access the GART table on the CPU side correctly
Greg Kroah-Hartman (1):
Linux 2.6.23.6
HighPoint Linux Team (1):
hptiop: avoid buffer overflow when returning sense data
Jean Delvare (4):
hwmon/w83627hf: Fix setting fan min right after driver load hwmon/w83627hf: Don't assume bank 0
hwmon/lm87: Fix a division by zero
hwmon/lm87: Disable VID when it should be
Jiri Kosina (1):
USB: usbserial - fix potential deadlock between write() and IRQ
Jiri Slaby (2):
Char: rocket, fix dynamic_dev tty
Char: moxa, fix and optimise empty timer
Jun'ichi Nomura (1):
dm: fix thaw_bdev
Karsten Keil (2):
i4l: Fix random hard freeze with AVM c4 card
i4l: fix random freezes with AVM B1 drivers
Milan Broz (1):
dm delay: fix status
NeilBrown (1):
md: fix an unsigned compare to allow creation of bitmaps with v1.0 metadata
Oliver Neukum (1):
USB: add URB_FREE_BUFFER to permissible flags
Roland Dreier (3):
IB/uverbs: Fix checking of userspace object ownership IB/mthca: Use mmiowb() to avoid firmware commands getting jumbled up
MSI: Use correct data offset for 32-bit MSI in read_msi_msg()
Russ Cox (1):
ALSA: fix selector unit bug affecting some USB speakerphones
Takashi Iwai (5):
ALSA: hda-codec - Avoid zero NID in line_out_pins[] of STAC codecs
ALSA: Fix build error without CONFIG_HAS_DMA
ALSA: emu10k1 - Fix memory corruption
ALSA: hdsp - Fix zero division
ALSA: hda-codec - Add array terminator for dmic in STAC codec
Tejun Heo (4):
libata: sync NCQ blacklist with upstream
libata: add HTS542525K9SA00 to NCQ blacklist
libata: backport ATA_FLAG_NO_SRST and ATA_FLAG_ASSUME_ATA
libata: backport ATA_FLAG_NO_SRST and ATA_FLAG_ASSUME_ATA, part 2
Tony Battersby (1):
ide: fix serverworks.c UDMA regression
Re: Linux 2.6.23.6
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
drivers/acpi/sleep/main.c +3 -2
@@ -170,8 +170,8 @@ static int acpi_pm_finish(suspend_state_t pm_state) {u32 acpi_state = acpi_target_sleep_state; -acpi_leave_sleep_state (acpi_state);acpi_disable_wakeup_device (acpi_state); +acpi_leave_sleep_state (acpi_state);/* reset firmware waking vector */ acpi_set_firmware_waking_vector ((acpi_physical_address )0 );
@@ -256,8 +256,8 @@ static int acpi_hibernation_enter(void)static void acpi_hibernation_finish (void ) { -acpi_leave_sleep_state (ACPI_STATE_S4 );acpi_disable_wakeup_device (ACPI_STATE_S4 ); +acpi_leave_sleep_state (ACPI_STATE_S4 );/* reset firmware waking vector */ acpi_set_firmware_waking_vector ((acpi_physical_address )0 );
@@ -389,6 +389,7 @@ static void acpi_power_off(void)/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ printk ("%s called\n" , __FUNCTION__);local_irq_disable (); +acpi_enable_wakeup_device (ACPI_STATE_S5 );acpi_enter_sleep_state (ACPI_STATE_S5 ); }
drivers/ata/ahci.c +143 -0
185 lines not on this page · raw message
drivers/ata/libata-core.c +8 -1
@@ -3793,11 +3793,18 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {/* Drives which do spurious command completion */ { "HTS541680J9SA00", "SB2IC7EP", ATA_HORKAGE_NONCQ, }, { "HTS541612J9SA00", "SBDIC7JP", ATA_HORKAGE_NONCQ, }, + { "HDT722516DLA380", "V43OA96A", ATA_HORKAGE_NONCQ, }, { "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, }, + { "Hitachi HTS542525K9SA00", "BBFOC31P", ATA_HORKAGE_NONCQ, }, { "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, }, + { "WDC WD3200AAJS-00RYA0", "12.01B01", ATA_HORKAGE_NONCQ, }, { "FUJITSU MHV2080BH", "00840028", ATA_HORKAGE_NONCQ, }, + { "ST9120822AS", "3.CLF", ATA_HORKAGE_NONCQ, }, { "ST9160821AS", "3.CLF", ATA_HORKAGE_NONCQ, }, - { "ST3160812AS", "3.AD", ATA_HORKAGE_NONCQ, }, + { "ST9160821AS", "3.ALD", ATA_HORKAGE_NONCQ, }, + { "ST9160821AS", "3.CCD", ATA_HORKAGE_NONCQ, }, + { "ST3160812AS", "3.ADJ", ATA_HORKAGE_NONCQ, }, + { "ST980813AS", "3.ADB", ATA_HORKAGE_NONCQ, }, { "SAMSUNG HD401LJ", "ZZ100-15", ATA_HORKAGE_NONCQ, },/* devices which puke on READ_NATIVE_MAX */
drivers/ata/libata-eh.c +24 -8
@@ -1759,9 +1759,11 @@ static int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,return 0 ; } -static int ata_eh_followup_srst_needed (int rc,int classify, -const unsigned int *classes) +static int ata_eh_followup_srst_needed (struct ata_port *ap,int rc, +int classify,const unsigned int *classes) { +if (ap->flags &ATA_FLAG_NO_SRST ) +return 0 ;if (rc == -EAGAIN )return 1 ;if (rc !=0 )
@@ -1792,7 +1794,8 @@ static int ata_eh_reset(struct ata_port *ap, int classify,*/ action = ehc->i.action; ehc->i.action &= ~ATA_EH_RESET_MASK ; -if (softreset && (!hardreset || (!sata_set_spd_needed (ap) && +if (softreset && (!hardreset || (!(ap->flags &ATA_FLAG_NO_SRST ) && + !sata_set_spd_needed (ap) && !(action &ATA_EH_HARDRESET )))) ehc->i.action |=ATA_EH_SOFTRESET ;else
@@ -1855,7 +1858,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify, rc =ata_do_reset (ap, reset, classes, deadline);if (reset == hardreset && -ata_eh_followup_srst_needed (rc, classify, classes)) { +ata_eh_followup_srst_needed (ap, rc, classify, classes)) {/* okay, let's do follow-up softreset */ reset = softreset;
@@ -1870,8 +1873,8 @@ static int ata_eh_reset(struct ata_port *ap, int classify,ata_eh_about_to_do (ap,NULL ,ATA_EH_RESET_MASK ); rc =ata_do_reset (ap, reset, classes, deadline); -if (rc ==0 && classify && - classes[0 ] ==ATA_DEV_UNKNOWN ) { +if (rc ==0 && classify && classes[0 ] ==ATA_DEV_UNKNOWN && + !(ap->flags &ATA_FLAG_ASSUME_ATA )) {ata_port_printk (ap,KERN_ERR ,"classification failed\n" ); rc = -EINVAL ;
@@ -1879,6 +1882,10 @@ static int ata_eh_reset(struct ata_port *ap, int classify, } } +/* if we skipped follow-up srst, clear rc */ +if (rc == -EAGAIN ) + rc =0 ; +if (rc && try <ARRAY_SIZE (ata_eh_reset_timeouts)) {unsigned long now = jiffies;
@@ -1906,8 +1913,17 @@ static int ata_eh_reset(struct ata_port *ap, int classify,/* After the reset, the device state is PIO 0 and the * controller state is undefined. Record the mode. */ -for (i =0 ; i <ATA_MAX_DEVICES ; i++) - ap->device[i].pio_mode =XFER_PIO_0 ; +for (i =0 ; i <ata_port_max_devices (ap); i++) { +struct ata_device *dev = &ap->device[i]; + + dev->pio_mode =XFER_PIO_0 ; + +if (ata_port_offline (ap)) +continue ; + +if (ap->flags &ATA_FLAG_ASSUME_ATA ) + classes[dev->devno] =ATA_DEV_ATA ; + }/* record current link speed */ if (sata_scr_read (ap,SCR_STATUS , &sstatus) ==0 )
drivers/char/drm/i915_irq.c +1 -1
@@ -553,7 +553,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)return DRM_ERR (EBUSY ); } - vbl_swap =drm_calloc (1 ,sizeof (vbl_swap),DRM_MEM_DRIVER ); + vbl_swap =drm_calloc (1 ,sizeof (*vbl_swap),DRM_MEM_DRIVER );if (!vbl_swap) {DRM_ERROR ("Failed to allocate memory to queue swap\n" );
drivers/char/drm/radeon_cp.c +3 -2
@@ -1679,7 +1679,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) dev_priv->gart_info.bus_addr = dev_priv->pcigart_offset + dev_priv->fb_location; dev_priv->gart_info.mapping.offset = - dev_priv->gart_info.bus_addr; + dev_priv->pcigart_offset + dev_priv->fb_aper_offset; dev_priv->gart_info.mapping.size = dev_priv->gart_info.table_size;
@@ -2291,7 +2291,8 @@ int radeon_driver_firstopen(struct drm_device *dev)if (ret !=0 )return ret; - ret =drm_addmap (dev,drm_get_resource_start (dev,0 ), + dev_priv->fb_aper_offset =drm_get_resource_start (dev,0 ); + ret =drm_addmap (dev, dev_priv->fb_aper_offset,drm_get_resource_len (dev,0 ), _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, &map);if (ret !=0 )
drivers/char/drm/radeon_drv.h +1 -0
@@ -293,6 +293,7 @@ typedef struct drm_radeon_private {/* starting from here on, data is preserved accross an open */ uint32_t flags;/* see radeon_chip_flags */ +unsigned long fb_aper_offset; } drm_radeon_private_t; typedef struct drm_radeon_buf_priv {
drivers/char/moxa.c +2 -2
@@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned long data)struct moxa_port *ch; ch = (struct moxa_port *) data; -del_timer_sync (&moxa_ports[ch->port].emptyTimer);if (ch->tty && (ch->statusflags &EMPTYWAIT )) {if (MoxaPortTxQueue (ch->port) ==0 ) { ch->statusflags &= ~EMPTYWAIT ;tty_wakeup (ch->tty);return ; } -mod_timer (&moxa_ports[ch->port].emptyTimer, jiffies +HZ ); +mod_timer (&moxa_ports[ch->port].emptyTimer, +round_jiffies (jiffies +HZ )); }else ch->statusflags &= ~EMPTYWAIT ; }
drivers/char/rocket.c +9 -5
@@ -699,8 +699,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)spin_lock_init (&info->slock);mutex_init (&info->write_mtx); rp_table[line] = info; -if (pci_dev) -tty_register_device (rocket_driver, line, &pci_dev->dev); +tty_register_device (rocket_driver, line, pci_dev ? &pci_dev->dev : +NULL ); }/*
@@ -2434,7 +2434,7 @@ static int __init rp_init(void) rocket_driver->init_termios.c_ispeed =9600 ; rocket_driver->init_termios.c_ospeed =9600 ;#ifdef ROCKET_SOFT_FLOW - rocket_driver->flags |=TTY_DRIVER_REAL_RAW |TTY_DRIVER_DYNAMIC_DEV ; + rocket_driver->flags |=TTY_DRIVER_REAL_RAW ;#endif tty_set_operations (rocket_driver, &rocket_ops);
@@ -2491,10 +2491,14 @@ static void rp_cleanup_module(void)if (retval)printk (KERN_INFO "Error %d while trying to unregister " "rocketport driver\n" , -retval); -put_tty_driver (rocket_driver);for (i =0 ; i <MAX_RP_PORTS ; i++) -kfree (rp_table[i]); +if (rp_table[i]) { +tty_unregister_device (rocket_driver, i); +kfree (rp_table[i]); + } + +put_tty_driver (rocket_driver);for (i =0 ; i <NUM_BOARDS ; i++) {if (rcktpt_io_addr[i] <=0 || is_PCI[i])
drivers/hwmon/lm87.c +2 -2
@@ -129,7 +129,7 @@ static u8 LM87_REG_TEMP_LOW[3] = { 0x3A, 0x38, 0x2C }; (((val) < 0 ? (val)-500 : (val)+500) / 1000))#define FAN_FROM_REG (reg,div) ((reg) == 255 || (reg) == 0 ? 0 : \ - 1350000 + (reg)*(div) / 2) / ((reg)*(div)) + (1350000 + (reg)*(div) / 2) / ((reg)*(div)))#define FAN_TO_REG (val,div) ((val)*(div) * 255 <= 1350000 ? 255 : \ (1350000 + (val)*(div) / 2) / ((val)*(div)))
@@ -145,7 +145,7 @@ static u8 LM87_REG_TEMP_LOW[3] = { 0x3A, 0x38, 0x2C };#define CHAN_NO_FAN (nr) (1 << (nr))#define CHAN_TEMP3 (1 << 2)#define CHAN_VCC_5V (1 << 3) -#define CHAN_NO_VID (1 << 8) +#define CHAN_NO_VID (1 << 7)/* * Functions declaration
drivers/hwmon/w83627hf.c +44 -34
132 lines not on this page · raw message
drivers/ide/pci/cs5535.c +1 -1
@@ -84,7 +84,7 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)/* Set the PIO timings */ if ((speed &XFER_MODE ) ==XFER_PIO ) { -ide_drive_t *pair = &drive->hwif->drives[drive->dn ^1 ]; +ide_drive_t *pair =ide_get_paired_drive (drive);u8 cmd, pioa; cmd = pioa = speed -XFER_PIO_0 ;
drivers/ide/pci/serverworks.c +1 -0
@@ -97,6 +97,7 @@ static u8 svwks_udma_filter(ide_drive_t *drive) mode =2 ;switch (mode) { +case 3 : mask =0x3f ;break ;case 2 : mask =0x1f ;break ;case 1 : mask =0x07 ;break ;default : mask =0x00 ;break ;
drivers/ide/pci/siimage.c +1 -1
@@ -180,7 +180,7 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio)const u16 data_speed[] = {0x328a ,0x2283 ,0x1104 ,0x10c3 ,0x10c1 };ide_hwif_t *hwif =HWIF (drive); -ide_drive_t *pair = &hwif->drives[drive->dn ^1 ]; +ide_drive_t *pair =ide_get_paired_drive (drive);u32 speedt =0 ;u16 speedp =0 ;unsigned long addr =siimage_seldev (drive,0x04 );
drivers/infiniband/core/uverbs_cmd.c +6 -2
@@ -147,8 +147,12 @@ static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id,spin_lock (&ib_uverbs_idr_lock); uobj =idr_find (idr, id); -if (uobj) -kref_get (&uobj->ref); +if (uobj) { +if (uobj->context == context) +kref_get (&uobj->ref); +else + uobj =NULL ; + }spin_unlock (&ib_uverbs_idr_lock);return uobj;
drivers/infiniband/hw/mthca/mthca_cmd.c +6 -0
@@ -290,6 +290,12 @@ static int mthca_cmd_post(struct mthca_dev *dev, err =mthca_cmd_post_hcr (dev, in_param, out_param, in_modifier, op_modifier, op, token, event); +/* +* Make sure that our HCR writes don't get mixed in with +* writes from another CPU starting a FW command. +*/ +mmiowb (); +mutex_unlock (&dev->cmd.hcr_mutex);return err; }
drivers/isdn/hardware/avm/b1.c +13 -15
@@ -321,12 +321,15 @@ void b1_reset_ctr(struct capi_ctr *ctrl)avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);avmcard *card = cinfo->card;unsigned int port = card->port; +unsigned long flags;b1_reset (port);b1_reset (port);memset (cinfo->version,0 ,sizeof (cinfo->version)); +spin_lock_irqsave (&card->lock, flags);capilib_release (&cinfo->ncci_head); +spin_unlock_irqrestore (&card->lock, flags);capi_ctr_reseted (ctrl); }
@@ -361,9 +364,8 @@ void b1_release_appl(struct capi_ctr *ctrl, u16 appl)unsigned int port = card->port;unsigned long flags; -capilib_release_appl (&cinfo->ncci_head, appl); -spin_lock_irqsave (&card->lock, flags); +capilib_release_appl (&cinfo->ncci_head, appl);b1_put_byte (port,SEND_RELEASE );b1_put_word (port, appl);spin_unlock_irqrestore (&card->lock, flags);
@@ -380,27 +382,27 @@ u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)u8 subcmd =CAPIMSG_SUBCOMMAND (skb->data);u16 dlen, retval; +spin_lock_irqsave (&card->lock, flags);if (CAPICMD (cmd, subcmd) ==CAPI_DATA_B3_REQ ) { retval =capilib_data_b3_req (&cinfo->ncci_head,CAPIMSG_APPID (skb->data),CAPIMSG_NCCI (skb->data),CAPIMSG_MSGID (skb->data)); -if (retval !=CAPI_NOERROR ) +if (retval !=CAPI_NOERROR ) { +spin_unlock_irqrestore (&card->lock, flags);return retval; + } dlen =CAPIMSG_DATALEN (skb->data); -spin_lock_irqsave (&card->lock, flags);b1_put_byte (port,SEND_DATA_B3_REQ );b1_put_slice (port, skb->data, len);b1_put_slice (port, skb->data + len, dlen); -spin_unlock_irqrestore (&card->lock, flags); }else { -spin_lock_irqsave (&card->lock, flags);b1_put_byte (port,SEND_MESSAGE );b1_put_slice (port, skb->data, len); -spin_unlock_irqrestore (&card->lock, flags); } +spin_unlock_irqrestore (&card->lock, flags);dev_kfree_skb_any (skb);return CAPI_NOERROR ;
@@ -534,17 +536,17 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr) ApplId = (unsigned )b1_get_word (card->port); MsgLen =b1_get_slice (card->port, card->msgbuf); -spin_unlock_irqrestore (&card->lock, flags);if (!(skb =alloc_skb (MsgLen,GFP_ATOMIC ))) {printk (KERN_ERR "%s: incoming packet dropped\n" , card->name); +spin_unlock_irqrestore (&card->lock, flags); }else {memcpy (skb_put (skb, MsgLen), card->msgbuf, MsgLen);if (CAPIMSG_CMD (skb->data) ==CAPI_DATA_B3_CONF )capilib_data_b3_conf (&cinfo->ncci_head, ApplId,CAPIMSG_NCCI (skb->data),CAPIMSG_MSGID (skb->data)); - +spin_unlock_irqrestore (&card->lock, flags);capi_ctr_handle_message (ctrl, ApplId, skb); }break ;
@@ -554,21 +556,17 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr) ApplId =b1_get_word (card->port);NCCI =b1_get_word (card->port); WindowSize =b1_get_word (card->port); -spin_unlock_irqrestore (&card->lock, flags); -capilib_new_ncci (&cinfo->ncci_head, ApplId,NCCI , WindowSize); - +spin_unlock_irqrestore (&card->lock, flags);break ;case RECEIVE_FREE_NCCI : ApplId =b1_get_word (card->port);NCCI =b1_get_word (card->port); -spin_unlock_irqrestore (&card->lock, flags); -if (NCCI !=0xffffffff )capilib_free_ncci (&cinfo->ncci_head, ApplId,NCCI ); - +spin_unlock_irqrestore (&card->lock, flags);break ;case RECEIVE_START :
drivers/isdn/hardware/avm/c4.c +11 -3
@@ -727,6 +727,7 @@ static void c4_send_init(avmcard *card) {struct sk_buff *skb;void *p; +unsigned long flags; skb =alloc_skb (15 ,GFP_ATOMIC );if (!skb) {
@@ -744,12 +745,15 @@ static void c4_send_init(avmcard *card)skb_put (skb, (u8 *)p - (u8 *)skb->data);skb_queue_tail (&card->dma->send_queue, skb); +spin_lock_irqsave (&card->lock, flags);c4_dispatch_tx (card); +spin_unlock_irqrestore (&card->lock, flags); }static int queue_sendconfigword (avmcard *card,u32 val) {struct sk_buff *skb; +unsigned long flags;void *p; skb =alloc_skb (3 +4 ,GFP_ATOMIC );
@@ -766,7 +770,9 @@ static int queue_sendconfigword(avmcard *card, u32 val)skb_put (skb, (u8 *)p - (u8 *)skb->data);skb_queue_tail (&card->dma->send_queue, skb); +spin_lock_irqsave (&card->lock, flags);c4_dispatch_tx (card); +spin_unlock_irqrestore (&card->lock, flags);return 0 ; }
@@ -986,7 +992,9 @@ static void c4_release_appl(struct capi_ctr *ctrl, u16 appl)struct sk_buff *skb;void *p; +spin_lock_irqsave (&card->lock, flags);capilib_release_appl (&cinfo->ncci_head, appl); +spin_unlock_irqrestore (&card->lock, flags);if (ctrl->cnr == card->cardnr) { skb =alloc_skb (7 ,GFP_ATOMIC );
@@ -1019,7 +1027,8 @@ static u16 c4_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)u16 retval =CAPI_NOERROR ;unsigned long flags; -if (CAPIMSG_CMD (skb->data) ==CAPI_DATA_B3_REQ ) { +spin_lock_irqsave (&card->lock, flags); +if (CAPIMSG_CMD (skb->data) ==CAPI_DATA_B3_REQ ) { retval = capilib_data_b3_req(&cinfo->ncci_head, CAPIMSG_APPID(skb->data), CAPIMSG_NCCI(skb->data),
@@ -1027,10 +1036,9 @@ static u16 c4_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) }if (retval ==CAPI_NOERROR ) {skb_queue_tail (&card->dma->send_queue, skb); -spin_lock_irqsave (&card->lock, flags);c4_dispatch_tx (card); -spin_unlock_irqrestore (&card->lock, flags); } +spin_unlock_irqrestore (&card->lock, flags);return retval; }
drivers/md/bitmap.c +1 -1
@@ -274,7 +274,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)if (bitmap->offset <0 ) {/* DATA BITMAP METADATA */ if (bitmap->offset - + page->index * (PAGE_SIZE /512 ) + + (long )(page->index * (PAGE_SIZE /512 )) + size/512 >0 )/* bitmap runs in to metadata */ return -EINVAL ;
drivers/md/dm-delay.c +1 -1
@@ -305,7 +305,7 @@ static int delay_status(struct dm_target *ti, status_type_t type, (unsigned long long ) dc->start_read, dc->read_delay);if (dc->dev_write) -DMEMIT ("%s %llu %u" , dc->dev_write->name, +DMEMIT (" %s %llu %u" , dc->dev_write->name, (unsigned long long ) dc->start_write, dc->write_delay);break ;
drivers/md/dm.c +3 -1
@@ -1064,12 +1064,14 @@ static struct mapped_device *alloc_dev(int minor)return NULL ; } +static void unlock_fs (struct mapped_device *md); +static void free_dev (struct mapped_device *md) {int minor = md->disk->first_minor;if (md->suspended_bdev) { -thaw_bdev (md->suspended_bdev,NULL ); +unlock_fs (md);bdput (md->suspended_bdev); }mempool_destroy (md->tio_pool);
drivers/md/raid5.c +14 -3
@@ -377,7 +377,12 @@ static unsigned long get_stripe_work(struct stripe_head *sh) ack++; sh->ops.count -= ack; -BUG_ON (sh->ops.count <0 ); +if (unlikely (sh->ops.count <0 )) { +printk (KERN_ERR "pending: %#lx ops.pending: %#lx ops.ack: %#lx " +"ops.complete: %#lx\n" , pending, sh->ops.pending, + sh->ops.ack, sh->ops.complete); +BUG (); + }return pending; }
@@ -551,8 +556,7 @@ static void ops_complete_biofill(void *stripe_head_ref) } } } -clear_bit (STRIPE_OP_BIOFILL , &sh->ops.ack); -clear_bit (STRIPE_OP_BIOFILL , &sh->ops.pending); +set_bit (STRIPE_OP_BIOFILL , &sh->ops.complete);return_io (return_bi);
@@ -2630,6 +2634,13 @@ static void handle_stripe5(struct stripe_head *sh) s.expanded =test_bit (STRIPE_EXPAND_READY , &sh->state);/* Now to look around and see what can be done */ +/* clean-up completed biofill operations */ +if (test_bit (STRIPE_OP_BIOFILL , &sh->ops.complete)) { +clear_bit (STRIPE_OP_BIOFILL , &sh->ops.pending); +clear_bit (STRIPE_OP_BIOFILL , &sh->ops.ack); +clear_bit (STRIPE_OP_BIOFILL , &sh->ops.complete); + } +rcu_read_lock ();for (i=disks; i--; ) {mdk_rdev_t *rdev;
drivers/pci/msi.c +1 -1
@@ -132,7 +132,7 @@ void read_msi_msg(unsigned int irq, struct msi_msg *msg)pci_read_config_word (dev,msi_data_reg (pos,1 ), &data); }else { msg->address_hi =0 ; -pci_read_config_word (dev,msi_data_reg (pos,1 ), &data); +pci_read_config_word (dev,msi_data_reg (pos,0 ), &data); } msg->data = data;break ;
drivers/scsi/hptiop.c +3 -2
@@ -365,8 +365,9 @@ static void hptiop_host_request_callback(struct hptiop_hba *hba, u32 tag) scp->result =SAM_STAT_CHECK_CONDITION ;memset (&scp->sense_buffer,0 ,sizeof (scp->sense_buffer)); -memcpy (&scp->sense_buffer, - &req->sg_list,le32_to_cpu (req->dataxfer_length)); +memcpy (&scp->sense_buffer, &req->sg_list, +min (sizeof (scp->sense_buffer), +le32_to_cpu (req->dataxfer_length)));break ;default :
drivers/usb/core/hcd.h +7 -1
@@ -19,6 +19,8 @@#ifdef __KERNEL__ +#include <linux/rwsem.h> +/* This file contains declarations of usbcore internals that are mostly * used or exposed by Host Controller Drivers. */
@@ -454,5 +456,9 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb) {} : (in_interrupt () ? "in_interrupt" : "can sleep")) -#endif /* __KERNEL__ */ +/* This rwsem is for use only by the hub driver and ehci-hcd. +* Nobody else should touch it. +*/ +extern struct rw_semaphore ehci_cf_port_reset_rwsem; +#endif /* __KERNEL__ */
drivers/usb/core/hub.c +14 -1
@@ -125,6 +125,12 @@ MODULE_PARM_DESC(use_both_schemes,"try the other device initialization scheme if the " "first one fails"); +/* Mutual exclusion for EHCI CF initialization. This interferes with +* port reset on some companion controllers. +*/ +DECLARE_RWSEM (ehci_cf_port_reset_rwsem); +EXPORT_SYMBOL_GPL (ehci_cf_port_reset_rwsem); +static inline char *portspeed (int portstatus) {
@@ -1460,6 +1466,11 @@ static int hub_port_reset(struct usb_hub *hub, int port1, {int i, status; +/* Block EHCI CF initialization during the port reset. +* Some companion controllers don't like it when they mix. +*/ +down_read (&ehci_cf_port_reset_rwsem); +/* Reset the port */ for (i =0 ; i <PORT_RESET_TRIES ; i++) { status = set_port_feature(hub->hdev,
@@ -1490,7 +1501,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1,usb_set_device_state (udev, status ?USB_STATE_NOTATTACHED :USB_STATE_DEFAULT ); -return status; + goto done; } dev_dbg (hub->intfdev,
@@ -1503,6 +1514,8 @@ static int hub_port_reset(struct usb_hub *hub, int port1,"Cannot enable port %i. Maybe the USB cable is bad?\n" , port1); + done: +up_read (&ehci_cf_port_reset_rwsem);return status; }
drivers/usb/core/quirks.c +1 -80
110 lines not on this page · raw message
drivers/usb/core/urb.c +1 -1
@@ -358,7 +358,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)/* enforce simple/standard policy */ allowed = (URB_NO_TRANSFER_DMA_MAP |URB_NO_SETUP_DMA_MAP | -URB_NO_INTERRUPT ); +URB_NO_INTERRUPT |URB_FREE_BUFFER );switch (temp) {case PIPE_BULK :if (is_out)
drivers/usb/gadget/ether.c +12 -0
@@ -1989,8 +1989,20 @@ static int eth_start_xmit (struct sk_buff *skb, struct net_device *net) }spin_lock_irqsave (&dev->req_lock, flags); +/* +* this freelist can be empty if an interrupt triggered disconnect() +* and reconfigured the gadget (shutting down this queue) after the +* network stack decided to xmit but before we got the spinlock. +*/ +if (list_empty (&dev->tx_reqs)) { +spin_unlock_irqrestore (&dev->req_lock, flags); +return 1 ; + } + req = container_of (dev->tx_reqs.next, struct usb_request, list);list_del (&req->list); + +/* temporarily stop TX queue when the freelist empties */ if (list_empty (&dev->tx_reqs))netif_stop_queue (net);spin_unlock_irqrestore (&dev->req_lock, flags);
drivers/usb/host/ehci-hcd.c +8 -0
@@ -570,10 +570,18 @@ static int ehci_run (struct usb_hcd *hcd)* are explicitly handed to companion controller(s), so no TT is * involved with the root hub. (Except where one is integrated, * and there's no companion controller unless maybe for USB OTG.) +* +* Turning on the CF flag will transfer ownership of all ports +* from the companions to the EHCI controller. If any of the +* companions are in the middle of a port reset at the time, it +* could cause trouble. Write-locking ehci_cf_port_reset_rwsem +* guarantees that no resets are in progress. */ +down_write (&ehci_cf_port_reset_rwsem); hcd->state =HC_STATE_RUNNING ;ehci_writel (ehci,FLAG_CF , &ehci->regs->configured_flag);ehci_readl (ehci, &ehci->regs->command);/* unblock posted writes */ +up_write (&ehci_cf_port_reset_rwsem); temp =HC_VERSION (ehci_readl (ehci, &ehci->caps->hc_capbase)); ehci_info (ehci,
drivers/usb/serial/generic.c +4 -3
@@ -208,14 +208,15 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char */* only do something if we have a bulk out endpoint */ if (serial->num_bulk_out) { -spin_lock_bh (&port->lock); +unsigned long flags; +spin_lock_irqsave (&port->lock, flags);if (port->write_urb_busy) { -spin_unlock_bh (&port->lock); +spin_unlock_irqrestore (&port->lock, flags);dbg ("%s - already writing" , __FUNCTION__);return 0 ; } port->write_urb_busy =1 ; -spin_unlock_bh (&port->lock); +spin_unlock_irqrestore (&port->lock, flags); count = (count > port->bulk_out_size) ? port->bulk_out_size : count;
drivers/video/platinumfb.c +26 -22
88 lines not on this page · raw message
include/linux/ide.h +7 -0
@@ -1437,4 +1437,11 @@ static inline int hwif_to_node(ide_hwif_t *hwif) return dev ? pcibus_to_node(dev->bus) : -1; } +static inline ide_drive_t *ide_get_paired_drive (ide_drive_t *drive) +{ +ide_hwif_t *hwif =HWIF (drive); + +return &hwif->drives[(drive->dn ^1 ) &1 ]; +} +#endif /* _IDE_H */
include/linux/libata.h +2 -0
@@ -177,6 +177,8 @@ enum {ATA_FLAG_IGN_SIMPLEX = (1 <<15 ),/* ignore SIMPLEX */ ATA_FLAG_NO_IORDY = (1 <<16 ),/* controller lacks iordy */ ATA_FLAG_ACPI_SATA = (1 <<17 ),/* need native SATA ACPI layout */ +ATA_FLAG_NO_SRST = (1 <<18 ), +ATA_FLAG_ASSUME_ATA = (1 <<19 ),/* The following flag belongs to ap->pflags but is kept in * ap->flags because it's referenced in many LLDs and will be
include/linux/usb/quirks.h +2 -5
@@ -4,11 +4,8 @@* belong here. */ -/* device must not be autosuspended */ -#define USB_QUIRK_NO_AUTOSUSPEND 0x00000001 -/* string descriptors must not be fetched using a 255-byte read */ -#define USB_QUIRK_STRING_FETCH_255 0x00000002 +#define USB_QUIRK_STRING_FETCH_255 0x00000001/* device can't resume correctly so reset it instead */ -#define USB_QUIRK_RESET_RESUME 0x00000004 +#define USB_QUIRK_RESET_RESUME 0x00000002
sound/core/Makefile +2 -1
@@ -14,7 +14,8 @@ endif snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o -snd-page-alloc-objs := memalloc.o sgbuf.o +snd-page-alloc-y := memalloc.o +snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o snd-rawmidi-objs := rawmidi.o snd-timer-objs := timer.o
sound/core/memalloc.c +6 -0
@@ -206,6 +206,7 @@ void snd_free_pages(void *ptr, size_t size)* */ +#ifdef CONFIG_HAS_DMA /* allocate the coherent DMA pages */ static void *snd_malloc_dev_pages (struct device *dev,size_t size,dma_addr_t *dma) {
@@ -239,6 +240,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,dec_snd_pages (pg); dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); } +#endif /* CONFIG_HAS_DMA */ #ifdef CONFIG_SBUS
@@ -312,12 +314,14 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, dmab->area =snd_malloc_sbus_pages (device, size, &dmab->addr);break ;#endif +#ifdef CONFIG_HAS_DMA case SNDRV_DMA_TYPE_DEV : dmab->area =snd_malloc_dev_pages (device, size, &dmab->addr);break ;case SNDRV_DMA_TYPE_DEV_SG :snd_malloc_sgbuf_pages (device, size, dmab,NULL );break ; +#endif default :printk (KERN_ERR "snd-malloc: invalid device type %d\n" , type); dmab->area =NULL ;
@@ -383,12 +387,14 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)snd_free_sbus_pages (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);break ;#endif +#ifdef CONFIG_HAS_DMA case SNDRV_DMA_TYPE_DEV :snd_free_dev_pages (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);break ;case SNDRV_DMA_TYPE_DEV_SG :snd_free_sgbuf_pages (dmab);break ; +#endif default :printk (KERN_ERR "snd-malloc: invalid device type %d\n" , dmab->dev.type); }
sound/pci/emu10k1/emumixer.c +2 -2
@@ -871,7 +871,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control = .access = SNDRV_CTL_ELEM_ACCESS_READ, .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), - .count = 4, + .count = 3, .info = snd_emu10k1_spdif_info, .get = snd_emu10k1_spdif_get_mask };
@@ -880,7 +880,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_control = { .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - .count = 4, + .count = 3, .info = snd_emu10k1_spdif_info, .get = snd_emu10k1_spdif_get, .put = snd_emu10k1_spdif_put
sound/pci/hda/patch_sigmatel.c +18 -11
@@ -162,8 +162,9 @@ static hda_nid_t stac925x_dac_nids[1] = { 0x02, }; -static hda_nid_t stac925x_dmic_nids[1 ] = { -0x15 , +#define STAC925X_NUM_DMICS 1 +static hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS +1 ] = { +0x15 ,0 };static hda_nid_t stac922x_adc_nids[2 ] = {
@@ -190,8 +191,9 @@ static hda_nid_t stac9205_mux_nids[2] = {0x19 ,0x1a }; -static hda_nid_t stac9205_dmic_nids[2 ] = { -0x17 ,0x18 , +#define STAC9205_NUM_DMICS 2 +static hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS +1 ] = { +0x17 ,0x18 ,0 }; static hda_nid_t stac9200_pin_nids[8] = {
@@ -1182,7 +1184,8 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cfcase 3 :/* add line-in as side */ if (cfg->input_pins[AUTO_PIN_LINE ] && num_dacs >3 ) { - cfg->line_out_pins[3 ] = cfg->input_pins[AUTO_PIN_LINE ]; + cfg->line_out_pins[cfg->line_outs] = + cfg->input_pins[AUTO_PIN_LINE ]; spec->line_switch =1 ; cfg->line_outs++; }
@@ -1190,12 +1193,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cfcase 2 :/* add line-in as clfe and mic as side */ if (cfg->input_pins[AUTO_PIN_LINE ] && num_dacs >2 ) { - cfg->line_out_pins[2 ] = cfg->input_pins[AUTO_PIN_LINE ]; + cfg->line_out_pins[cfg->line_outs] = + cfg->input_pins[AUTO_PIN_LINE ]; spec->line_switch =1 ; cfg->line_outs++; }if (cfg->input_pins[AUTO_PIN_MIC ] && num_dacs >3 ) { - cfg->line_out_pins[3 ] = cfg->input_pins[AUTO_PIN_MIC ]; + cfg->line_out_pins[cfg->line_outs] = + cfg->input_pins[AUTO_PIN_MIC ]; spec->mic_switch =1 ; cfg->line_outs++; }
@@ -1203,12 +1208,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cfcase 1 :/* add line-in as surr and mic as clfe */ if (cfg->input_pins[AUTO_PIN_LINE ] && num_dacs >1 ) { - cfg->line_out_pins[1 ] = cfg->input_pins[AUTO_PIN_LINE ]; + cfg->line_out_pins[cfg->line_outs] = + cfg->input_pins[AUTO_PIN_LINE ]; spec->line_switch =1 ; cfg->line_outs++; }if (cfg->input_pins[AUTO_PIN_MIC ] && num_dacs >2 ) { - cfg->line_out_pins[2 ] = cfg->input_pins[AUTO_PIN_MIC ]; + cfg->line_out_pins[cfg->line_outs] = + cfg->input_pins[AUTO_PIN_MIC ]; spec->mic_switch =1 ; cfg->line_outs++; }
@@ -2058,7 +2065,7 @@ static int patch_stac925x(struct hda_codec *codec)case 0x83847633 :/* STAC9202D */ case 0x83847636 :/* STAC9251 */ case 0x83847637 :/* STAC9251D */ - spec->num_dmics =1 ; + spec->num_dmics =STAC925X_NUM_DMICS ; spec->dmic_nids = stac925x_dmic_nids;break ;default :
@@ -2302,7 +2309,7 @@ static int patch_stac9205(struct hda_codec *codec) spec->mux_nids = stac9205_mux_nids; spec->num_muxes =ARRAY_SIZE (stac9205_mux_nids); spec->dmic_nids = stac9205_dmic_nids; - spec->num_dmics =ARRAY_SIZE (stac9205_dmic_nids); + spec->num_dmics =STAC9205_NUM_DMICS ; spec->dmux_nid =0x1d ; spec->init = stac9205_core_init;
sound/pci/rme9652/hdsp.c +3 -0
@@ -3108,6 +3108,9 @@ static int hdsp_dds_offset(struct hdsp *hdsp)unsigned int dds_value = hdsp->dds_value;int system_sample_rate = hdsp->system_sample_rate; +if (!dds_value) +return 0 ; + n =DDS_NUMERATOR ;/* * dds_value = n / rate
sound/usb/usbmixer.c +1 -1
@@ -1483,7 +1483,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsistruct snd_kcontrol *kctl;char **namelist; -if (! num_ins || desc[0 ] <6 + num_ins) { +if (! num_ins || desc[0 ] <5 + num_ins) {snd_printk (KERN_ERR "invalid SELECTOR UNIT descriptor %d\n" , unitid);return -EINVAL ; }
Linux 2.6.23.7
In reply to Greg Kroah-HartmanWe (the -stable team) are announcing the release of the 2.6.23.7 kernel. It contains a number of bugfixes filesystem specific issus.
I'll also be replying to this message with a copy of the patch between 2.6.23.6 and 2.6.23.7
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 +- fs/minix/itree_v1.c | 9 +++++++-- fs/minix/itree_v2.c | 9 +++++++-- fs/nfs/write.c | 17 +++++++++++++---- fs/ocfs2/aops.c | 22 ++++++++++++++++++++++ 5 files changed, 50 insertions(+), 9 deletions(-)
Summary of changes from v2.6.23.6 to v2.6.23.7
==============================================
Eric Sandeen (1):
minixfs: limit minixfs printks on corrupted dir i_size (CVE-2006-6058)
Greg Kroah-Hartman (1):
Linux 2.6.23.7
Mark Fasheh (1):
ocfs2: fix write() performance regression
Trond Myklebust (1):
NFS: Fix a writeback race...
Re: Linux 2.6.23.7
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
fs/minix/itree_v1.c +7 -2
@@ -23,11 +23,16 @@ static inline block_t *i_data(struct inode *inode)static int block_to_path (struct inode * inode,long block,int offsets[DEPTH ]) {int n =0 ; +char b[BDEVNAME_SIZE ];if (block <0 ) { -printk ("minix_bmap: block<0\n" ); +printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n" , + block,bdevname (inode->i_sb->s_bdev, b)); }else if (block >= (minix_sb (inode->i_sb)->s_max_size/BLOCK_SIZE )) { -printk ("minix_bmap: block>big\n" ); +if (printk_ratelimit ()) +printk ("MINIX-fs: block_to_path: " +"block %ld too big on dev %s\n" , + block,bdevname (inode->i_sb->s_bdev, b)); }else if (block <7 ) { offsets[n++] = block; }else if ((block -=7 ) <512 ) {
fs/minix/itree_v2.c +7 -2
@@ -23,12 +23,17 @@ static inline block_t *i_data(struct inode *inode)static int block_to_path (struct inode * inode,long block,int offsets[DEPTH ]) {int n =0 ; +char b[BDEVNAME_SIZE ];struct super_block *sb = inode->i_sb;if (block <0 ) { -printk ("minix_bmap: block<0\n" ); +printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n" , + block,bdevname (sb->s_bdev, b)); }else if (block >= (minix_sb (inode->i_sb)->s_max_size/sb->s_blocksize)) { -printk ("minix_bmap: block>big\n" ); +if (printk_ratelimit ()) +printk ("MINIX-fs: block_to_path: " +"block %ld too big on dev %s\n" , + block,bdevname (sb->s_bdev, b)); }else if (block <7 ) { offsets[n++] = block; }else if ((block -=7 ) <256 ) {
fs/nfs/write.c +13 -4
@@ -167,8 +167,6 @@ static void nfs_mark_uptodate(struct page *page, unsigned int base, unsigned intreturn ;if (count !=nfs_page_length (page))return ; -if (count !=PAGE_CACHE_SIZE ) -zero_user_page (page, count,PAGE_CACHE_SIZE - count,KM_USER0 );SetPageUptodate (page); }
@@ -643,7 +641,8 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,return ERR_PTR (error); }spin_unlock (&inode->i_lock); -return new; + req = new; + goto zero_page; }spin_unlock (&inode->i_lock);
@@ -671,13 +670,23 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,if (offset < req->wb_offset) { req->wb_offset = offset; req->wb_pgbase = offset; - req->wb_bytes = rqend - req->wb_offset; + req->wb_bytes =max (end, rqend) - req->wb_offset; + goto zero_page; }if (end > rqend) req->wb_bytes = end - req->wb_offset;return req; +zero_page: +/* If this page might potentially be marked as up to date, +* then we need to zero any uninitalised data. */ +if (req->wb_pgbase ==0 && req->wb_bytes !=PAGE_CACHE_SIZE + && !PageUptodate (req->wb_page)) +zero_user_page (req->wb_page, req->wb_bytes, +PAGE_CACHE_SIZE - req->wb_bytes, +KM_USER0 ); +return req; }int nfs_flush_incompatible (struct file *file,struct page *page)
fs/ocfs2/aops.c +22 -0
@@ -661,6 +661,27 @@ static void ocfs2_clear_page_regions(struct page *page, }/* +* Nonsparse file systems fully allocate before we get to the write +* code. This prevents ocfs2_write() from tagging the write as an +* allocating one, which means ocfs2_map_page_blocks() might try to +* read-in the blocks at the tail of our file. Avoid reading them by +* testing i_size against each block offset. +*/ +static int ocfs2_should_read_blk (struct inode *inode,struct page *page, +unsigned int block_start) +{ +u64 offset =page_offset (page) + block_start; + +if (ocfs2_sparse_alloc (OCFS2_SB (inode->i_sb))) +return 1 ; + +if (i_size_read (inode) > offset) +return 1 ; + +return 0 ; +} + +/* * Some of this taken from block_prepare_write(). We already have our * mapping by now though, and the entire write will be allocating or * it won't, so not much need to use BH_New.
@@ -713,6 +734,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,set_buffer_uptodate (bh); }else if (!buffer_uptodate (bh) && !buffer_delay (bh) && !buffer_new (bh) && +ocfs2_should_read_blk (inode, page, block_start) && (block_start < from || block_end > to)) {ll_rw_block (READ ,1 , &bh); *wait_bh++=bh;