commit 0215ffb08ce99e2bb59eca114a99499a4d06e704 Author: Linus Torvalds Date: Wed Nov 29 13:57:37 2006 -0800 Linux 2.6.19 It's all good. commit 315917d23fdd20a0f4ff99b9228de5840d9d276c Author: Francois Romieu Date: Wed Nov 29 22:21:33 2006 +0100 [PATCH] r8169: Fix iteration variable sign This changes the type of variable "i" in rtl8169_init_one() from "unsigned int" to "int". "i" is checked for < 0 later, which can never happen for "unsigned". This results in broken error handling. Signed-off-by: Michael Buesch Signed-off-by: Francois Romieu Signed-off-by: Linus Torvalds commit aed6fad8beca30a71a6950b6f650822254efa8c6 Author: Milan Svoboda Date: Wed Nov 29 12:09:52 2006 +0100 [ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms Move declaration of struct pxa2xx_udc_mach_info from include/asm-arm/arch-pxa/udc.h to new file include/asm-arm/mach/udc_pxa2xx.h. This allow us to use this structure with multiple platforms - pxa and ixp4xx. USB device controller used in pxa25x is the same as controller used in ixp4xx. Signed-off-by: Milan Svoboda Signed-off-by: Russell King commit f5d6c63a67a8f124ddae88511427249d1dd87880 Author: Ralf Baechle Date: Wed Nov 29 15:04:08 2006 +0000 [MIPS] Do topology_init even on uniprocessor kernels. Otherwise CPU 0 doesn't show up in sysfs which breaks some software. Signed-off-by: Ralf Baechle commit e81c73596704793e73e6dbb478f41686f15a4b34 Author: David S. Miller Date: Tue Nov 28 20:53:39 2006 -0800 [NET]: Fix MAX_HEADER setting. MAX_HEADER is either set to LL_MAX_HEADER or LL_MAX_HEADER + 48, and this is controlled by a set of CONFIG_* ifdef tests. It is trying to use LL_MAX_HEADER + 48 when any of the tunnels are enabled which set hard_header_len like this: dev->hard_header_len = LL_MAX_HEADER + sizeof(struct xxx); The correct set of tunnel drivers which do this are: ipip ip_gre ip6_tunnel sit so make the ifdef test match. Noticed by Patrick McHardy and with help from Herbert Xu. Signed-off-by: David S. Miller commit af443b6d90de17f7630621269cf0610d9d772670 Author: Patrick McHardy Date: Tue Nov 28 20:10:21 2006 -0800 [NETFILTER]: ipt_REJECT: fix memory corruption On devices with hard_header_len > LL_MAX_HEADER ip_route_me_harder() reallocates the skb, leading to memory corruption when using the stale tcph pointer to update the checksum. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2e47c264a2e6ea24c27b4987607222202818c1f4 Author: Yasuyuki Kozakai Date: Mon Nov 27 10:26:46 2006 -0800 [NETFILTER]: conntrack: fix refcount leak when finding expectation All users of __{ip,nf}_conntrack_expect_find() don't expect that it increments the reference count of expectation. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c537b75a3ba9f5d2569f313742cd379dff6ceb70 Author: Patrick McHardy Date: Mon Nov 27 10:26:25 2006 -0800 [NETFILTER]: ctnetlink: fix reference count leak When NFA_NEST exceeds the skb size the protocol reference is leaked. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 22e7410b760b9c1777839fdd10382c60df8cbda2 Author: Yasuyuki Kozakai Date: Mon Nov 27 10:25:59 2006 -0800 [NETFILTER]: nf_conntrack: fix the race on assign helper to new conntrack The found helper cannot be assigned to conntrack after unlocking nf_conntrack_lock. This tries to find helper to assign again. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit dafc741cf23351a6f43895579a72ab8818ba00ae Author: Yasuyuki Kozakai Date: Mon Nov 27 10:25:32 2006 -0800 [NETFILTER]: nfctnetlink: assign helper to newly created conntrack This fixes the bug which doesn't assign helper to newly created conntrack via nf_conntrack_netlink. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4195bdbea42151c04485b0d131eed6dd97309cee Author: Dave Jones Date: Mon Nov 27 23:58:11 2006 -0500 [PATCH] add missing libsas include to fix s390 compilation. include/scsi/libsas.h:479: error: field 'smp_req' has incomplete type include/scsi/libsas.h:480: error: field 'smp_resp' has incomplete type Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit de88777e6942de76410ad2eb2858f5fbb6eb9c35 Author: Akinobu Mita Date: Tue Nov 28 12:29:49 2006 -0800 [PATCH] ecryptfs: fix crypto_alloc_blkcipher() error check The return value of crypto_alloc_blkcipher() should be checked by IS_ERR(). Cc: Mike Halcrow Cc: Phillip Hellewell Signed-off-by: Akinobu Mita Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cce4856ff3dfa663b1a168dab48120d70820da6 Author: Akinobu Mita Date: Tue Nov 28 12:29:43 2006 -0800 [PATCH] fix create_write_pipe() error check The return value of create_write_pipe()/create_read_pipe() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 967bf623e9f5eecfb056b1ba7e0efd74a21c9c3a Author: Joakim Tjernlund Date: Tue Nov 28 23:11:52 2006 +0000 [PATCH] Fix Intel/Sharp command set erase suspend bug When we sleep and wait for a suspended operation to be resumed, go back and check until it's ready -- don't just continue after the first time we're woken. This can cause file system corruption. Signed-off-by: Joakim Tjernlund Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit ba8379b220509e9448c00a77cf6c15ac2a559cc7 Author: Chris Wright Date: Mon Nov 20 15:02:49 2006 -0800 [PATCH] bridge: fix possible overflow in get_fdb_entries Make sure to properly clamp maxnum to avoid overflow Signed-off-by: Chris Wright Acked-by: Eugene Teo Acked-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit 177b2927e2eea73c598a218680b4dc9043c51dcb Author: Ralf Baechle Date: Fri Nov 24 12:17:51 2006 +0000 [MIPS] Fix Bonito bootup message. Even when enabling Bonito IOBC coherence the kernel would actually claim it was disabling it. Signed-off-by: Ralf Baechle commit c547c77ee4d0408907847f64c403df1bf2f9c7a0 Author: Andi Kleen Date: Tue Nov 28 20:12:59 2006 +0100 [PATCH] x86-64: Use stricter in process stack check for unwinder Previously it would check for alignment only, which could break if the stack pointer was unaligned. Now explicitely check if the stack pointer is in the stack page of the current process. Ported from i386. Signed-off-by: Andi Kleen commit 38b5b036b91248be8033d42dd0778b1c75c5af58 Author: Andi Kleen Date: Tue Nov 28 20:12:59 2006 +0100 [PATCH] i386: Fix compilation with UP genericarch Fix arch/i386/mach-generic/built-in.o: In function `apicid_to_node': summit.c:(.text+0x2f): undefined reference to `apicid_2_node' with CONFIG_GENERICH_ARCH and !CONFIG_SMP Signed-off-by: Andi Kleen commit f7a23328a738b45124400d85eaf78a76939da726 Author: Andi Kleen Date: Tue Nov 28 20:12:59 2006 +0100 [PATCH] x86-64: Fix warning in io_apic.c commit ff0a538d8b08700df2b46f9aafc9fb2765071f0a Author: Jan Beulich Date: Tue Nov 28 20:12:59 2006 +0100 [PATCH] x86-64: work around gcc4 issue with -Os in Dwarf2 stack unwind This fixes a problem with gcc4 mis-compiling the stack unwind code under -Os, which resulted in 'stuck' messages whenever an assembly routine was encountered. (The second hunk is trivial cleanup.) Signed-off-by: Jan Beulich commit 24d7bb3396c51ceb2285e0e7b0c1bd1865652c43 Author: Ingo Molnar Date: Tue Nov 28 09:14:05 2006 +0100 [PATCH] x86_64: fix 'earlyprintk=...,keep' regression Commit 2c8c0e6b8d7700a990da8d24eff767f9ca223b96 ("[PATCH] Convert x86-64 to early param") broke the earlyprintk=...,keep feature. This restores that functionality. Tested on x86_64. Must-have for v2.6.19, no risk. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit c4423cccc0846a812013f39c8f8cae1d2d9dff9d Author: Jaroslav Kysela Date: Tue Nov 28 15:07:33 2006 +0100 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit 3271b7b2da1db2e5f882d8b2a5f668157a76992f Author: James Courtier-Dutton Date: Sat Nov 25 22:02:47 2006 +0000 [ALSA] snd-emu10k1: Fix capture for one variant. Fixes ALSA bug#324 Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit de1b8b93a0ba016b07d13086a15ad692536e6995 Author: Takashi Iwai Date: Wed Nov 8 15:41:29 2006 +0100 [ALSA] Fix hang-up at disconnection of usb-audio Fix hang-up at disconnection of usb-audio devices while accessing PCM. Don't handle PCM operations any more after shutdown flag is set. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 282e0c87f223afbe8b182197eb06c127a66353ce Author: John W. Linville Date: Mon Nov 6 12:01:53 2006 +0100 [ALSA] hda: fix typo for xw4400 PCI sub-ID The PCI sub-device ID for the HP xw4400 is actually 0x280c. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e7377071cd1dbe99bab9f35b11293b33f53b438d Author: Matt Porter Date: Mon Nov 6 11:20:38 2006 +0100 [ALSA] hda: fix sigmatel dell system detection Fixes Dell system detection on 9200 codecs. The support to detect certain Dell machines was merged in the 9205 table where it will be unused on the various Dell 9200-based codec systems. This moves the subsystem IDs to the correct 9200 table. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 80b8d5d6bc0000c6e499260883cfc95e645f49d1 Author: Paul Mackerras Date: Tue Oct 31 15:24:45 2006 +0100 [ALSA] Enable stereo line input for TAS codec Despite what the data sheet says in one place, to get stereo input from input A (line in), we have to clear the 'input B monaural' bit in the ACR. Signed-off-by: Paul Mackerras Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ac5d1a7d253f3c02d1e5c93edfa26e81466ec71e Author: Clemens Ladisch Date: Fri Oct 27 10:45:00 2006 +0200 [ALSA] rtctimer: handle RTC interrupts with a tasklet The calls to rtc_control() from inside the interrupt handler can upset the RTC code, so move our interrupt handling code to a tasklet. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 08475a1920aa7acc535324d6991b830fa7625bd8 Author: Brian King Date: Mon Nov 20 13:51:56 2006 -0600 [PATCH] libata: Fixup ata_sas_queuecmd to handle __ata_scsi_queuecmd failure Fixes ata_sas_queuecmd to properly handle a failure from __ata_scsi_queuecmd. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit f33d625f40e3b803c4cdea3219abb96cabf5ea03 Author: Jason Gaston Date: Tue Nov 21 16:55:58 2006 -0800 [PATCH] ahci: AHCI mode SATA patch for Intel ICH9 This patch adds the Intel ICH9 AHCI controller DID's for SATA support. Signed-off-by: Jason Gaston Signed-off-by: Jeff Garzik commit c31f571d9f42fa2e89148811730fe3dc64943a6e Author: Tejun Heo Date: Wed Nov 22 12:39:43 2006 +0900 [PATCH] libata: don't schedule EH on wcache on/off if old EH Do not schedule EH for revalidation on wcache on/off if old EH. Old EH cannot handle it and will result in WARN_ON()'s and oops. This closes bug #7412. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fc5d81e69d15c65ca20d9e5b4e242690e3e9c27d Author: Akinobu Mita Date: Mon Nov 27 15:16:48 2006 +0900 selinux: fix dentry_open() error check The return value of dentry_open() shoud be checked by IS_ERR(). Cc: Stephen Smalley Cc: James Morris Signed-off-by: Akinobu Mita Signed-off-by: James Morris commit 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 Author: Linus Torvalds Date: Sun Nov 26 19:05:22 2006 -0800 Fix 'ALIGN()' macro, take 2 You wouldn't think that doing an ALIGN() macro that aligns something up to a power-of-two boundary would be likely to have bugs, would you? But hey, in the wonderful world of mixing integer types, you have to be careful. This just makes sure that the alignment is interpreted in the same type as the thing to be aligned. Thanks to Roland Dreier, who noticed that the amso1100 driver got broken by the previous fix (that just extended the mask to "unsigned long", but was still broken in "unsigned long long" - it just happened to be the same on 64-bit architectures). See commit 4c8bd7eeee4c8f157fb61fb64b57500990b42e0e for the history of bugs here... Acked-by: Roland Dreier Cc: Andrew Morton Cc: David Miller Cc: Al Viro Signed-off-by: Linus Torvalds commit c9c3b86f2ab79f7f6e87eb735f9cc4508b73fc48 Author: Kyle McMartin Date: Sun Nov 26 18:56:56 2006 -0500 [PATCH] Fix incorrent type of flags in I still think using BUILD_BUG_ON() is unacceptable, especially given how vague the error message was. Signed-off-by: Kyle McMartin [ And I already removed gthe BUILD_BUG_ON() in the previous commit ] Signed-off-by: Linus Torvalds commit b8e6ec865fd1d8838b6ce9516977b65e9f08f876 Author: Linus Torvalds Date: Sun Nov 26 16:27:17 2006 -0800 Revert "[PATCH] Enforce "unsigned long flags;" when spinlocking" This reverts commit ee3ce191e8eaa4cc15c51a28b34143b36404c4f5, since it broke on at least ARM, MIPS and PA-RISC due to complicated header file dependencies. Conflicts in include/linux/spinlock.h (due to the "nested" variety fixes) fixed up by hand. Cc: Alexey Dobriyan Cc: Ralf Baechle Cc: Kyle McMartin Cc: Russell King Signed-off-by: Linus Torvalds commit e730bf96c89b27b2a90ae3e8054dae6133b4f90b Author: Russell King Date: Sat Nov 25 20:15:12 2006 +0000 [ARM] Export smp_call_function() smp_call_function() will be used with the MP/core oprofile support patch. Export it as _GPL. Signed-off-by: Russell King commit d00ec458cb9235025d20cf2783d3ddcd879a6c48 Author: Russell King Date: Sat Nov 25 16:19:23 2006 +0000 [ARM] Add PM_LEGACY defaults Eliminate two warnings: kernel/power/pm.c:205: warning: 'pm_register' is deprecated (declared at kernel/power/pm.c:64) kernel/power/pm.c:206: warning: 'pm_send_all' is deprecated (declared at kernel/power/pm.c:180) by updating defconfig files to contain a sensible PM_LEGACY default. Signed-off-by: Russell King commit 221a09d5c4cb8384d9be74db60f37a5752675255 Author: Andrew de Quincey Date: Wed Nov 22 18:01:21 2006 -0300 V4L/DVB (4874): Fix oops on symbol rate==0 The tda10086 causes an oops (divide by zero) if a zero symbol rate is used; this prevents this. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit f7668162a366d1ce0fe84122d11108e13a8ce950 Author: Hans Verkuil Date: Sat Nov 25 09:40:28 2006 -0300 V4L/DVB (4885): Improve saa711x check The old code would accept any device on the same i2c address as the saa711x chips as an saa711x. However, this fails with saa717x chips, which use that same address and so are misdetected as a saa7111. Now check whether the chip is really a saa711x model. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5718bbd2d92b9c2aa2f5700e4d3ed9d72f72f47e Author: Luca Risolia Date: Tue Nov 21 08:13:59 2006 -0300 V4L/DVB (4865): Fix: Slot 0 not NULL on disconnecting SN9C10x PC Camera The patch fix bug 5748. Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit a5bbc7d94cf1dcb2100eeaf68791a401ad7ce54d Author: Ira Snyder Date: Mon Nov 20 07:20:48 2006 -0300 V4L/DVB (4849): Add missing spin_unlock to saa6588 decoder driver Sparse noticed a lock imbalance in read_from_buf(). Further inspection shows that the lock should not be held when the function exits. This adds a spin_unlock_irqrestore(), so that every exit path of the read_from_buf() function is consistent. The unlock was missing on an error path. Signed-off-by: Ira W. Snyder Signed-off-by: Hans J. Koch Signed-off-by: Mauro Carvalho Chehab commit 30d9464c76743160612e7de0b2f5f656c78915d3 Author: Andrew de Quincey Date: Thu Nov 16 22:12:40 2006 -0300 V4L/DVB (4832): Fix uninitialised variable in dvb_frontend_swzigzag Spotted by coverity/Adrian Bunk. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit bc495b66d048d64a9b8aeb49ca8405f4687ca123 Author: Oliver Endriss Date: Sun Nov 19 02:15:37 2006 -0300 V4L/DVB (4840): Budget: diseqc_method module parameter for cards with subsystem-id 13c2:1003 New module parameter diseqc_method for cards with subsystem-id 13c2:1003. - 0: unreliable method, can be used by all board revisions (default) - 1: reliable method, works for newer board layouts only The parameter has no effect for cards with other subsystem-ids. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c4e46b9567669eb5e1182d4b12c2d889ce27da64 Author: Andrew de Quincey Date: Thu Nov 16 18:31:04 2006 -0300 V4L/DVB (4831): Fix tuning on older budget DVBS cards. Fixes to DISEQC on these cards inadvertently broke normal tone/voltage signalling. This restores the necessary function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 9abbffee861c6c56fce27e4eda96a10cf0de0f84 Author: Masahide NAKAMURA Date: Fri Nov 24 20:34:51 2006 -0800 [XFRM] STATE: Fix to respond error to get operation if no matching entry exists. When application uses XFRM_MSG_GETSA to get state entry through netlink socket and kernel has no matching one, the application expects reply message with error status by kernel. Kernel doesn't send the message back in the case of Mobile IPv6 route optimization protocols (i.e. routing header or destination options header). This is caused by incorrect return code "0" from net/xfrm/xfrm_user.c(xfrm_user_state_lookup) and it makes kernel skip to acknowledge at net/netlink/af_netlink.c(netlink_rcv_skb). This patch fix to reply ESRCH to application. Signed-off-by: Masahide NAKAMURA Signed-off-by: TAKAMIYA Noriaki Signed-off-by: David S. Miller commit dc9b334622bff6d22456917a034c2e2d194b9328 Author: Paul Bonser Date: Thu Nov 23 17:56:13 2006 -0800 [NET]: Re-fix of doc-comment in sock.h Restoring old, correct comment for sk_filter_release, moving it to where it should actually be, and changing new comment into proper comment for sk_filter_rcu_free, where it actually makes sense. The original fix submitted for this on Oct 23 mistakenly documented the wrong function. Signed-off-by: Paul Bonser Signed-off-by: David S. Miller commit 95f6134e175fd69ab3f088f7a09adbd3fd3548e1 Author: Jean Delvare Date: Thu Nov 23 11:48:28 2006 -0800 [6PACK]: Masking bug in 6pack driver. Looks like a broken masking to me, binary not is used where bitwise not was intended. Signed-off-by: Jean Delvare Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit ac16ca6412d9feb5b2f8fc76a4ed938b5d107f94 Author: Akinobu Mita Date: Wed Nov 22 20:26:11 2006 -0800 [NET]: Fix kfifo_alloc() error check. The return value of kfifo_alloc() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: David S. Miller commit 753eab76a3337863a0d86ce045fa4eb6c3cbeef9 Author: Olaf Kirch Date: Wed Nov 22 20:11:42 2006 -0800 [UDP]: Make udp_encap_rcv use pskb_may_pull Make udp_encap_rcv use pskb_may_pull IPsec with NAT-T breaks on some notebooks using the latest e1000 chipset, when header split is enabled. When receiving sufficiently large packets, the driver puts everything up to and including the UDP header into the header portion of the skb, and the rest goes into the paged part. udp_encap_rcv forgets to use pskb_may_pull, and fails to decapsulate it. Instead, it passes it up it to the IKE daemon. Signed-off-by: Olaf Kirch Signed-off-by: Jean Delvare Signed-off-by: David S. Miller commit 38f7efd52c4f3f0b22c460eadbfe7c42f9ebff82 Author: Faidon Liambotis Date: Tue Nov 21 21:46:02 2006 -0800 [NETFILTER]: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT H.323 connection tracking code calls ip_ct_refresh_acct() when processing RCFs and URQs but passes NULL as the skb. When CONFIG_IP_NF_CT_ACCT is enabled, the connection tracking core tries to derefence the skb, which results in an obvious panic. A similar fix was applied on the SIP connection tracking code some time ago. Signed-off-by: Faidon Liambotis Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5d48545e5e88ab7a27ba6a5cb1e8fff617754b61 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Nov 25 11:09:39 2006 -0800 [PATCH] uml: make execvp safe for our usage Reimplement execvp for our purposes - after we call fork() it is fundamentally unsafe to use the kernel allocator - current is not valid there. So we simply pass to our modified execvp() a preallocated buffer. This fixes a real bug and works very well in testing (I've seen indirectly warning messages from the forked thread - they went on the pipe connected to its stdout and where read as a number by UML, when calling read_output(). I verified the obtained number corresponded to "BUG:"). The added use of __cant_sleep() is not a new bug since __cant_sleep() is already used in the same function - passing an atomicity parameter would be better but it would require huge change, stating that this function must not be called in atomic context and can sleep is a better idea (will make sure of this gradually). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dce447a542d8b4bedf13d6a4c4fc6737240372e Author: Mariusz Kozlowski Date: Sat Nov 25 11:09:38 2006 -0800 [PATCH] usb: ati remote memleak fix This is a bug. When checking for ati_remote->outbuf we free freeing ati_remote->inbuf so we end up freeing ati_remote->inbuf twice. Also the checks for 'ati_remote->inbuf != NULL' and 'ati_remote->outbuf != NULL' are redundant as usb_buffer_free() does this. Signed-off-by: Mariusz Kozlowski Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd3ef2346f924d6c0e82236c20fdb3a8840136a Author: Arjan van de Ven Date: Sat Nov 25 11:09:37 2006 -0800 [PATCH] lockdep: spin_lock_irqsave_nested() Introduce spin_lock_irqsave_nested(); implementation from: http://lkml.org/lkml/2006/6/1/122 Patch from: http://lkml.org/lkml/2006/9/13/258 [akpm@osdl.org: two compile fixes] Signed-off-by: Arjan van de Ven Signed-off-by: Jiri Kosina Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee3ce191e8eaa4cc15c51a28b34143b36404c4f5 Author: Alexey Dobriyan Date: Sat Nov 25 11:09:36 2006 -0800 [PATCH] Enforce "unsigned long flags;" when spinlocking Make it break or warn if you pass to spin_lock_irqsave() and friends something different from "unsigned long flags;". Suprisingly large amount of these was caught by recent commit c53421b18f205c5f97c604ae55c6a921f034b0f6 and others. Idea is largely from FRV typechecking. Suggestions from Andrew Morton. All stupid typos in first version fixed. Passes allmodconfig on i386, x86_64, alpha, arm as well as my usual config. Note #1: checking with sparse is still needed, because a driver can save and pass around flags or something. So far patch is very intrusive. Note #2: techically, we should break only if sizeof(flags) < sizeof(unsigned long), however, the more pain for getting suspicious code into kernel, the better. Signed-off-by: Alexey Dobriyan Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e66b0b5f187c811419ff10cfb5668c028a64d57 Author: Akinobu Mita Date: Sat Nov 25 11:09:35 2006 -0800 [PATCH] tlclk: fix platform_device_register_simple() error check The return value of platform_device_register_simple() should be checked by IS_ERR(). This patch also fix misc_register() error case. Because misc_register() returns error code. Cc: Sebastien Bouchard Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 753ca4f312a4b26940e4731b4fa5dbbbbcc77e97 Author: Akinobu Mita Date: Sat Nov 25 11:09:34 2006 -0800 [PATCH] fix copy_process() error check The return value of copy_process() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1b26c32af51d0fd82754bc06b495dd03c2f2d58 Author: Jeremy Higdon Date: Sat Nov 25 11:09:33 2006 -0800 [PATCH] sgiioc4: Disable module unload This patch removes a module_exit function that sgiioc4 should not have had. It seems that the IDE layer doesn't support submodule unloading. sgiioc4 was the only driver in drivers/ide/pci that had an exit function. After an unload, the devices would stay around and the next attempt to reference would crash... Signed-off-by: Jeremy Higdon Acked-by: "Bartlomiej Zolnierkiewicz" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c154348f00834911c49aa63dfb48bd50d1a07d93 Author: Roman Zippel Date: Sat Nov 25 11:09:32 2006 -0800 [PATCH] fix menuconfig colours with TERM=vt100 On Mon, 13 Nov 2006, Phil Oester wrote: > In commit 350b5b76384e77bcc58217f00455fdbec5cac594, the default menuconfig > color scheme was changed to bluetitle. This breaks the highlighting > of the selected item for me with TERM=vt100. The only way I can see > which item is selected is via: > > make MENUCONFIG_COLOR=mono menuconfig > > Which restores the pre-2.6.19 white on black highlighting. Fix. Cc: Phil Oester Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f12aa7045280836307e9bbdb1c676c4a94e2b3d3 Author: Roman Zippel Date: Sat Nov 25 11:09:31 2006 -0800 [PATCH] qconf: fix uninitialsied member Fixes a segfault reported by Randy. Cc: Randy Dunlap Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82189b9807e05ea8d1f69de5bf92eaf244a0eb12 Author: Catalin Marinas Date: Sat Nov 25 11:09:30 2006 -0800 [PATCH] Fix device_attribute memory leak in device_del dev->devt_attr is allocated in device_add() but it is never freed in device_del() in the drivers/base/core.c file (reported by kmemleak). Signed-off-by: Catalin Marinas Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 533221fbaf001692d5db646f84f7d033fac78cc7 Author: Alexey Dobriyan Date: Sat Nov 25 11:09:30 2006 -0800 [PATCH] reiserfs: fmt bugfix One reiserfs_warning() call uses %lu, but doesn't supply what to print. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17ad78e59a0334d64c3a37f964b15ab9918313c7 Author: Adrian Bunk Date: Sat Nov 25 11:09:29 2006 -0800 [PATCH] drivers/rtc/rtc-rs5c372.c: fix a NULL dereference The correct order is: NULL check before dereference This was a guaranteed NULL dereference with debugging enabled since rs5c372_sysfs_show_osc() does actually pass NULL... Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d728b1e69fd5829ec2ab2434381e5a268d4f684a Author: David Brownell Date: Sat Nov 25 11:09:28 2006 -0800 [PATCH] rtc class locking bugfixes I got a lockdep warning when running "rtctest" so I though it'd be good to see what was up. - The warning was for rtc->irq_task_lock, gotten from rtc_update_irq() by irq handlerss ... but in a handful of other cases, grabbed without blocking IRQs. - Some callers to rtc_update_irq() were not ensuring IRQs were blocked, yet the routine expects that; make sure all callers block IRQs. It would appear that RTC API tests haven't been part of anyone's kernel regression test suite recently, at least not with lockdep running. Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2601a46474db2dcbc08ee690e56f08a10abe65cb Author: David Brownell Date: Sat Nov 25 11:09:27 2006 -0800 [PATCH] rtc framework handles periodic irqs The RTC framework has an irq_set_freq() method that should be used to manage the periodic IRQ frequency, but the current ioctl logic doesn't know how to do that. This patch teaches it how. This means that drivers implementing irq_set_freq() will automatically support RTC_IRQP_{READ,SET} ioctls; that logic doesn't need duplication within the driver. [akpm@osdl.org: export rtc_irq_set_freq] Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7531d8faa85f8880db433027bf2b04950e49baeb Author: David Brownell Date: Sat Nov 25 11:09:26 2006 -0800 [PATCH] Documentation/rtc.txt updates (for rtc class) This updates the RTC documentation to summarize the two APIs now available: the old PC/AT one, and the new RTC class drivers. It also updates the included "rtctest.c" file to better meet Linux style guidelines, and to work with the new RTC drivers. Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d8ebddcc525a5800dab5880946cecffe73e9dca Author: Randy Dunlap Date: Sat Nov 25 11:09:26 2006 -0800 [PATCH] debugfs: add header file debugfs needs include/linux/kobject.h for . Signed-off-by: Randy Dunlap Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 701e054e0c2db82359f0454c7ed4fd24346d52eb Author: Vasily Tarasov Date: Sat Nov 25 11:09:22 2006 -0800 [PATCH] mounstats NULL pointer dereference OpenVZ developers team has encountered the following problem in 2.6.19-rc6 kernel. After some seconds of running script while [[ 1 ]] do find /proc -name mountstats | xargs cat done this Oops appears: BUG: unable to handle kernel NULL pointer dereference at virtual address 00000010 printing eip: c01a6b70 *pde = 00000000 Oops: 0000 [#1] SMP Modules linked in: xt_length ipt_ttl xt_tcpmss ipt_TCPMSS iptable_mangle iptable_filter xt_multiport xt_limit ipt_tos ipt_REJECT ip_tables x_tables parport_pc lp parport sunrpc af_packet thermal processor fan button battery asus_acpi ac ohci_hcd ehci_hcd usbcore i2c_nforce2 i2c_core tg3 floppy pata_amd ide_cd cdrom sata_nv libata CPU: 1 EIP: 0060:[] Not tainted VLI EFLAGS: 00010246 (2.6.19-rc6 #2) EIP is at mountstats_open+0x70/0xf0 eax: 00000000 ebx: e6247030 ecx: e62470f8 edx: 00000000 esi: 00000000 edi: c01a6b00 ebp: c33b83c0 esp: f4105eb4 ds: 007b es: 007b ss: 0068 Process cat (pid: 6044, ti=f4105000 task=f4104a70 task.ti=f4105000) Stack: c33b83c0 c04ee940 f46a4a80 c33b83c0 e4df31b4 c01a6b00 f4105000 c0169231 e4df31b4 c33b83c0 c33b83c0 f4105f20 00000003 f4105000 c0169445 f2503cf0 f7f8c4c0 00008000 c33b83c0 00000000 00008000 c0169350 f4105f20 00008000 Call Trace: [] mountstats_open+0x0/0xf0 [] __dentry_open+0x181/0x250 [] nameidata_to_filp+0x35/0x50 [] do_filp_open+0x50/0x60 [] seq_read+0xc6/0x300 [] get_unused_fd+0x31/0xc0 [] do_sys_open+0x63/0x110 [] sys_open+0x27/0x30 [] sysenter_past_esp+0x56/0x79 ======================= Code: 45 74 8b 54 24 20 89 44 24 08 8b 42 f0 31 d2 e8 47 cb f8 ff 85 c0 89 c3 74 51 8d 80 a0 04 00 00 e8 46 06 2c 00 8b 83 48 04 00 00 <8b> 78 10 85 ff 74 03 f0 ff 07 b0 01 86 83 a0 04 00 00 f0 ff 4b EIP: [] mountstats_open+0x70/0xf0 SS:ESP 0068:f4105eb4 The problem is that task->nsproxy can be equal NULL for some time during task exit. This patch fixes the BUG. Signed-off-by: Vasily Tarasov Cc: Herbert Poetzl Cc: "Serge E. Hallyn" Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d51013ed2f2b6a5d2369b7fbbd989df1f6369e2 Author: Miklos Szeredi Date: Sat Nov 25 11:09:20 2006 -0800 [PATCH] fuse: fix Oops in lookup Fix bug in certain error paths of lookup routines. The request object was reused for sending FORGET, which is illegal. This bug could cause an Oops in 2.6.18. In earlier versions it might silently corrupt memory, but this is very unlikely. These error paths are never triggered by libfuse, so this wasn't noticed even with the 2.6.18 kernel, only with a filesystem using the raw kernel interface. Thanks to Russ Cox for the bug report and test filesystem. Signed-off-by: Miklos Szeredi Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a26d79ca81d6e46c445c8db87a89740c9b4d17e9 Author: Thomas Chou Date: Sat Nov 25 11:09:18 2006 -0800 [PATCH] initramfs: handle more than one source dir or file list Fix bug 7401. Handle more than one source dir or file list to the initramfs gen scripts. The Kconfig help for INITRAMFS_SOURCE claims that you can specify multiple space-separated sources in order to allow unprivileged users to build an image. There are two bugs in the current implementation that prevent this from working. First, we pass "file1 dir2" to the gen_initramfs_list.sh script, which it obviously can't open. Second, gen_initramfs_list.sh -l outputs multiple definitions for deps_initramfs -- one for each argument. Signed-off-by: Thomas Chou Cc: Sam Ravnborg Acked-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e4d9dcb4205dd43c4297168022ed0c6874fb918 Author: Daniel Ritz Date: Sat Nov 25 11:09:17 2006 -0800 [PATCH] fix "pcmcia: fix 'rmmod pcmcia' with unbound devices" Add required locking to dfbc9e9d33adb1ac9910dd7f8ceb911947039a52 Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Cc: Pavol Gono Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abbfb412b1610ec3a7ec0164108cee01191d9f5 Author: Mel Gorman Date: Thu Nov 23 12:01:41 2006 +0000 [PATCH] x86_64: fix bad page state in process 'swapper' find_min_pfn_for_node() and find_min_pfn_with_active_regions() both depend on a sorted early_node_map[]. However, sort_node_map() is being called after fin_min_pfn_with_active_regions() in free_area_init_nodes(). In most cases, this is ok, but on at least one x86_64, the SRAT table caused the E820 ranges to be registered out of order. This gave the wrong values for the min PFN range resulting in some pages not being initialised. This patch sorts the early_node_map in find_min_pfn_for_node(). It has been boot tested on x86, x86_64, ppc64 and ia64. Signed-off-by: Mel Gorman Acked-by: Andre Noll Signed-off-by: Linus Torvalds commit 0b1082efb92eedb28e982cfae526267ebdcf5622 Author: Jean Delvare Date: Thu Nov 23 13:28:50 2006 +0100 [PATCH] Fix i2c-ixp4xx compile (missing brace) Fix recent i2c-ixp4xx compilation breakage. Sorry for overlooking it. Signed-off-by: Jean Delvare Signed-off-by: Linus Torvalds commit 0916bd3ebb7cefdd0f432e8491abe24f4b5a101e Author: Dave Jones Date: Wed Nov 22 20:42:01 2006 -0500 [PATCH] Correct bound checking from the value returned from _PPC method. processor_perflib.c::acpi_processor_ppc_notifier() check if the value returned by the processor's _PPC method is 0 and return failed if so. This is wrong since 0 indicate that the bios think the processor can go to the highest frequency. This patch for example fix the HP NX 6125 to allow its highest frequency to be available. Signed-off-by: Bruno Ducrot Cc: "Pallipadi, Venkatesh" Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit ec7080d185a9b79581bf1dbe300e877719c0b1a9 Author: Manuel Lauss Date: Wed Nov 22 14:51:32 2006 +0100 [PATCH] make au1xxx-ide compile again The Au1xx IDE controller driver doesn't compile: CC drivers/ide/mips/au1xxx-ide.o /linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:480: error: conflicting types for 'auide_ddma_tx_callback' include2/asm/mach-au1x00/au1xxx_ide.h:174: error: previous declaration of 'auide_ddma_tx_callback' was here /linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:486: error: conflicting types for 'auide_ddma_rx_callback' include2/asm/mach-au1x00/au1xxx_ide.h:176: error: previous declaration of 'auide_ddma_rx_callback' was here Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit eb4828750852b84703f64747b3bedf6394d629ef Author: Thiemo Seufer Date: Thu Nov 16 22:13:54 2006 +0000 [MIPS] Hack for SB1 cache issues Removing flush_icache_page a while ago broke SB1 which was using an empty flush_data_cache_page function. This glues things well enough so a more efficient but also more intrusive solution can be found later. Signed-Off-By: Thiemo Seufer Signed-off-by: Ralf Baechle commit 66c669baa7d70b8d135da67f36c8dba12cea71b8 Author: Linus Torvalds Date: Wed Nov 22 14:55:29 2006 -0800 [AGP] Allocate AGP pages with GFP_DMA32 by default Not all graphic page remappers support physical addresses over the 4GB mark for remapping, so while some do (the AMD64 GART always did, and I just fixed the i965 to do so properly), we're safest off just forcing GFP_DMA32 allocations to make sure graphics pages get allocated in the low 32-bit address space by default. AGP sub-drivers that really care, and can do better, could just choose to implement their own allocator (or we could add another "64-bit safe" default allocator for their use), but quite frankly, you're not likely to care in practice. So for now, this trivial change means that we won't be allocating pages that we can't map correctly by mistake on x86-64. [ On traditional 32-bit x86, this could never happen, because GFP_KERNEL would never allocate any highmem memory anyway ] Acked-by: Andi Kleen Acked-by: Dave Jones Cc: Eric Anholt Cc: Keith Packard Signed-off-by: Linus Torvalds commit 21f37bc3e51fac4f7a226a6d110c4c316af0d22d Author: Kristoffer Ericson Date: Tue Nov 21 01:20:31 2006 +0100 [ARM] 3941/1: [Jornada7xx] - Addition to MAINTAINERS Adding myself to the MAINTAINERS file. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 105ef9a0af1469a9dd906839dd4628aa9c013f58 Author: Dan Williams Date: Tue Nov 21 22:57:23 2006 +0100 [ARM] 3942/1: ARM: comment: consistent_sync should not be called directly /* * Note: Drivers should NOT use this function directly, as it will break * platforms with CONFIG_DMABOUNCE. * Use the driver DMA support - see dma-mapping.h (dma_sync_*) */ Signed-off-by: Dan Williams Signed-off-by: Russell King commit 7d915a38985d2826acbdc9dc9cca8a93e23e5278 Author: Linus Torvalds Date: Wed Nov 22 09:37:54 2006 -0800 [AGP] Fix intel 965 AGP memory mapping function This introduces a i965-specific "mask_memory()" function that knows about the extended physical addresses that the i965 supports. This allows us to correctly map in physical memory in the >4GB range into the GTT. Also simplify/clean-up the i965 case for the aperture sizing by just returning the fixed 512kB size from "fetch_size()". We don't really care that not all of the aperture may be visible - the only thing that cares about the aperture size is the Intel "stolen memory" calculation, which depends on the fixed size. Cc: Keith Packard Cc: Eric Anholt Cc: Dave Jones Signed-off-by: Linus Torvalds commit b42172fc7b569a0ef2b0fa38d71382969074c0e2 Author: Linus Torvalds Date: Wed Nov 22 09:32:06 2006 -0800 Don't call "note_interrupt()" with irq descriptor lock held This reverts commit f72fa707604c015a6625e80f269506032d5430dc, and solves the problem that it tried to fix by simply making "__do_IRQ()" call the note_interrupt() function without the lock held, the way everybody else does. It should be noted that all interrupt handling code must never allow the descriptor actors to be entered "recursively" (that's why we do all the magic IRQ_PENDING stuff in the first place), so there actually is exclusion at that much higher level, even in the absense of locking. Acked-by: Vivek Goyal Acked-by:Pavel Emelianov Cc: Andrew Morton Cc: Ingo Molnar Cc: Adrian Bunk Signed-off-by: Linus Torvalds commit 8746ed3dae14e87e9f7ad8e44649b72e22b33274 Author: Kim Phillips Date: Tue Nov 21 18:19:42 2006 -0600 [POWERPC] Fix ucc_geth of_device discovery on mpc832x mpc832x, as in mpc8360, needs to explicitly find and create the platform device for ucc_geth in 2.6.19. This code will likely be readapted to Benh's new of_ methods for 2.6.20. Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 12862086f24d7382b24379bbcbe0dadf12ca5945 Author: Ira W. Snyder Date: Tue Nov 21 17:44:31 2006 -0800 [TG3]: Add missing unlock in tg3_open() error path. Sparse noticed a locking imbalance in tg3_open(). This patch adds an unlock to one of the error paths, so that tg3_open() always exits without the lock held. Signed-off-by: Ira W. Snyder Signed-off-by: David S. Miller commit f2776ff047229c3e7cee2454e2704dd6f98fa32f Author: YOSHIFUJI Hideaki Date: Tue Nov 21 17:41:56 2006 -0800 [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture. TCP and RAW do not have this issue. Closes Bug #7432. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 700f9672c9a61c12334651a94d17ec04620e1976 Author: Peter Zijlstra Date: Tue Nov 21 17:33:01 2006 -0800 [IRDA]: Lockdep fix. On Sat, 2006-11-18 at 16:12 +0300, Andrey Borzenkov wrote: > ============================================= > [ INFO: possible recursive locking detected ] > 2.6.19-rc5-2avb #2 > - --------------------------------------------- > pppd/26425 is trying to acquire lock: > (&hashbin->hb_spinlock){....}, at: [] irlmp_slsap_inuse+0x5a/0x170 > [irda] > > but task is already holding lock: > (&hashbin->hb_spinlock){....}, at: [] irlmp_slsap_inuse+0x37/0x170 > [irda] > > other info that might help us debug this: > 1 lock held by pppd/26425: > #0: (&hashbin->hb_spinlock){....}, at: [] > irlmp_slsap_inuse+0x37/0x170 [irda] > > stack backtrace: > [] dump_trace+0x1cc/0x200 > [] show_trace_log_lvl+0x1a/0x30 > [] show_trace+0x12/0x20 > [] dump_stack+0x19/0x20 > [] __lock_acquire+0x8fa/0xc20 > [] lock_acquire+0x5d/0x80 > [] _spin_lock+0x2c/0x40 > [] irlmp_slsap_inuse+0x5a/0x170 [irda] > [] irlmp_open_lsap+0x62/0x180 [irda] > [] irttp_open_tsap+0x181/0x230 [irda] > [] ircomm_open_tsap+0x5d/0xa0 [ircomm] > [] ircomm_open+0xb8/0xd0 [ircomm] > [] ircomm_tty_open+0x4f7/0x570 [ircomm_tty] > [] tty_open+0x174/0x340 > [] chrdev_open+0x89/0x170 > [] __dentry_open+0xa6/0x1d0 > [] nameidata_to_filp+0x35/0x40 > [] do_filp_open+0x49/0x50 > [] do_sys_open+0x47/0xd0 > [] sys_open+0x1c/0x20 > [] sysenter_past_esp+0x56/0x8d > [] 0xb7f86410 > ======================= The comment at the nesting lock says: /* Careful for priority inversions here ! * irlmp->links is never taken while another IrDA * spinlock is held, so we are safe. Jean II */ So, under the assumption the author was right, it just needs a lockdep annotation. Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit df9c23095fc8652798c41dd860676d3dafb2f1dc Author: Kim Phillips Date: Tue Nov 21 10:31:14 2006 -0600 [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class" This reverts commit 7a69af63e788a324d162201a0b23df41bcf158dd. As advised by David Brownell: http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2 Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 6c12c18dfb0ccae21816de3e0c323b5250450d82 Author: Kim Phillips Date: Tue Nov 21 10:31:08 2006 -0600 [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX" This reverts commit a8ed4f7ec3aa472134d7de6176f823b2667e450b. As advised by David Brownell: http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2 Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 4498c80d9c1ebdf42837be6a52ead35a2aa2b819 Author: David S. Miller Date: Tue Nov 21 16:17:41 2006 -0800 [BLUETOOTH]: Fix unaligned access in hci_send_to_sock. The "u16 *" derefs of skb->data need to be wrapped inside of a get_unaligned(). Thanks to Gustavo Zacarias for the bug report. Signed-off-by: David S. Miller commit 785fd8b8a597519127c6d9e16e81f48af2ad391e Author: Jamal Hadi Salim Date: Sun Nov 19 14:55:30 2006 -0800 [XFRM]: nlmsg length not computed correctly in the presence of subpolicies I actually dont have a test case for these; i just found them by inspection. Refer to patch "[XFRM]: Sub-policies broke policy events" for more info Signed-off-by: Jamal Hadi Salim Acked-by: Masahide NAKAMURA Signed-off-by: David S. Miller commit 334f3d45d3e0c925eb15003560cdd6f5383c88d0 Author: Jamal Hadi Salim Date: Sun Nov 19 14:53:07 2006 -0800 [XFRM]: Sub-policies broke policy events XFRM policy events are broken when sub-policy feature is turned on. A simple test to verify this: run ip xfrm mon on one window and add then delete a policy on another window .. Signed-off-by: Jamal Hadi Salim Acked-by: Masahide NAKAMURA Signed-off-by: David S. Miller commit fb47ddb2db9c18664bd7b06c201a2398885b64fc Author: David L Stevens Date: Sun Nov 19 10:38:39 2006 -0800 [IGMP]: Fix IGMPV3_EXP() normalization bit shift value. The IGMPV3_EXP() macro doesn't correctly shift the normalization bit, so time-out values are longer than they should be. Thanks to Dirk Ooms for finding the problem in IGMPv3 - MLDv2 had a similar problem that was already fixed a year ago. :-( Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 354f60a9952d0af59e684b91cc6e06b95fbbf5ef Author: Marcel Holtmann Date: Sat Nov 18 22:15:20 2006 +0100 [Bluetooth] Ignore L2CAP config requests on disconnect Any L2CAP connection in disconnecting state shall not response to any further config requests from the remote side. So in case such a request is received, ignore it. Signed-off-by: Ville Tervo Signed-off-by: Marcel Holtmann commit 820ae1b865caa05e0614004d0183ca70de2b8665 Author: Marcel Holtmann Date: Sat Nov 18 22:15:00 2006 +0100 [Bluetooth] Always include MTU in L2CAP config responses When sending a positive config response it shall include the actual MTU to be used on this channel. This differs from the Bluetooth 1.1 specification where it was enough to acknowledge the config request. Signed-off-by: Marcel Holtmann commit ff2d367ac33b9278c9516ac1888207dac11d10b0 Author: Marcel Holtmann Date: Sat Nov 18 22:14:42 2006 +0100 [Bluetooth] Check if RFCOMM session is still attached to the TTY If the RFCOMM session is no longer attached to the TTY device, then it makes no sense to go through with changing the termios settings. Signed-off-by: Marcel Holtmann commit 6bd57416127e92d35e6798925502c84e14a3a966 Author: Marcel Holtmann Date: Sat Nov 18 22:14:22 2006 +0100 [Bluetooth] Handling pending connect attempts after inquiry After an inquiry completed or got canceled the Bluetooth core should check for any pending connect attempts. Signed-off-by: Marcel Holtmann commit e52726dece1d2e3976c0caf2f4e9e1c452d31282 Author: Marcel Holtmann Date: Sat Nov 18 22:14:05 2006 +0100 [Bluetooth] Attach low-level connections to the Bluetooth bus To receive uvents for the low-level ACL and SCO links, they must be assigned to a subsystem. It is enough to attach them to the already established Bluetooth bus. Signed-off-by: Marcel Holtmann commit 53ab61c6d8f391bda04dbc1e95bac348fe81103b Author: Yasuyuki Kozakai Date: Mon Nov 6 10:06:23 2006 -0800 [IPV6] IP6TUNNEL: Add missing nf_reset() on input path. Signed-off-by: Yasuyuki Kozakai Signed-off-by: YOSHIFUJI Hideaki commit b3fdd9f115c776d381b30b296849f8e4046bcdaa Author: Yasuyuki Kozakai Date: Mon Nov 6 10:06:22 2006 -0800 [IPV6] IP6TUNNEL: Delete all tunnel device when unloading module. Signed-off-by: Yasuyuki Kozakai Signed-off-by: YOSHIFUJI Hideaki commit ea659e0775281e1c02556e939bf749bb4f55e50c Author: YOSHIFUJI Hideaki Date: Mon Nov 6 09:45:45 2006 -0800 [IPV6] ROUTE: Do not enable router reachability probing in router mode. RFC4191 explicitly states that the procedures are applicable to hosts only. We should not have changed behavior of routers. Signed-off-by: YOSHIFUJI Hideaki commit 557e92efd44878beccd08d5dd54ed343be0e5819 Author: YOSHIFUJI Hideaki Date: Mon Nov 6 09:45:45 2006 -0800 [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests. Signed-off-by: YOSHIFUJI Hideaki commit ea73ee23c43d6eb75f88c4fc9e1230b44673c0d2 Author: YOSHIFUJI Hideaki Date: Mon Nov 6 09:45:44 2006 -0800 [IPV6] ROUTE: Try to use router which is not known unreachable. Only routers in "FAILED" state should be considered unreachable. Otherwise, we do not try to use speicific routes unless all least specific routers are considered unreachable. Signed-off-by: YOSHIFUJI Hideaki commit 6af6e1efb161ffe36e718b1fd58385710879af7c Author: Dave Jones Date: Tue Nov 21 16:58:59 2006 -0500 [PATCH] Fix CPU_FREQ_GOV_ONDEMAND=y compile error The ONDEMAND governor needs FREQ_TABLE Signed-off-by: Mattia Dongili Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 3af9815328bba76e8d11d71d6dbbd6f38beafe58 Author: Vivek Goyal Date: Mon Nov 20 11:29:09 2006 -0500 [PATCH] x86_64: Align data segment to PAGE_SIZE boundary o Explicitly align data segment to PAGE_SIZE boundary otherwise depending on config options and tool chain it might be placed on a non PAGE_SIZE aligned boundary and vmlinux loaders like kexec fail when they encounter a PT_LOAD type segment which is not aligned to PAGE_SIZE boundary. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen commit 9a14f2964b459c18198ee59ff7212321def82df7 Author: Vivek Goyal Date: Mon Nov 20 11:29:09 2006 -0500 [PATCH] x86_64: Align data segment to PAGE_SIZE boundary o Explicitly align data segment to PAGE_SIZE boundary otherwise depending on config options and tool chain it might be placed on a non PAGE_SIZE aligned boundary and vmlinux loaders like kexec fail when they encounter a PT_LOAD type segment which is not aligned to PAGE_SIZE boundary. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen commit e5ffd2bb62c3f2c0d9f34e0d16fab6e2c8b056fb Author: David Chinner Date: Tue Nov 21 18:55:33 2006 +1100 [XFS] Stale the correct inode when freeing clusters. SGI-PV: 958376 SGI-Modid: xfs-linux-melb:xfs-kern:27503a Signed-off-by: David Chinner Signed-off-by: Tim Shimmin commit d2133717d5f994cca970b5aeb9d4664feeb92ff4 Author: Lachlan McIlroy Date: Tue Nov 21 18:55:16 2006 +1100 [XFS] Fix uninitialized br_state and br_startoff in xfs_bmap_add_extent_delay_real() SGI-PV: 957008 SGI-Modid: xfs-linux-melb:xfs-kern:27457a Signed-off-by: Lachlan McIlroy Signed-off-by: Shailendra Tripathi Signed-off-by: Tim Shimmin commit 3f5a6ca31c334011fd929501a078424c0d3f71be Author: Bryan O'Sullivan Date: Mon Nov 20 10:54:34 2006 -0800 IB/ipath: Depend on CONFIG_NET ipath uses skb functions and won't build without CONFIG_NET. Spotted by Randy Dunlap. Signed-off-by: Bryan O'Sullivan Acked-by: Randy Dunlap Signed-off-by: Roland Dreier commit b3438f8266cb1f5010085ac47d7ad6a36a212164 Author: Linus Torvalds Date: Mon Nov 20 11:47:18 2006 -0800 Add "pure_initcall" for static variable initialization This is a quick hack to overcome the fact that SRCU currently does not allow static initializers, and we need to sometimes initialize those things before any other initializers (even "core" ones) can do so. Currently we don't allow this at all for modules, and the only user that needs is right now is cpufreq. As reported by Thomas Gleixner: "Commit b4dfdbb3c707474a2254c5b4d7e62be31a4b7da9 ("[PATCH] cpufreq: make the transition_notifier chain use SRCU breaks cpu frequency notification users, which register the callback > on core_init level." Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Andrew Morton , Signed-off-by: Linus Torvalds commit ace5f1d425beaa272b6e91cecc87b2c075d7feb2 Author: Greg Ungerer Date: Mon Nov 20 15:46:22 2006 +1000 [PATCH] m68knommu: fix up for the irq_handler_t changes Switch to using irq_handler_t for interrupt function handler pointers. Change name of m68knommu's irq_hanlder_t data structure so it doesn't clash with the common type (include/linux/interrupt.h). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 49a1cd00b599d12c3f397e5a32f81f6e2aab0d74 Author: Toralf Foerster Date: Sat Nov 18 22:19:41 2006 -0800 [PATCH] fix build error for HISAX_NETJET Fix a build error for the enter:now PCI card. Signed-off-by: Toralf Foerster Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0c69c4ee796a2d2277c3a000e24f29a25a00060 Author: Randy Dunlap Date: Sat Nov 18 22:19:41 2006 -0800 [PATCH] ftape: fix printk format warnings Fix printk format warnings: drivers/char/ftape/zftape/zftape-buffers.c:87: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' drivers/char/ftape/zftape/zftape-buffers.c:104: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8243229f0940ab4e9f501879d3ffb7476b02ee6a Author: Yasunori Goto Date: Sat Nov 18 22:19:40 2006 -0800 [PATCH] x86_64: fix memory hotplug build with NUMA=n This is to fix compile error of x86-64 memory hotplug without any NUMA option. CC arch/x86_64/mm/init.o arch/x86_64/mm/init.c:501: error: redefinition of 'memory_add_physaddr_to_nid' include/linux/memory_hotplug.h:71: error: previous definition of 'memory_add_phys addr_to_nid' was here arch/x86_64/mm/init.c:509: error: redefinition of 'memory_add_physaddr_to_nid' arch/x86_64/mm/init.c:501: error: previous definition of 'memory_add_physaddr_to_ nid' was here I confirmed compile completion with !NUMA, (NUMA & !ACPI_NUMA), or (NUMA & ACPI_NUMA). Signed-off-by: Yasunori Goto Acked-by: Andi Kleen Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffb3d1348605816de10d4e57281e02f606508b6c Author: Jeff Garzik Date: Sat Nov 18 22:19:39 2006 -0800 [PATCH] scx200_acb: handle PCI errors Signed-off-by: Jeff Garzik Signed-off-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6cd2d94e1072a5756b5e5ab647d3223cba7e555 Author: Alexey Dobriyan Date: Sat Nov 18 22:19:36 2006 -0800 [PATCH] i2c-ixp4xx: fix ") != 0))" typo i2c_bit_add_bus() returns -E; -E != 0 => err = 1 probe fails with positive error code Signed-off-by: Alexey Dobriyan Cc: Deepak Saxena Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfbc9e9d33adb1ac9910dd7f8ceb911947039a52 Author: Daniel Ritz Date: Sat Nov 18 22:19:34 2006 -0800 [PATCH] pcmcia: fix 'rmmod pcmcia' with unbound devices Having unbound PCMCIA devices: doing a 'find /sys' after a 'rmmod pcmcia' gives an oops because the pcmcia_device is not unregisterd from the driver core. fixes bugzilla #7481 Signed-off-by: Daniel Ritz Dominik Brodowski Cc: Pavol Gono Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8de35efb6afa75f25415d54e21221eea759db261 Author: Russell King Date: Mon Nov 20 15:59:10 2006 +0000 [ARM] ebsa110: fix warnings generated by asm/arch/io.h Remove two warnings: drivers/serial/8250_early.c:136: warning: unused variable 'mapsize' include/linux/io.h:47: warning: passing argument 1 of '__readb' discards qualifiers from pointer target type Signed-off-by: Russell King commit eb370f0bd409f8bcdc88583ae04f94453e19d882 Author: Martin Michlmayr Date: Fri Nov 17 00:14:35 2006 +0100 [ARM] 3933/1: Source drivers/ata/Kconfig ARM doesn't source drivers/Kconfig like most architectures do, so the newly added drivers/ata is currently not made available on ARM. SATA is used on some ARM machines, like the Thecus N2100, so we need to source drivers/ata/Kconfig. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit 610a5b742e9df4e59047f22d13d8bd83cafce388 Author: Yoichi Yuasa Date: Fri Nov 17 11:51:41 2006 +1100 [CRYPTO] api: Remove one too many semicolon This patch has removed one too many semicolon in crypto.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Herbert Xu commit ba9b1cd713b33720ca0f035dab2fdbc10bf7328d Author: David Weinehall Date: Sat Nov 18 03:58:58 2006 +0100 [PATCH] Update my CREDITS entry I moved from Sweden to Finland 2.5 years ago, thought it might be time to update my CREDITS entry (simply removing the address completely seemed the sanest option). Signed-off-by: David Weinehall Signed-off-by: Linus Torvalds commit b976fe19acc565e5137e6f12af7b6633a23e6b7c Author: Linus Torvalds Date: Fri Nov 17 19:31:09 2006 -0800 Revert "ACPI: created a dedicated workqueue for notify() execution" This reverts commit 37605a6900f6b4d886d995751fcfeef88c4e462c. Again. This same bug has now been introduced twice: it was done earlier by commit b8d35192c55fb055792ff0641408eaaec7c88988, only to be reverted last time in commit 72945b2b90a5554975b8f72673ab7139d232a121. We must NOT try to queue up notify handlers to another thread than the normal ACPI execution thread, because the notifications on some systems seem to just keep on accumulating until we run out of memory and/or threads. Keeping events within the one deferred execution thread automatically throttles the events properly. At least the Compaq N620c will lock up completely on the first thermal event without this patch reverted. Cc: David Brownell Cc: Len Brown Cc: Alexey Starikovskiy Signed-off-by: Linus Torvalds commit 808dbbb6bb61173bf52946a28f99089d2efa4c55 Author: Linus Torvalds Date: Fri Nov 17 11:14:56 2006 -0800 x86: be more careful when walking back the frame pointer chain When showing the stack backtrace, make sure that we never accept not only an unchanging frame pointer, but also a frame pointer that moves back down the stack frame. It must always grow up (toward older stack frames). I doubt this has triggered, but a subtly corrupt stack with extremely unlucky contents could cause us to loop forever on a bogus endless frame pointer chain. This review was triggered by much worse problems happening in some of the other stack unwinding code. Signed-off-by: Linus Torvalds commit 1ff5683043196b9ad628a5de6bf8eeca52ee8bfd Author: Ingo Molnar Date: Fri Nov 17 19:57:22 2006 +0100 [PATCH] lockdep: fix static keys in module-allocated percpu areas lockdep got confused by certain locks in modules: INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. Call Trace: [] dump_trace+0xaa/0x3f2 [] show_trace+0x3a/0x60 [] dump_stack+0x15/0x17 [] __lock_acquire+0x724/0x9bb [] lock_acquire+0x4d/0x67 [] rt_spin_lock+0x3d/0x41 [] :ip_conntrack:__ip_ct_refresh_acct+0x131/0x174 [] :ip_conntrack:udp_packet+0xbf/0xcf [] :ip_conntrack:ip_conntrack_in+0x394/0x4a7 [] nf_iterate+0x41/0x7f [] nf_hook_slow+0x64/0xd5 [] ip_rcv+0x24e/0x506 [...] Steven Rostedt found the bug: static_obj() check did not take PERCPU_ENOUGH_ROOM into account, so in-module DEFINE_PER_CPU-area locks were triggering this message. Signed-off-by: Ingo Molnar Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit dc1829a4c378d793fb3b95d56135d89a0d7ff72a Author: Ingo Molnar Date: Fri Nov 17 14:26:18 2006 +0100 [PATCH] i386/x86_64: ACPI cpu_idle_wait() fix The scheduler on Andreas Friedrich's hyperthreading system stopped working properly: the scheduler would never move tasks to another CPU! The lask known working kernel was 2.6.8. After a couple of attempts to corner the bug, the following smoking gun was found: BIOS reported wrong ACPI idfor the processor CPU#1: set_cpus_allowed(), swapper:1, 3 -> 2 [] show_trace_log_lvl+0x34/0x4a [] show_trace+0x2c/0x2e [] dump_stack+0x2b/0x2d [] set_cpus_allowed+0x52/0xec [] cpu_idle_wait+0x2e/0x100 [] acpi_processor_power_exit+0x45/0x58 [] acpi_processor_remove+0x46/0xea [] acpi_start_single_object+0x47/0x54 [] acpi_bus_register_driver+0xa4/0xd3 [] acpi_processor_init+0x57/0x77 [] init+0x146/0x2fd [] kernel_thread_helper+0x7/0x10 a quick look at cpu_idle_wait() shows how broken that code is on i386: it changes the init task's affinity map but never restores it ... and because all userspace tasks get forked by init, they all inherited that single-CPU affinity mask. x86_64 cloned this bug too. Signed-off-by: Ingo Molnar Cc: Andreas Friedrich Cc: Wolfgang Erig Cc: Andrew Morton Cc: Adrian Bunk Signed-off-by: Linus Torvalds commit 0796bdb7e9e4a48b401f4fba1ee5dc79a45528ef Author: Ingo Molnar Date: Fri Nov 17 05:57:49 2006 +0100 [PATCH] x86_64: stack unwinder crash fix the new dwarf2 unwinder crashes while trying to dump the stack: Leftover inexact backtrace: Unable to handle kernel paging request at ffffffff82800000 RIP: [] dump_trace+0x35b/0x3d2 PGD 203027 PUD 205027 PMD 0 Oops: 0000 [2] PREEMPT SMP CPU 0 Modules linked in: Pid: 30, comm: khelper Not tainted 2.6.19-rc6-rt1 #11 RIP: 0010:[] [] dump_trace+0x35b/0x3d2 RSP: 0000:ffff81003fb9d848 EFLAGS: 00010006 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff805b3520 RDI: 0000000000000000 RBP: ffffffff827ffff9 R08: ffffffff80aad000 R09: 0000000000000005 R10: ffffffff80aae000 R11: ffffffff8037961b R12: ffff81003fb9d858 R13: 0000000000000000 R14: ffffffff80598460 R15: ffffffff80ab1fc0 FS: 0000000000000000(0000) GS:ffffffff806c4200(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: ffffffff82800000 CR3: 0000000000201000 CR4: 00000000000006e0 this crash happened because it did not sanitize the dwarf2 data it got, and got an unaligned stack pointer - which happily walked past the process stack (and eventually reached the end of kernel memory and pagefaulted there) due to this naive iteration condition: HANDLE_STACK (((long) stack & (THREAD_SIZE-1)) != 0); note that i386 is alot more conservative when it comes to trusting stack pointers: static inline int valid_stack_ptr(struct thread_info *tinfo, void *p) { return p > (void *)tinfo && p < (void *)tinfo + THREAD_SIZE - 3; } but the x86_64 code did not take this bit of i386 code. The fix is to align the stack pointer. Signed-off-by: Ingo Molnar Cc: Andi Kleen Cc: Jan Beulich Cc: Thomas Gleixner Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 1d08811d0c05cd54a778f45588ec22eee027ff89 Author: Jan-Benedict Glaw Date: Fri Nov 17 10:32:04 2006 +0100 lkkbd: Remove my old snail-mail address I moved to a different town and my old snail-mail address is invalid now. Also, there's no need at all to have any address like that in the sources, so remove it completely. Signed-off-by: Jan-Benedict Glaw commit 4be703906cffd5902028d20626e636ba21fb0b61 Author: Linus Torvalds Date: Thu Nov 16 22:18:28 2006 -0800 Fix generic fb_ddc i2c edid probe msg Benh points out that the msgs[0].flags entry never got initialized, and since it's an automatic stack allocation, it could have any random value, which is bad. Rewrite the initializer to explicitly initialize all fields of the small i2c_msg structure array we generate. Just to keep it all obvious, let's handle msgs[1].buf in the same initializer while we're at it, instead of initializing that one separately later. Signed-off-by: Linus Torvalds commit 4f71c5de19c27f2198105d3b26b398494d5c353b Author: Benjamin Herrenschmidt Date: Fri Nov 17 15:35:00 2006 +1100 [PATCH] Fix radeon DDC regression When radeonfb was changed to use the new "generic" ddc, a bit of code initializing the GPIO lines was lost, causing it to not work if the firmware didn't configure them properly, which seems to happen on some cards. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit d355c3c23ce56ab83e41f2bfb30d02fb90618530 Author: Dennis Stosberg Date: Mon Nov 13 09:15:20 2006 +0100 aoe: Add forgotten NULL at end of attribute list in aoeblk.c This caused the system to stall when the aoe module was loaded. The error was introduced in commit 4ca5224f3ea4779054d96e885ca9b3980801ce13 Signed-off-by: Dennis Stosberg Signed-off-by: Greg Kroah-Hartman commit 7bb0386f102ece8819182ccf7fffe8bbebc32b19 Author: Akinobu Mita Date: Thu Oct 19 12:24:42 2006 +0900 debugfs: check return value correctly The return value is stored in "*dentry", not in "dentry". Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit e45413eb708c1cf21082764457692c8eeac0ca97 Author: Amol Lad Date: Thu Oct 5 14:26:02 2006 +0400 W1: ioremap balanced with iounmap ioremap must be balanced with iounmap in error path. Please consider for 2.6.19. Signed-off-by: Amol Lad Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 5a3fcf5c7f035de8e2b28d144d67b7bebac8a723 Author: Mariusz Kozlowski Date: Tue Nov 7 00:31:51 2006 +0100 USB: auerswald possible memleak fix fix possible memory leak in auerbuf_setup(). Regards, Mariusz Kozlowski Signed-off-by: Mariusz Kozlowski Signed-off-by: Wolfgang Muees Signed-off-by: Greg Kroah-Hartman commit 0029908ba9661ef26f7020309966aae23c2027b8 Author: Alex Sanks Date: Sun Oct 29 16:38:31 2006 -0800 USB: ipaq: Add HTC Modem Support Adds support for HTC Smart Phones in modem mode (as opposed to sync mode). Loads and works with pppd on my T-Mobile SDA. Signed-off-by: Alex Sanks Signed-off-by: Greg Kroah-Hartman commit 6ab16a9029b0b26c23a4806d90ca76be6d6beae3 Author: Laurent Pinchart Date: Tue Nov 7 10:16:25 2006 +0100 USB: Fixed outdated usb_get_device_descriptor() documentation usb_get_device_descriptor() used to convert several descriptor fields to host CPU's byte order. Now that it doesn't convert them anymore, update the documentation to reflect this. Signed-off-by: Laurent Pinchart Signed-off-by: Greg Kroah-Hartman commit 70708f2c2a3c164e9aa80345919a22c838b3b314 Author: Sergey Vlasov Date: Mon Nov 6 16:33:07 2006 +0300 usb-storage: Remove duplicated unusual_devs.h entries for Sony Ericsson P990i For some reason the unusual_devs.h entry for Sony Ericsson P990i had three identical copies in a wrong place in the file in addition to the correct entry. Signed-off-by: Sergey Vlasov Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit a7dc4eeac8f18de5fc6bea1a0f46e67f42b83509 Author: Julien BLACHE Date: Sun Nov 12 11:22:42 2006 +0100 USB: hid-core: Add quirk for new Apple keyboard/trackpad The new Core2 Duo MacBook Pro have a new keyboard+trackpad device. The following patch adds the needed HID quirk for the Fn key. Signed-off-by: Julien BLACHE Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit a3878f11ed29c50b7da1336adcac089e9c741fc2 Author: Jan Mate Date: Wed Nov 8 19:58:04 2006 -0800 USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB Storage: this patch adds support for Sony Ericsson P990i Signed-off-by: Jan Mate Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bb7eef6eea53633a8a49f014fd27c08f7d5fda1a Author: Olaf Hering Date: Wed Nov 8 19:58:07 2006 -0800 USB: correct keymapping on Powerbook built-in USB ISO keyboards similar to the version in adbhid_input_register(): The '<>' key and the '^°' key on a german keyboard is swapped. Provide correct keys to userland, external USB keyboards will not work correctly when the 'badmap'/'goodmap' workarounds from xkeyboard-config are used. It is expected that distributions drop the badmap/goodmap part from keycodes/macintosh in the xkeyboard-config package. This is probably 2.6.18.x material, if major distros settle on 2.6.18. Signed-off-by: Olaf Hering Cc: Dmitry Torokhov Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 583ceada075597a5b6acab1140d61ac81586a2a6 Author: Alan Stern Date: Tue Oct 24 12:04:22 2006 -0400 USB: OHCI: fix root-hub resume bug When a suspended OHCI controller sees a port's status change, it sets both the Root-Hub-Status-Change and the Resume-Detect bits in the Interrupt Status register. Processing both these bits, the driver tries to resume the root hub twice! This patch (as807) fixes the bug by ignoring RD if RHSC is set. It also prints a slightly more informative log message when a remote-wakeup event occurs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 51b5bce8c253b82d4789161cc3b0c74bee313bb1 Author: Phil Dibowitz Date: Thu Nov 2 23:14:10 2006 -0800 USB: Fix UCR-61S2B unusual_dev entry Recently this entry's bcd scope was narrowed so as not to falsly apply to bcd's other than 0x0110. But while it breaks those of a larger bcd, it is still needed for those of a smaller bcd - so this changes the lower bcd limit to 0x0000. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit fad14a0da885714c8610982045a6d04a4886865e Author: Frank Sievertsen Date: Fri Oct 20 09:43:53 2006 +0200 USB: ftdi driver pid for dmx-interfaces Please add a usb pid to the ftdi_sio driver. The pid is used by dmx4all dmx-interfaces (for stage lighting). The interfaces are using the usb-id 0403:c850. I added the id to the driver and it works perfectly. I added a patch for linux 2.6.18.1, too. From: Frank Sievertsen Signed-off-by: Greg Kroah-Hartman commit 40c36092f75ae2026e35feb4f85caa143b64423a Author: Kjell Myksvoll Date: Sun Oct 22 23:26:42 2006 +0200 USB: ftdi_sio: adds vendor/product id for a RFID construction kit Adds the vendor and prodcut id for a RFID construction kit from the Elektor Electronics magazine, september 2006. From: Kjell Myksvoll Signed-off-by: Greg Kroah-Hartman commit 3da2495c0a92723d58cacaaff48dc60a29ddaae6 Author: Alan Stern Date: Tue Nov 14 16:28:01 2006 -0500 OHCI: disallow autostop when wakeup is not available This patch (as822) prevents the OHCI autostop mechanism from kicking in if the root hub is not able or not allowed to issue wakeup requests. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ccf9ff524ccb195d648ecb0b168340560b42532c Author: Ingo Molnar Date: Thu Nov 16 11:49:16 2006 +0100 [PATCH] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug on x86_64, the CONFIG_CC_STACKPROTECTOR build fails if used in a distcc setup that has "CC" defined to "distcc gcc": gcc: gcc: linker input file unused because linking not done gcc: gcc: linker input file unused because linking not done gcc: gcc: linker input file unused because linking not done this is because the gcc-x86_64-has-stack-protector.sh script has a 2-parameters assumption. Fix this by passing $(CC) as a single parameter. Signed-off-by: Ingo Molnar Please-Use-Me-More: make randconfig Signed-off-by: Linus Torvalds commit 6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3 Author: Andi Kleen Date: Thu Nov 16 10:22:03 2006 +0100 [PATCH] x86-64: Fix vsyscall.c compilation on UP Broken by earlier patch by me. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 073ae841d6a5098f7c6e17fc1f329350d950d1ce Author: Michael S. Tsirkin Date: Thu Nov 16 10:59:12 2006 +0200 IPoIB: Clear high octet in QP number IPoIB assumes that high (reserved) octet in the hardware address is 0, and copies it into the QPN. This violates RFC 4391 (which requires that the high 8 bits are ignored on receive), and will result in an invalid QPN being used when interoperating with IPoIB connected mode. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 097b8457dafe7efc22201b4062e2d1e82e494067 Author: Tejun Heo Date: Thu Nov 16 01:19:31 2006 -0800 [PATCH] scsi: clear garbage after CDBs on SG_IO ATAPI devices transfer fixed number of bytes for CDBs (12 or 16). Some ATAPI devices choke when shorter CDB is used and the left bytes contain garbage. Block SG_IO cleared left bytes but SCSI SG_IO didn't. This patch makes SCSI SG_IO clear it and simplify CDB clearing in block SG_IO. Signed-off-by: Tejun Heo Cc: Mathieu Fluhr Cc: James Bottomley Cc: Douglas Gilbert Acked-by: Jens Axboe Cc: Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae56fb16337c882c52806508f93ead4034004c7a Author: Michael Halcrow Date: Thu Nov 16 01:19:30 2006 -0800 [PATCH] eCryptfs: CIFS nlink fixes When CIFS is the lower filesystem, the old lower dentry needs to be explicitly dropped from inside eCryptfs to force a revalidate. In addition, when CIFS is the lower filesystem, the inode attributes need to be copied back up from the lower inode to the eCryptfs inode on an eCryptfs revalidate. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31be8309532a6743f301cb2e83bd12ca07988b09 Author: OGAWA Hirofumi Date: Thu Nov 16 01:19:29 2006 -0800 [PATCH] Fix strange size check in __get_vm_area_node() Recently, __get_vm_area_node() was changed like following if (unlikely(!area)) return NULL; - if (unlikely(!size)) { - kfree (area); + if (unlikely(!size)) return NULL; - } It is leaking `area', also original code seems strange already. Probably, we wanted to do this patch. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da63fc7ce63b43426dc3c69c05e28de2872c159a Author: OGAWA Hirofumi Date: Thu Nov 16 01:19:28 2006 -0800 [PATCH] fat: add fat_getattr() This adds fat_getattr() for setting stat->blksize. (FAT uses the size of cluster for proper I/O) Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 565762f3fae23ec4db26607cf4726de7b5075b3b Author: Alexey Dobriyan Date: Thu Nov 16 01:19:28 2006 -0800 [PATCH] Don't give bad kprobes example aka ") < 0))" typo Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64aaa4f8b7e676ccd3f6448df6867097b873b0a6 Author: David Howells Date: Thu Nov 16 01:19:27 2006 -0800 [PATCH] AFS: Amend the AFS configuration options Amend the text of AFS configuration options. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6897083abfb0156b533ab8ac42c47f68c550ca9e Author: Akinobu Mita Date: Thu Nov 16 01:19:25 2006 -0800 [PATCH] dell_rbu: fix error check platform_device_register_simple() returns error code as pointer when it fails. The return value should be checked by IS_ERR(). Cc: Abhay Salunke Signed-off-by: Akinobu Mita Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55aa601e14cbec987fa577a895e9297df1d0a71d Author: Phillip Susi Date: Thu Nov 16 01:19:23 2006 -0800 [PATCH] Update udf documentation to reflect current state of read/write support Change Documentation/filesystems/udf.txt from saying that read/write mounts on cd media are not supported to instead state the current level of support. Specifically that it works fine on dvd+rw media and can be made to work on cd-rw media via the pktcdvd device. Cc: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6ddf55440833fd9404138026af246c51ebeef22 Author: Eric Sandeen Date: Thu Nov 16 01:19:22 2006 -0800 [PATCH] hfs_fill_super returns success even if no root inode http://kernelfun.blogspot.com/2006/11/mokb-14-11-2006-linux-26x-selinux.html mount that image... fs: filesystem was not cleanly unmounted, running fsck.hfs is recommended. mounting read-only. hfs: get root inode failed. BUG: unable to handle kernel NULL pointer dereference at virtual address 00000018 printing eip ... EIP is at superblock_doinit+0x21/0x767 ... [] selinux_sb_kern_mount+0xc/0x4b [] vfs_kern_mount+0x99/0xf6 [] do_kern_mount+0x2d/0x3e [] do_mount+0x5fa/0x66d [] sys_mount+0x77/0xae [] syscall_call+0x7/0xb DWARF2 unwinder stuck at syscall_call+0x7/0xb hfs_fill_super() returns success even if root_inode = hfs_iget(sb, &fd.search_key->cat, &rec); or sb->s_root = d_alloc_root(root_inode); fails. This superblock finds its way to superblock_doinit() which does: struct dentry *root = sb->s_root; struct inode *inode = root->d_inode; and boom. Need to make sure the error cases return an error, I think. [akpm@osdl.org: return -ENOMEM on oom] Signed-off-by: Eric Sandeen Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c1b6d18bf2fdeb5ac725126c6928aaa98c8e22f Author: Arnaud Giersch Date: Thu Nov 16 01:19:21 2006 -0800 [PATCH] parport: fix compilation failure Fix compilation failure. Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e757bef270e21453bf507df200e2fb477c076da6 Author: Bryan O'Sullivan Date: Thu Nov 16 01:19:19 2006 -0800 [PATCH] IB/ipath - fix driver build for platforms with PCI, but not HT The PCI Express and Hypertransport chip-specific source files should only be built when the kernel has the capability of actually compiling them. This fixes the driver build on, for example, ia64. Signed-off-by: Bryan O'Sullivan Cc: "Eric W. Biederman" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b46f0396c76a61526dec57a782a061c197ac337 Author: Olaf Hering Date: Thu Nov 16 01:19:17 2006 -0800 [PATCH] set default video mode on PowerBook Wallstreet Finally add the third PowerBook Wallstreet 233MHz model to the list of known display resolutions. Without this change, a 640x480 video mode is used. A workaround so far was to boot with 'video=atyfb:vmode:14' Signed-off-by: Olaf Hering Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Cc: Solomon Peachy Cc: James Simmons Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9083081b56800691e79d541638fd2fc6366db0f Author: Michael Halcrow Date: Thu Nov 16 01:19:16 2006 -0800 [PATCH] eCryptfs: dput() lower d_parent on rename On rename, for both the old and new lower dentry objects, eCryptfs is missing a dput on the lower parent directory dentry. This patch will prevent the BUG() at fs/dcache.c:613 from being hit after renaming a file inside eCryptfs and then doing a umount on the lower filesystem. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b9c10dc59eaaef23e5a47110c20fb554f7dba28 Author: Vitaly Wool Date: Thu Nov 16 01:19:14 2006 -0800 [PATCH] pnx4008:fix NULL dereference in rgbfb Fix possible NULL dereference in pnxrgbfb. Signed-off-by: Vitaly Wool Cc: James Simmons Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84a763e3d1a47fa9308b8817f265e936e5f1000a Author: Vitaly Wool Date: Thu Nov 16 01:19:11 2006 -0800 [PATCH] pnx4008: rename driver Make the drivers' names less generic to avoid possible confusion in future, as was requested by Russell King. Signed-off-by: Vitaly Wool Acked-by: James Simmons Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b86432b42eba5671969a9e6483ee219674b7ee25 Author: Zhang, Yanmin Date: Thu Nov 16 01:19:10 2006 -0800 [PATCH] some irq_chip variables point to NULL I got an oops when booting 2.6.19-rc5-mm1 on my ia64 machine. Below is the log. Oops 11012296146944 [1] Modules linked in: binfmt_misc dm_mirror dm_multipath dm_mod thermal processor f an container button sg eepro100 e100 mii Pid: 0, CPU 0, comm: swapper psr : 0000121008022038 ifs : 800000000000040b ip : [] Not tainted ip is at __do_IRQ+0x371/0x3e0 unat: 0000000000000000 pfs : 000000000000040b rsc : 0000000000000003 rnat: 656960155aa56aa5 bsps: a00000010058b890 pr : 656960155aa55a65 ldrs: 0000000000000000 ccv : 0000000000000000 fpsr: 0009804c0270033f csd : 0000000000000000 ssd : 0000000000000000 b0 : a0000001000e1390 b6 : a0000001005beac0 b7 : e00000007f01aa00 f6 : 000000000000000000000 f7 : 0ffe69090000000000000 f8 : 1000a9090000000000000 f9 : 0ffff8000000000000000 f10 : 1000a908ffffff6f70000 f11 : 1003e0000000000000909 r1 : a000000100fbbff0 r2 : 0000000000010002 r3 : 0000000000010001 r8 : fffffffffffbffff r9 : a000000100bd8060 r10 : a000000100dd83b8 r11 : fffffffffffeffff r12 : a000000100bcbbb0 r13 : a000000100bc4000 r14 : 0000000000010000 r15 : 0000000000010000 r16 : a000000100c01aa8 r17 : a000000100d2c350 r18 : 0000000000000000 r19 : a000000100d2c300 r20 : a000000100c01a88 r21 : 0000000080010100 r22 : a000000100c01ac0 r23 : a0000001000108e0 r24 : e000000477980004 r25 : 0000000000000000 r26 : 0000000000000000 r27 : e00000000913400c r28 : e0000004799ee51c r29 : e0000004778b87f0 r30 : a000000100d2c300 r31 : a00000010005c7e0 Call Trace: [] show_stack+0x40/0xa0 sp=a000000100bcb760 bsp=a000000100bc4f40 [] show_regs+0x840/0x880 sp=a000000100bcb930 bsp=a000000100bc4ee8 [] die+0x250/0x320 sp=a000000100bcb930 bsp=a000000100bc4ea0 [] ia64_do_page_fault+0x8d0/0xa20 sp=a000000100bcb950 bsp=a000000100bc4e50 [] ia64_leave_kernel+0x0/0x290 sp=a000000100bcb9e0 bsp=a000000100bc4e50 [] __do_IRQ+0x370/0x3e0 sp=a000000100bcbbb0 bsp=a000000100bc4df0 [] ia64_handle_irq+0x170/0x220 sp=a000000100bcbbb0 bsp=a000000100bc4dc0 [] ia64_leave_kernel+0x0/0x290 sp=a000000100bcbbb0 bsp=a000000100bc4dc0 [] ia64_pal_call_static+0x90/0xc0 sp=a000000100bcbd80 bsp=a000000100bc4d78 [] default_idle+0x90/0x160 sp=a000000100bcbd80 bsp=a000000100bc4d58 [] cpu_idle+0x1f0/0x440 sp=a000000100bcbe20 bsp=a000000100bc4d18 [] rest_init+0xc0/0xe0 sp=a000000100bcbe20 bsp=a000000100bc4d00 [] start_kernel+0x6a0/0x6c0 sp=a000000100bcbe20 bsp=a000000100bc4ca0 [] __end_ivt_text+0x6d0/0x6f0 sp=a000000100bcbe30 bsp=a000000100bc4c00 <0>Kernel panic - not syncing: Aiee, killing interrupt handler! The root cause is that some irq_chip variables, especially ia64_msi_chip, initiate their memeber end to point to NULL. __do_IRQ doesn't check if irq_chip->end is null and just calls it after processing the interrupt. As irq_chip->end is called at many places, so I fix it by reinitiating irq_chip->end to dummy_irq_chip.end, e.g., a noop function. Signed-off-by: Zhang Yanmin Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b48f5457b4e9d64d9c1117a4ece247d98b4db49f Author: Zhang, Yanmin Date: Thu Nov 16 01:19:08 2006 -0800 [PATCH] ipmi: use platform_device_add() instead of platform_device_register() to register device allocated dynamically I got below warning when running 2.6.19-rc5-mm1 on my ia64 machine. WARNING at lib/kobject.c:172 kobject_init() Call Trace: [] show_stack+0x40/0xa0 sp=e0000002ff9f7bc0 bsp=e0000002ff9f0d10 [] dump_stack+0x30/0x60 sp=e0000002ff9f7d90 bsp=e0000002ff9f0cf8 [] kobject_init+0x90/0x160 sp=e0000002ff9f7d90 bsp=e0000002ff9f0cd0 [] device_initialize+0x40/0x1c0 sp=e0000002ff9f7da0 bsp=e0000002ff9f0cb0 [] platform_device_register+0x20/0x60 sp=e0000002ff9f7dd0 bsp=e0000002ff9f0c90 [] try_smi_init+0xbc0/0x11e0 sp=e0000002ff9f7dd0 bsp=e0000002ff9f0c50 [] init_ipmi_si+0xaa0/0x12e0 sp=e0000002ff9f7de0 bsp=e0000002ff9f0bd8 [] init+0x350/0x780 sp=e0000002ff9f7e00 bsp=e0000002ff9f0ba8 [] kernel_thread_helper+0x30/0x60 sp=e0000002ff9f7e30 bsp=e0000002ff9f0b80 [] start_kernel_thread+0x20/0x40 sp=e0000002ff9f7e30 bsp=e0000002ff9f0b80 WARNING at lib/kobject.c:172 kobject_init() Call Trace: [] show_stack+0x40/0xa0 sp=e0000002ff9f7b40 bsp=e0000002ff9f0db0 [] dump_stack+0x30/0x60 sp=e0000002ff9f7d10 bsp=e0000002ff9f0d98 [] kobject_init+0x90/0x160 sp=e0000002ff9f7d10 bsp=e0000002ff9f0d70 [] device_initialize+0x40/0x1c0 sp=e0000002ff9f7d20 bsp=e0000002ff9f0d50 [] platform_device_register+0x20/0x60 sp=e0000002ff9f7d50 bsp=e0000002ff9f0d30 [] ipmi_register_smi+0xcc0/0x18e0 sp=e0000002ff9f7d50 bsp=e0000002ff9f0c90 [] try_smi_init+0xc60/0x11e0 sp=e0000002ff9f7dd0 bsp=e0000002ff9f0c50 [] init_ipmi_si+0xaa0/0x12e0 sp=e0000002ff9f7de0 bsp=e0000002ff9f0bd8 [] init+0x350/0x780 sp=e0000002ff9f7e00 bsp=e0000002ff9f0ba8 [] kernel_thread_helper+0x30/0x60 sp=e0000002ff9f7e30 bsp=e0000002ff9f0b80 [] start_kernel_thread+0x20/0x40 sp=e0000002ff9f7e30 bsp=e0000002ff9f0b80 The root cause is the device struct is initialized twice. If the device is allocated dynamically by platform_device_alloc, platform_device_alloc will initialize struct device, then, platform_device_add should be used to register the device. The difference between platform_device_register and platform_device_add is platform_device_register will initiate the device while platform_device_add won't. Signed-off-by: Zhang Yanmin Cc: Corey Minyard Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea196bb2eb918c30f97a2b752bcec929d761f64 Author: Luck, Tony Date: Thu Nov 16 00:43:12 2006 -0800 [IA64] a fix towards allmodconfig build The HP_SIMSCSI driver can't be built as a module (unhealthy dependencies on things that shouldn't really be exported). Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 5fbb004aba15bbca64c3fb611113295bda7ee9ea Author: Ingo Molnar Date: Thu Nov 16 00:43:07 2006 -0800 [IA64] use generic_handle_irq() Use generic_handle_irq() to handle mixed-type irq handling. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 06344db3162323247e9ac8d76d5acdb79d05f3c0 Author: Ingo Molnar Date: Thu Nov 16 00:43:02 2006 -0800 [IA64] typename -> name conversion convert irq chip typename -> name. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 351a58390aad350bd5e22c7cc468f44a9330685c Author: Andrew Morton Date: Thu Nov 16 00:42:58 2006 -0800 [IA64] irqs: use `name' not `typename' `typename' is going away and is usually uninitialised anwyay. Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit c7835a77c86422d276b0d1a4c70924d933014c13 Author: Michael Chan Date: Wed Nov 15 21:14:42 2006 -0800 [TG3]: Disable TSO on 5906 if CLKREQ is enabled. Due to hardware errata, TSO must be disabled if the PCI Express clock request is enabled on 5906. The chip may hang when transmitting TSO frames if CLKREQ is enabled. Update version to 3.69. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 52bf376c63eebe72e862a1a6e713976b038c3f50 Author: John Heffner Date: Tue Nov 14 20:25:17 2006 -0800 [TCP]: Fix up sysctl_tcp_mem initialization. Fix up tcp_mem initial settings to take into account the size of the hash entries (different on SMP and non-SMP systems). Signed-off-by: John Heffner Signed-off-by: David S. Miller commit 337dde798dd1f3e4d4df4e684a0b4355dd65103d Author: Patrick McHardy Date: Tue Nov 14 19:49:13 2006 -0800 [NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr() nexthdr is NEXTHDR_FRAGMENT, the nexthdr value from the fragment header is hp->nexthdr. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b96e7ecbd052a0916b6078e7600604d7e276a336 Author: Yasuyuki Kozakai Date: Tue Nov 14 19:48:48 2006 -0800 [NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt 66 and 67 for getsockopt on IPv6 socket is doubly used for IPv6 Advanced API and ip6tables. This moves numbers for ip6tables to 68 and 69. This also kills XT_SO_* because {ip,ip6,arp}_tables doesn't have so much common numbers now. The old userland tools keep to behave as ever, because old kernel always calls functions of IPv6 Advanced API for their numbers. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d8a585d78efdf191a64ca655136ac1e49fd27cf4 Author: Patrick McHardy Date: Tue Nov 14 19:48:09 2006 -0800 [NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue Based on patch by James D. Nurmi: I've got some code very dependant on nfnetlink_queue, and turned up a large number of warns coming from skb_trim. While it's quite possibly my code, having not seen it on older kernels made me a bit suspect. Anyhow, based on some googling I turned up this thread: http://lkml.org/lkml/2006/8/13/56 And believe the issue to be related, so attached is a small patch to the kernel -- not sure if this is completely correct, but for anyone else hitting the WARN_ON(1) in skbuff.h, it might be helpful.. Signed-off-by: James D. Nurmi Ported to ip6_queue and nfnetlink_queue and added return value checks. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7fdeaf68a16f8102659cf1b30f57247d8ccbeef0 Author: Patrick McHardy Date: Tue Nov 14 19:47:09 2006 -0800 [NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL NFULA_SEQ_GLOBAL should be in network byteorder. Spotted by Al Viro. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0ccead1869444891ae6b41f2c5fc8498521c908e Author: Gary Zambrano Date: Tue Nov 14 16:34:00 2006 -0800 [TG3]: Increase 5906 firmware poll time. Newer 5906 bootcode needs about 7ms to finish resetting so the poll firmware loop was changed to maximum 20ms. Signed-off-by: Gary Zambrano Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 44597f65f6af3c692560a639f61d25398d13d1b6 Author: Linus Torvalds Date: Wed Nov 15 20:03:40 2006 -0800 Linux 2.6.19-rc6 Getting there. Hopefully the MSI and other interrupt problems are all solved now. Signed-off-by: Linus Torvalds commit d31e817183a4c1ee2e5fc0635ac075381f5c4419 Author: Benjamin Herrenschmidt Date: Thu Nov 16 14:00:57 2006 +1100 [PATCH] powerpc: windfarm shall request it's sub modules The windfarm code, in it's current incarnation, uses request_module() to load the various submodules it needs for a given platform so that only the main platform control module needs to be modprobed. However, it was missing various bits. This fixes it. In the future, we'll use some hotplug mecanisms to try to get all of this auto-loaded on the platforms where it matters but that isn't ready yet. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 9716a340310a383751a06589d0775fad04bd3f54 Author: Stephen Rothwell Date: Mon Nov 13 14:52:42 2006 +1100 [POWERPC] Wire up sys_move_pages All the infrastructure is already in place for this, so we only need to allocate a syscall number and hook it up. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 056f4faa572f64fa926491a7d42c627c9dc507a7 Author: Stephen Rothwell Date: Mon Nov 13 14:51:46 2006 +1100 [POWERPC] Add the thread_siblings files to sysfs This adds the /sys/devices/system/cpu/*/topology/thread_siblings files on powerpc. These files are already available on other architectures. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit cbf093e8c7447a202e376199cc017161262bd7cd Author: Robin Holt Date: Tue Nov 14 20:50:59 2006 -0600 [IA64] bte_unaligned_copy() transfers one extra cache line. When called to do a transfer that has a start offset within the cache line which is uneven between source and destination and a length which terminates the source of the copy exactly on a cache line, one extra line gets copied into a temporary buffer. This is normally not an issue since the buffer is a kernel buffer and only the requested information gets copied into the user buffer. The problem arises when the source ends at the very last physical page of memory. That last cache line does not exist and results in the SHUB chip raising an MCA. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 45c99533252ef2297f37c5fdd672a3e0eb566870 Author: Eric W. Biederman Date: Tue Nov 14 10:52:12 2006 -0700 [PATCH] Use delayed disable mode of ioapic edge triggered interrupts Komuro reports that ISA interrupts do not work after a disable_irq(), causing some PCMCIA drivers to not work, with messages like eth0: Asix AX88190: io 0x300, irq 3, hw_addr xx:xx:xx:xx:xx:xx eth0: found link beat eth0: autonegotiation complete: 100baseT-FD selected eth0: interrupt(s) dropped! eth0: interrupt(s) dropped! eth0: interrupt(s) dropped! ... Linus Torvalds said: "Now, edge-triggered interrupts are a _lot_ harder to mask, because the Intel APIC is an unbelievable piece of sh*t, and has the edge-detect logic _before_ the mask logic, so if a edge happens _while_ the device is masked, you'll never ever see the edge ever again (unmasking will not cause a new edge, so you simply lost the interrupt). So when you "mask" an edge-triggered IRQ, you can't really mask it at all, because if you did that, you'd lose it forever if the IRQ comes in while you masked it. Instead, we're supposed to leave it active, and set a flag, and IF the IRQ comes in, we just remember it, and mask it at that point instead, and then on unmasking, we have to replay it by sending a self-IPI." This trivial patch solves the problem. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Acked-by: Komuro Signed-off-by: Linus Torvalds commit 134a11f0c37c043d3ea557ea15b95b084e3cc2c8 Author: Takashi Iwai Date: Fri Nov 10 12:08:37 2006 +0100 [PATCH] ALSA: hda-intel - Disable MSI support by default Disable MSI support on HD-audio driver as default since there are too many broken devices. The module option is changed from disable_msi to enable_msi, too. For turning MSI support on, pass enable_msi=1, instead. Signed-off-by: Takashi Iwai Signed-off-by: Linus Torvalds commit c387fd85f84b9d89a75596325d8d6a0f730baf64 Author: Jiri Slaby Date: Wed Nov 15 00:30:17 2006 +0100 [PATCH] Char: isicom, fix close bug port is dereferenced even if it is NULL. Dereference it _after_ the check if (!port)... Thanks Eric for reporting this. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7527 Signed-off-by: Jiri Slaby Signed-off-by: Linus Torvalds commit 9a3a04ac386f44175b6a4142eaeab3d4170a57f3 Author: Linus Torvalds Date: Tue Nov 14 15:20:51 2006 -0800 Revert "[PATCH] fix Data Acess error in dup_fd" This reverts commit 0130b0b32ee53dc7add773fcea984f6a26ef1da3. Sergey Vlasov points out (and Vadim Lobanov concurs) that the bug it was supposed to fix must be some unrelated memory corruption, and the "fix" actually causes more problems: "However, the new code does not look safe in all cases. If some other task has opened more files while dup_fd() released oldf->file_lock, the new code will update open_files to the new larger value. But newf was allocated with the old smaller value of open_files, therefore subsequent accesses to newf may try to write into unallocated memory." so revert it. Cc: Sharyathi Nagesh Cc: Sergey Vlasov Cc: Vadim Lobanov Cc: Andrew Morton Signed-off-by: Linus Torvalds commit cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba Author: Hugh Dickins Date: Tue Nov 14 13:43:38 2006 +0000 [PATCH] hugetlb: fix error return for brk() entering a hugepage region Commit cb07c9a1864a8eac9f3123e428100d5b2a16e65a causes the wrong return value. is_hugepage_only_range() is a boolean, so we should return -EINVAL rather than 1. Also - we can use "mm" instead of looking up "current->mm" again. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 1f794b6082a5ff88f7c48d1634056026acf806f4 Author: Jens Axboe Date: Tue Nov 14 12:36:45 2006 +0100 [PATCH] cpqarray: fix iostat cpqarray needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit b369c2cfa47bc0ad495a95fe9a17c9888781d615 Author: Jens Axboe Date: Tue Nov 14 12:36:03 2006 +0100 [PATCH] cciss: fix iostat cciss needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit a4625085445b86951d8482c0cdd6d52719f7c323 Author: Brian King Date: Mon Nov 13 16:32:36 2006 -0600 [PATCH] libata: Convert from module_init to subsys_initcall When building a monolithic kernel, the load order of drivers does not work for SAS libata users, resulting in a kernel oops. Convert libata to use subsys_initcall instead of module_init, which ensures that libata gets loaded before any LLDD. This is the same thing that scsi core does to solve the problem. The load order problem was observed on ipr SAS adapters and should exist for other SAS users as well. Signed-off-by: Brian King Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit cb07c9a1864a8eac9f3123e428100d5b2a16e65a Author: David Gibson Date: Tue Nov 14 02:03:38 2006 -0800 [PATCH] hugetlb: check for brk() entering a hugepage region Unlike mmap(), the codepath for brk() creates a vma without first checking that it doesn't touch a region exclusively reserved for hugepages. On powerpc, this can allow it to create a normal page vma in a hugepage region, causing oopses and other badness. Add a test to prevent this. With this patch, brk() will simply fail if it attempts to move the break into a hugepage reserved region. Signed-off-by: David Gibson Cc: Adam Litke Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68589bc353037f233fe510ad9ff432338c95db66 Author: Hugh Dickins Date: Tue Nov 14 02:03:32 2006 -0800 [PATCH] hugetlb: prepare_hugepage_range check offset too (David:) If hugetlbfs_file_mmap() returns a failure to do_mmap_pgoff() - for example, because the given file offset is not hugepage aligned - then do_mmap_pgoff will go to the unmap_and_free_vma backout path. But at this stage the vma hasn't been marked as hugepage, and the backout path will call unmap_region() on it. That will eventually call down to the non-hugepage version of unmap_page_range(). On ppc64, at least, that will cause serious problems if there are any existing hugepage pagetable entries in the vicinity - for example if there are any other hugepage mappings under the same PUD. unmap_page_range() will trigger a bad_pud() on the hugepage pud entries. I suspect this will also cause bad problems on ia64, though I don't have a machine to test it on. (Hugh:) prepare_hugepage_range() should check file offset alignment when it checks virtual address and length, to stop MAP_FIXED with a bad huge offset from unmapping before it fails further down. PowerPC should apply the same prepare_hugepage_range alignment checks as ia64 and all the others do. Then none of the alignment checks in hugetlbfs_file_mmap are required (nor is the check for too small a mapping); but even so, move up setting of VM_HUGETLB and add a comment to warn of what David Gibson discovered - if hugetlbfs_file_mmap fails before setting it, do_mmap_pgoff's unmap_region when unwinding from error will go the non-huge way, which may cause bad behaviour on architectures (powerpc and ia64) which segregate their huge mappings into a separate region of the address space. Signed-off-by: Hugh Dickins Cc: "Luck, Tony" Cc: "David S. Miller" Acked-by: Adam Litke Acked-by: David Gibson Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69ae9e3ee4ce99140a7db424bebf55d8d180da2f Author: David Brownell Date: Tue Nov 14 02:03:31 2006 -0800 [PATCH] usb: MAINTAINERS updates Looks like I still take care of the USB gadget/peripheral framework. Signed-off-by: David Brownell Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6e89cb6cd3a10eb203914093642f580c20476d4 Author: Nathan Lynch Date: Tue Nov 14 02:03:30 2006 -0800 [PATCH] nvidiafb: fix unreachable code in nv10GetConfig Fix binary/logical operator typo which leads to unreachable code. Noticed while looking at other issues; I don't have the relevant hardware to test this. Signed-off-by: Nathan Lynch Cc: "Antonino A. Daplas" Acked-by: James Simmons Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa Author: Ian Kent Date: Tue Nov 14 02:03:29 2006 -0800 [PATCH] autofs4: panic after mount fail Resolve the panic on failed mount of an autofs filesystem originally reported by Mao Bibo. It addresses two issues that happen after the mount fail. The first a NULL pointer reference to a field (pipe) in the autofs superblock info structure and second the lack of super block cleanup by the autofs and autofs4 modules. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a34b57bec41c95f1e38f700cd9b81324baaffc7 Author: Nicolas Kaiser Date: Tue Nov 14 02:03:28 2006 -0800 [PATCH] drivers/ide: stray bracket Stray bracket in debug code. Signed-off-by: Nicolas Kaiser Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8f7975159f35846754d3845c9701b612c5c0624 Author: Andrew Morton Date: Tue Nov 14 02:03:26 2006 -0800 [PATCH] revert "PCI: quirk for IBM Dock II cardbus controllers" Fix http://bugzilla.kernel.org/show_bug.cgi?id=7264 We need to target this quirk a little more tightly, using the T20 DMI string. Cc: Pavel Kysilka Acked-by: Kristen Carlson Accardi Cc: Greg Kroah-Hartman Cc: Dominik Brodowski Cc: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3ac84324fd949f671e6cf5620add5de02498386 Author: Daniel Ritz Date: Tue Nov 14 02:03:25 2006 -0800 [PATCH] fix via586 irq routing for pirq 5 Fix interrupt routing for via 586 bridges. pirq can be 5 which needs to be mapped to INTD. But currently the access functions can handle only pirq 1-4. this is similar to the other via chipsets where pirq 4 and 5 are both mapped to INTD. Fixes bugzilla #7490 Cc: Daniel Paschka Cc: Adrian Bunk Signed-off-by: Daniel Ritz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b126b77536186eef69d408eb7959ce7f558f251 Author: Andrew Morton Date: Tue Nov 14 02:03:23 2006 -0800 [PATCH] setup_irq(): better mismatch debugging When we get a mismatch between handlers on the same IRQ, all we get is "IRQ handler type mismatch for IRQ n". Let's print the name of the presently-registered handler with which we got the mismatch. Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9446868b5383eb87f76b2d4389dea4bb968a6657 Author: Andi Kleen Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix race in exit_idle When another interrupt happens in exit_idle the exit idle notifier could be called an incorrect number of times. Add a test_and_clear_bit_pda and use it handle the bit atomically against interrupts to avoid this. Pointed out by Stephane Eranian Signed-off-by: Andi Kleen commit 8c131af1db510793f87dc43edbc8950a35370df3 Author: Andi Kleen Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled The vgetcpu per CPU initialization previously relied on CPU hotplug events for all CPUs to initialize the per CPU state. That only worked only on kernels with CONFIG_HOTPLUG_CPU enabled. On the others some CPUs didn't get their state initialized properly and vgetcpu wouldn't work. Change the initialization sequence to instead run in a normal initcall (which runs after the normal CPU bootup) and initialize all running CPUs there. Later hotplug CPUs are still handled with an hotplug notifier. This actually simplifies the code somewhat. Signed-off-by: Andi Kleen commit fa18f477d0987c011cce047a7c3cd1284f547a14 Author: Andi Kleen Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86: Add acpi_user_timer_override option for Asus boards Timer overrides are normally disabled on Nvidia board because they are commonly wrong, except on new ones with HPET support. Unfortunately there are quite some Asus boards around that don't have HPET, but need a timer override. We don't know yet how to handle this transparently, but at least add a command line option to force the timer override and let them boot. Cc: len.brown@intel.com Signed-off-by: Andi Kleen commit 15803a43288da434d34d41c4ed650c3c1728d42c Author: Magnus Damm Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: setup saved_max_pfn correctly (kdump) x86_64: setup saved_max_pfn correctly 2.6.19-rc4 has broken CONFIG_CRASH_DUMP support on x86_64. It is impossible to read out the kernel contents from /proc/vmcore because saved_max_pfn is set to zero instead of the max_pfn value before the user map is setup. This happens because saved_max_pfn is initialized at parse_early_param() time, and at this time no active regions have been registered. save_max_pfn is setup from e820_end_of_ram(), more exact find_max_pfn_with_active_regions() which returns 0 because no regions exist. This patch fixes this by registering before and removing after the call to e820_end_of_ram(). Signed-off-by: Magnus Damm Signed-off-by: Andi Kleen commit 5e58a02a8f6a7a1c9ae41f39286bcd3aea0d6f24 Author: Andi Kleen Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Handle reserve_bootmem_generic beyond end_pfn This can happen on kexec kernels with some configurations, in particularly on Unisys ES7000 systems. Analysis by Amul Shah Cc: Amul Shah Signed-off-by: Andi Kleen commit 51d67a488b53a5cc8401460480c124eaec71e2d4 Author: Steven Rostedt Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says Stephen Tweedie, Herbert Xu, and myself have been struggling with a very nasty bug in Xen. But it also pointed out a small bug in the x86_64 kernel boot setup. The GDT limit being setup by the initial bzImage code when entering into protected mode is way too big. The comment by the code states that the size of the GDT is 2048, but the actual size being set up is much bigger (32768). This happens simply because of one extra '0'. Instead of setting up a 0x800 size, 0x8000 is set up. On bare metal this is fine because the CPU wont load any segments unless they are explicitly used. But unfortunately, this breaks Xen on vmx FV, since it (for now) blindly loads all the segments into the VMCS if they are less than the gdt limit. Since the real mode segments are around 0x3000, we are getting junk into the VMCS and that later causes an exception. Stephen Tweedie has written up a patch to fix the Xen side and will be submitting that to those folks. But that doesn't excuse the GDT limit being a magnitude too big. AK: changed to compute true gdt size in assembler, fixed comment Signed-off-by: Steven Rostedt Signed-off-by: Andi Kleen commit 14679eb3c50897889ba62f9a37e3bcd8a205b5e7 Author: Andi Kleen Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation. ptrace(PTRACE_[SG]ET_THREAD_AREA) calls from ia32 code should be passed onto the x86_64 implementation. The default case in sys32_ptrace used to call to sys_ptrace(), but is now EINVAL. This patch fixes a regression caused by that changed. Signed-off-by: Mike McCormack Signed-off-by: Andi Kleen commit 14f448e36192d6d2cd7dfd81cb044977b2f9dd9b Author: Aaron Durbin Date: Tue Nov 14 16:57:45 2006 +0100 [PATCH] x86-64: Fix partial page check to ensure unusable memory is not being marked usable. Fix partial page check in e820_register_active_regions to ensure partial pages are not being marked as active in the memory pool. Signed-off-by: Aaron Durbin Signed-off-by: Andi Kleen commit 64e72e41acae0dab733fb0d5d789b76d115210c0 Author: Andi Kleen Date: Tue Nov 14 16:56:33 2006 +0100 Revert "[PATCH] MMCONFIG and new Intel motherboards" This reverts 4c6e052adfe285ede5884e4e8c4d33af33932c13 commit. Following Linus' i386 change: revert resource reservation for mmcfg config now. Will be revisited in .20 hopefully. commit aa8d18731508bb0a16f69b77e5f4541f0d6fb553 Author: Russell King Date: Tue Nov 14 15:15:40 2006 +0000 [ARM] Remove OP_MAX_COUNTER OP_MAX_COUNTER never referenced, and is a reminant of an earlier oprofile implementation. Remove it. Signed-off-by: Russell King commit 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 Author: Darrick J. Wong Date: Tue Nov 14 09:55:41 2006 -0500 libata: fix double-completion on error A curious thing happens, however, when ata_qc_new_init fails to get an ata_queued_cmd: First, ata_qc_new_init handles the failure like this: cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1); done(cmd); Then, we return to ata_scsi_translate and do this: err_mem: cmd->result = (DID_ERROR << 16); done(cmd); It appears to me that first we set a status code indicating that we're ok but the device queue is full and finish the command, but then we blow away that status code and replace it with an error flag and finish the command a second time! That does not seem to be desirable behavior since we merely want the I/O to wait until a command slot frees up, not send errors up the block layer. In the err_mem case, we should simply exit out of ata_scsi_translate instead. Signed-off-by: Darrick J. Wong Signed-off-by: Jeff Garzik commit 3f9dd27a22ff79b6b6c4eccd19e4063bff0ddc7e Author: Alexey Dobriyan Date: Fri Nov 10 22:52:46 2006 +0300 [PATCH] pata_artop: fix "& (1 >>" typo Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit b5bf24b94c65536d3cc2bf9039ab05b3967f7b7f Author: Alan Cox Date: Wed Nov 8 16:18:26 2006 +0000 [PATCH] hpt37x: Check the enablebits Helps for PATA but SATA bridged devices lie and always set all the bits so will need the error handling fixes from Tejun. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 4dd7406e9c7e7a5422425ef699780463490b8745 Author: Linus Torvalds Date: Mon Nov 13 09:50:11 2006 -0800 [dvb saa7134] Fix missing 'break' for avermedia card case Commit 450efcfd2e1d941e302a8c89322fbfcef237be98 broke Avermedia 777 support. Added obvious missing "break" statement. Cc: José Suárez Cc: Michael Krufky Cc: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit b71567312976305cc1ce7e9b71e7378c8bfcb40f Author: Jens Axboe Date: Mon Nov 13 18:05:02 2006 +0100 [PATCH] ide-cd: only set rq->errors SCSI style for block pc requests We should only set ->errors to CHECK_CONDITION and so on for requests that use this field in the SCSI manner. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 616e8a091a035c0bd9b871695f4af191df123caa Author: Jens Axboe Date: Mon Nov 13 18:04:59 2006 +0100 [PATCH] Fix bad data direction in SG_IO Contrary to what the name misleads you to believe, SG_DXFER_TO_FROM_DEV is really just a normal read seen from the device side. This patch fixes http://lkml.org/lkml/2006/10/13/100 Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 39798695b4bcc7b145f8910ca56195808d3a7637 Author: Roland Dreier Date: Mon Nov 13 09:38:07 2006 -0800 IB/mad: Fix race between cancel and receive completion When ib_cancel_mad() is called, it puts the canceled send on a list and schedules a "flushed" callback from process context. However, this leaves a window where a receive completion could be processed before the send is fully flushed. This is fine, except that ib_find_send_mad() will find the MAD and return it to the receive processing, which results in the sender getting both a successful receive and a "flushed" send completion for the same request. Understandably, this confuses the sender, which is expecting only one of these two callbacks, and leads to grief such as a use-after-free in IPoIB. Fix this by changing ib_find_send_mad() to return a send struct only if the status is still successful (and not "flushed"). The search of the send_list already had this check, so this patch just adds the same check to the search of the wait_list. Signed-off-by: Roland Dreier commit b26c791e9ca3365616d40836000285931ca033d0 Author: Jean Delvare Date: Thu Nov 9 21:02:26 2006 +0100 RDMA/amso1100: Fix && typo Fix the AMSO1100 firmware version computation, which was broken due to "&&" being used where "&" should have. Signed-off-by: Jean Delvare Signed-off-by: Roland Dreier commit 2ffcab6ae44b02679229ca1852526d0a6e062dd2 Author: Tom Tucker Date: Wed Nov 8 14:23:22 2006 -0600 RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device Rework some load-time error handling: c2_register_device() leaked when it failed, and the function that called it didn't check the return code. Signed-off-by: Tom Tucker Signed-off-by: Roland Dreier commit f2c238a0c5e155acd49752c5fb93fb8d8534232b Author: Hoang-Nam Nguyen Date: Sun Nov 5 21:42:20 2006 +0100 IB/ehca: Activate scaling code by default Change ehca's Kconfig to activates scaling code as default. After several measurements we saw that this feature prevents dropped packets (UD) in stress situation. Thus, enabling it helps to improve ehca's bandwidth through IPoIB. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit c58121143f87930621c1a6fa9683b6862f2b42c9 Author: Hoang-Nam Nguyen Date: Sun Nov 5 21:42:56 2006 +0100 IB/ehca: Use named constant for max mtu Define and use a constant EHCA_MAX_MTU instead hardcoded value. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 09123d230a294cd3b860f4ea042235b988277f0a Author: Alan Stern Date: Fri Nov 10 12:27:57 2006 -0800 [PATCH] SCSI core: always store >= 36 bytes of INQUIRY data This patch (as810c) copies a minimum of 36 bytes of INQUIRY data, even if the device claims that not all of them are valid. Often badly behaved devices put plausible data in the Vendor, Product, and Revision strings but set the Additional Length byte to a small value. Using potentially valid data is certainly better than allocating a short buffer and then reading beyond the end of it, which is what we do now. Signed-off-by: Alan Stern Cc: James Bottomley Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f72fa707604c015a6625e80f269506032d5430dc Author: Pavel Emelianov Date: Fri Nov 10 12:27:56 2006 -0800 [PATCH] Fix misrouted interrupts deadlocks While testing kernel on machine with "irqpoll" option I've caught such a lockup: __do_IRQ() spin_lock(&desc->lock); desc->chip->ack(); /* IRQ is ACKed */ note_interrupt() misrouted_irq() handle_IRQ_event() if (...) local_irq_enable_in_hardirq(); /* interrupts are enabled from now */ ... __do_IRQ() /* same IRQ we've started from */ spin_lock(&desc->lock); /* LOCKUP */ Looking at misrouted_irq() code I've found that a potential deadlock like this can also take place: 1CPU: __do_IRQ() spin_lock(&desc->lock); /* irq = A */ misrouted_irq() for (i = 1; i < NR_IRQS; i++) { spin_lock(&desc->lock); /* irq = B */ if (desc->status & IRQ_INPROGRESS) { 2CPU: __do_IRQ() spin_lock(&desc->lock); /* irq = B */ misrouted_irq() for (i = 1; i < NR_IRQS; i++) { spin_lock(&desc->lock); /* irq = A */ if (desc->status & IRQ_INPROGRESS) { As the second lock on both CPUs is taken before checking that this irq is being handled in another processor this may cause a deadlock. This issue is only theoretical. I propose the attached patch to fix booth problems: when trying to handle misrouted IRQ active desc->lock may be unlocked. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0130b0b32ee53dc7add773fcea984f6a26ef1da3 Author: Sharyathi Nagesh Date: Fri Nov 10 12:27:54 2006 -0800 [PATCH] fix Data Acess error in dup_fd On running the Stress Test on machine for more than 72 hours following error message was observed. 0:mon> e cpu 0x0: Vector: 300 (Data Access) at [c00000007ce2f7f0] pc: c000000000060d90: .dup_fd+0x240/0x39c lr: c000000000060d6c: .dup_fd+0x21c/0x39c sp: c00000007ce2fa70 msr: 800000000000b032 dar: ffffffff00000028 dsisr: 40000000 current = 0xc000000074950980 paca = 0xc000000000454500 pid = 27330, comm = bash 0:mon> t [c00000007ce2fa70] c000000000060d28 .dup_fd+0x1d8/0x39c (unreliable) [c00000007ce2fb30] c000000000060f48 .copy_files+0x5c/0x88 [c00000007ce2fbd0] c000000000061f5c .copy_process+0x574/0x1520 [c00000007ce2fcd0] c000000000062f88 .do_fork+0x80/0x1c4 [c00000007ce2fdc0] c000000000011790 .sys_clone+0x5c/0x74 [c00000007ce2fe30] c000000000008950 .ppc_clone+0x8/0xc The problem is because of race window. When if(expand) block is executed in dup_fd unlocking of oldf->file_lock give a window for fdtable in oldf to be modified. So actual open_files in oldf may not match with open_files variable. Cc: Vadim Lobanov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fd934a9a1b72c718ad5c388fd2e0fd90486cbf3 Author: Franck Bui-Huu Date: Fri Nov 10 12:27:53 2006 -0800 [PATCH] .gitignore: add miscellaneous files Prevent git from reporting this useless status: On branch refs/heads/master Untracked files: (use "git add" to add to commit) TAGS scripts/kconfig/lkc_defs.h scripts/kconfig/qconf.moc nothing to commit Signed-off-by: Franck Bui-Huu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8b295f29091310d746509bb6d5828aaf4907a18 Author: Russell King Date: Fri Nov 10 12:27:53 2006 -0800 [PATCH] Fix missing parens in set_personality() If you call set_personality() with an expression such as: set_personality(foo ? PERS_FOO1 : PERS_FOO2); then this evaluates to: ((current->personality == foo ? PERS_FOO1 : PERS_FOO2) ? ... which is obviously not the intended result. Add the missing parents to ensure this gets evaluated as expected: ((current->personality == (foo ? PERS_FOO1 : PERS_FOO2)) ? ... Signed-off-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e40c67597eac7a0b0e676867517b01a5a57f7b4b Author: Wink Saville Date: Fri Nov 10 12:27:52 2006 -0800 [PATCH] Patch for nvidia divide by zero error for 7600 pci-express card The following patch resolves the divide by zero error I encountered on my system: http://marc.10east.com/?l=linux-fbdev-devel&m=116058257024413&w=2 I accomplished this by merging what I thought was appropriate from: http://webcvs.freedesktop.org/xorg/driver/xf86-video-nv/src/ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7947d2cc2c2e01125a393de83862d02b621999fe Author: Corey Minyard Date: Fri Nov 10 12:27:50 2006 -0800 [PATCH] IPMI: Fix more && typos Fix improper use of "&&" when "&" was intended. Signed-off-by: Jean Delvare Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a4b0fc503ff4149f5915be4aeb179b9453cf485 Author: Jes Sorensen Date: Fri Nov 10 12:27:49 2006 -0800 [PATCH] mspec driver build fix Fix MSPEC driver to build for non SN2 enabled configs as the driver should work in cached and uncached modes (no fetchop) on these systems. In addition make MSPEC select IA64_UNCACHED_ALLOCATOR, which is required for it and move it to arch/ia64/Kconfig to avoid warnings on non ia64 architectures running allmodconfig. Once the Kconfig code is fixed, we can move it back. Signed-off-by: Jes Sorensen Cc: Fernando Luis Vzquez Cao Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d67afe5ed00070de0965bfc98de5f6ed3a80a73e Author: David Miller Date: Fri Nov 10 12:27:48 2006 -0800 [PATCH] pci: don't try to remove sysfs files before they are setup. The PCI sysfs attributes are created after the initial PCI bus scan. With the addition of more return value checking and assertions in the device and sysfs layers we now can get dumps like this on sparc64: [ 20.135032] Call Trace: [ 20.135042] [0000000000537f88] pci_remove_bus_device+0x30/0xc0 [ 20.135076] [000000000078f890] pci_fill_in_pbm_cookies+0x98/0x440 [ 20.135109] [000000000042e828] sabre_scan_bus+0x230/0x400 [ 20.135139] [000000000078c710] pcibios_init+0x58/0xa0 [ 20.135159] [0000000000416f14] init+0x9c/0x2e0 [ 20.135190] [0000000000417a50] kernel_thread+0x38/0x60 [ 20.135211] [0000000000417170] rest_init+0x18/0x40 [ 20.135514] PCI0(PBMB): Bus running at 33MHz It's triggering because removal of the "config" PCI sysfs file for the device fails. On sparc64, after probing the device, we'll delete the PCI device via pci_remove_bus_device() if we cannot find the firmware device tree node corresponding to it. This is fine, but at this point the sysfs files for the PCI device won't be setup yet. So we should not try to do anything in pci_remove_sysfs_dev_files() if pci_sysfs_init() has not run yet. Signed-off-by: David S. Miller Acked-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b4ac44e7c7e16cf9411b81693ff3e604f332bf1 Author: Eric Dumazet Date: Fri Nov 10 12:27:48 2006 -0800 [PATCH] vmalloc: optimization, cleanup, bugfixes - reorder 'struct vm_struct' to speedup lookups on CPUS with small cache lines. The fields 'next,addr,size' should be now in the same cache line, to speedup lookups. - One minor cleanup in __get_vm_area_node() - Bugfixes in vmalloc_user() and vmalloc_32_user() NULL returns from __vmalloc() and __find_vm_area() were not tested. [akpm@osdl.org: remove redundant BUG_ONs] Signed-off-by: Eric Dumazet Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f36fbb242442184d314e305199bb9a449be4f67 Author: Alexey Dobriyan Date: Thu Nov 9 17:36:44 2006 -0300 V4L/DVB (4818): Flexcop-usb: fix debug printk .. fix debug printk. Why, oh why, one would want to do (u16 & 0xff) << 8 and print it with %02x format? Acked-by: Patrick Boettcher Signed-off-by: Alexey Dobriyan Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fef4fa1475db6a53237e29451c88c15167d69cc4 Author: Jean Delvare Date: Thu Nov 9 17:25:28 2006 -0300 V4L/DVB (4817): Fix uses of "&&" where "&" was intended Fix uses of "&&" where "&" was intended in bttv-cards.c and tveeprom.c Signed-off-by: Jean Delvare Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0871a8849b80646074cd28b2b078c8e002e51282 Author: pasky@ucw.cz Date: Sun Nov 12 14:24:57 2006 -0300 V4L/DVB (4816): Change tuner type for Avermedia A16AR This changes it from TDA8290 which is allegedly very unlikely to TD1316 which is allegedly very likely. I didn't get it to work with either, but expected that this got applied when Mauro sent it to me, so here it goes again; feel free to drop it to the floor. :-) Signed-off-by: Petr Baudis Signed-off-by: Mauro Carvalho Chehab commit 29e0f1a136d39c5683d998741911b769d0172d52 Author: pasky@ucw.cz Date: Sun Nov 12 14:23:32 2006 -0300 V4L/DVB (4815): Remote support for Avermedia A16AR The remote as well as the GPIO interface is the same as what comes with 777. For an example of mplayer lirc configuration, see http://pasky.or.cz/~pasky/dev/v4l/lircrc Signed-off-by: Petr Baudis Signed-off-by: Mauro Carvalho Chehab commit 450efcfd2e1d941e302a8c89322fbfcef237be98 Author: pasky@ucw.cz Date: Sun Nov 12 14:22:32 2006 -0300 V4L/DVB (4814): Remote support for Avermedia 777 I didn't test it personally since I don't have this card, but A16AR uses the same interface and that one certainly does work perfectly (see the next patch). This patch was originally sent in http://marc.theaimsgroup.com/?l=linux-video&m=114743413825375&w=2 https://www.redhat.com/mailman/private/video4linux-list/2006-May/msg00103.html but never got applied. This version has some trivial modifications and drops the weird gpio hack (it's not clear what practical purpose does it serve). Signed-off-by: Jose Alberto Reguero Signed-off-by: Petr Baudis Signed-off-by: Mauro Carvalho Chehab commit ce48d5ecf3f52378064f317e0094b601508e9b3e Author: Mauro Carvalho Chehab Date: Sun Nov 5 09:02:13 2006 -0300 V4L/DVB (4804): Fix missing i2c dependency for saa7110 drivers/media/video/saa7110.c:112: undefined reference to `i2c_master_send' drivers/built-in.o: In function `saa7110_read': drivers/media/video/saa7110.c:130: undefined reference to `i2c_smbus_read_byte' drivers/media/video/saa7110.c:130: undefined reference to `i2c_smbus_read_byte' Signed-off-by: Mauro Carvalho Chehab commit ff97d93d6a311759db1b74b9b90dd6bcb8ce0aee Author: Hermann Pitton Date: Fri Nov 3 10:45:52 2006 -0300 V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert fix remote control on WinFast 2000XP Expert by setting timing back to 1 ms, like it was in the original patch by Robert Reid. Signed-off-by: Hermann Pitton Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d027c4dc7d6e35a4e43dbcc178f0bf3359814306 Author: Alexey Dobriyan Date: Fri Nov 3 07:14:32 2006 -0300 V4L/DVB (4795): Tda826x: use correct max frequency sparse "defined twice" warning Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6751718932be7325c898e5908daec2ee917afd09 Author: Russell King Date: Sat Nov 11 22:54:07 2006 +0000 [ARM] Remove PM_LEGACY=y from selected ARM defconfigs Most ARM defconfigs don't actually need to have PM_LEGACY enabled. Disable it for ATEB9200, Collie, IXP4xx, OMAP H2, S3C2410 and Versatile. Signed-off-by: Russell King commit 050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3 Author: David Chinner Date: Sat Nov 11 18:05:06 2006 +1100 [XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h SGI-PV: 957005 SGI-Modid: xfs-linux-melb:xfs-kern:27398a Signed-off-by: David Chinner Signed-off-by: Michal Piotrowski Signed-off-by: Tim Shimmin commit 4c60658e0f4e253cf275f12b7c76bf128515a774 Author: David Chinner Date: Sat Nov 11 18:05:00 2006 +1100 [XFS] Prevent a deadlock when xfslogd unpins inodes. The previous fixes for the use after free in xfs_iunpin left a nasty log deadlock when xfslogd unpinned the inode and dropped the last reference to the inode. the ->clear_inode() method can issue transactions, and if the log was full, the transaction could push on the log and get stuck trying to push the inode it was currently unpinning. To fix this, we provide xfs_iunpin a guarantee that it will always have a valid xfs_inode <-> linux inode link or a particular flag will be set on the inode. We then use log forces during lookup to ensure transactions are completed before we recycle the inode. This ensures that xfs_iunpin will never use the linux inode after it is being freed, and any lookup on an inode on the reclaim list will wait until it is safe to attach a new linux inode to the xfs inode. SGI-PV: 956832 SGI-Modid: xfs-linux-melb:xfs-kern:27359a Signed-off-by: David Chinner Signed-off-by: Shailendra Tripathi Signed-off-by: Takenori Nagano Signed-off-by: Tim Shimmin commit 7a18c386078eaf17ae54595f66c0d64d9c1cb29c Author: David Chinner Date: Sat Nov 11 18:04:54 2006 +1100 [XFS] Clean up i_flags and i_flags_lock handling. SGI-PV: 956832 SGI-Modid: xfs-linux-melb:xfs-kern:27358a Signed-off-by: David Chinner Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 2e2e7bb1fd857b9fc83b0cd77b6b647ebb423301 Author: Vlad Apostolov Date: Sat Nov 11 18:04:47 2006 +1100 [XFS] 956664: dm_read_invis() changes i_atime SGI-PV: 956664 SGI-Modid: xfs-linux-melb:xfs-kern:27315a Signed-off-by: Vlad Apostolov Signed-off-by: Sam Vaughan Signed-off-by: Tim Shimmin commit 70a505285f9859f77e07f7c12371b0d29ecf3d82 Author: Vlad Apostolov Date: Sat Nov 11 18:04:41 2006 +1100 [XFS] rename uio_read() to xfs_uio_read() SGI-PV: 957004 SGI-Modid: xfs-linux-melb:xfs-kern:27231a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 439b8434792d0b62e32ab1416f214a18a640cc03 Author: Tim Shimmin Date: Sat Nov 11 18:04:34 2006 +1100 [XFS] Keep lockdep happy. SGI-PV: 956964 SGI-Modid: xfs-linux-melb:xfs-kern:27200a Signed-off-by: Tim Shimmin Signed-off-by: David Chinner Signed-off-by: Eric Sandeen commit 93c189c1148a5e39bcc8f62568f42a77f93477c5 Author: Vlad Apostolov Date: Sat Nov 11 18:03:49 2006 +1100 [XFS] 956618: Linux crashes on boot with XFS-DMAPI filesystem when CONFIG_XFS_TRACE is on SGI-PV: 956618 SGI-Modid: xfs-linux-melb:xfs-kern:27196a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit bb831eb2027c12a740ad4e4ad78f2a0e841ae808 Author: Julian Anastasov Date: Fri Nov 10 14:57:37 2006 -0800 [IPVS]: More endianness fixed. - make sure port in FTP data is in network order (in fact it was looking buggy for big endian boxes before Viro's changes) - htonl -> htons for port Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 92b1f905637bbd79fcd430a09737fd97061eb405 Author: David Rientjes Date: Wed Nov 8 19:49:15 2006 -0800 [PATCH] drivers cris: return on NULL dev_alloc_skb() If the next descriptor array entry cannot be allocated by dev_alloc_skb(), return immediately so it is not dereferenced later. We cannot register the device with a partial descriptor list. Cc: Mikael Starvik Signed-off-by: David Rientjes Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ace48ffb5d6c927c5a98048d93543e1cae0eebd0 Author: Randy Dunlap Date: Wed Nov 8 19:51:03 2006 -0800 [PATCH] com20020 build fix com20020.c needs to export functions if either of the ISA or PCI modules are built as loadable modules. Or they could always be exported. WARNING: "com20020_found" [drivers/net/arcnet/com20020-pci.ko] undefined! WARNING: "com20020_check" [drivers/net/arcnet/com20020-pci.ko] undefined! Signed-off-by: Randy Dunlap Cc: Toralf Forster Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a Author: Peter Zijlstra Date: Wed Nov 8 19:51:01 2006 -0800 [PATCH] bonding: lockdep annotation ============================================= [ INFO: possible recursive locking detected ] 2.6.17-1.2600.fc6 #1 Signed-off-by: Jeff Garzik commit 36b600f2649e3be49039efe31edeeb64277dbd99 Author: Geoff Levand Date: Thu Nov 2 21:08:45 2006 -0800 [POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig The current cell processor support needs sparsemem, so set it as the default memory model. Signed-off-by: Geoff Levand Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ab56dbddc8a23ff3f4602855aaf0fcb3c814118b Author: Benjamin Herrenschmidt Date: Fri Nov 10 15:11:20 2006 +1100 [POWERPC] Fix cell "new style" mapping and add debug This fixes a typo in the "new style" code for mapping SPE resources, which causes it to try to map the same resource 4 times. It also adds some pr_debug's that are useful to track down issues with the firmware when bringinh up new machines. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit ae883cab9457aad0fb3342249e1207873d3b64de Author: John Rose Date: Wed Nov 8 10:07:30 2006 -0600 [POWERPC] pseries: Force 4k update_flash block and list sizes The enablement of 64k pages on pseries platforms exposed a bug in the RTAS mechanism for updating firmware. RTAS assumes 4k for flash block and list sizes, and use of any other sizes results in a failure, even though PAPR does not specify any such requirement. This patch changes the rtas_flash module to force the use of 4k memory block and list sizes when preparing and sending a firmware image to RTAS. The rtas_flash function now uses a slab cache of 4k blocks with 4k alignment, rather than get_zeroed_page(), to allocate the memory for the flash blocks and lists. The 4k alignment requirement is specified in PAPR. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 0091cf5a6ae6e52fc95ceb53200975ef2c81c206 Author: Kalle Pokki Date: Wed Nov 1 15:08:13 2006 +0200 [POWERPC] CPM_UART: Fix non-console initialisation The cpm_uart driver is initialised incorrectly, if there is a frame buffer console, and CONFIG_SERIAL_CPM_CONSOLE is defined. The driver fails to call cpm_uart_init_portdesc() and set_lineif() in this case. Signed-off-by: Kalle Pokki Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 599540a85595bd5950354bd95f5ebf9c6e07c971 Author: Kalle Pokki Date: Wed Nov 1 09:52:41 2006 +0200 [POWERPC] CPM_UART: Fix non-console transmit The SMC and SCC hardware transmitter is enabled at the wrong place. Simply writing twice to the non-console port, like $ echo asdf > /dev/ttyCPM1 $ echo asdf > /dev/ttyCPM1 puts the shell into endless uninterruptible sleep, since the transmitter is stopped after the first write, and is not enabled before the shutdown function of the second write. Thus the transmit buffers are never emptied. Signed-off-by: Kalle Pokki Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit da413908d5e9ebdd0889a599e80d21d7237021c6 Author: Simon Horman Date: Thu Nov 9 20:00:55 2006 -0800 [IPVS]: Compile fix for annotations in userland. This change makes __beXX available to user-space applications, such as ipvsadm, which include ip_vs.h Signed-Off-By: Simon Horman Signed-off-by: David S. Miller commit 05052f7f130b1232faeee1674a5bc41f67746cff Author: Adrian Bunk Date: Wed Nov 8 19:56:37 2006 -0800 [SCSI] psi240i.c: fix an array overrun Fix an array overrun spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 107e716b3487df5e2940ebe3338d935306efc78b Author: Jean Delvare Date: Thu Nov 9 21:45:09 2006 +0100 [SCSI] gdth: Fix && typos Fix uses of "&&" where "&" was obviously intended instead. Signed-off-by: Jean Delvare Signed-off-by: James Bottomley commit 82a0d7b5829ebd033b7f808c026ab43509913692 Author: Mike Christie Date: Wed Nov 8 15:58:34 2006 -0600 [SCSI] iscsi class: update version Update version number Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit db37c505e5dfc1a26d6c82f1ce0c3ae06641c3e0 Author: Mike Christie Date: Wed Nov 8 15:58:33 2006 -0600 [SCSI] iscsi_tcp: fix xmittask oops XMSTATE_SOL_HDR could be set when the xmit thread tests it, but there may not be anything on the r2tqueue yet. Move the XMSTATE_SOL_HDR set before the addition to the queue to make sure that when we pull something off it it is valid. This does not add locks around the xmstate test or make that a atmoic_t because this is a fast path and if it is set when we test it we can handle it there without the overhead. Later on we check the xmitqueue for all requests with the session lock so we will not miss it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d6e24d1c8a197cc9c2a1568224474f4b7af50803 Author: Pete Wyckoff Date: Wed Nov 8 15:58:32 2006 -0600 [SCSI] iscsi: add newlines to debug messages Some messages from debug_scsi do not have trailing newlines, making console messages difficult to read. Fix that. Signed-off-by: Pete Wyckoff Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 534284a09b3f58cd92acd0652b7267ee142932ba Author: Pete Wyckoff Date: Wed Nov 8 15:58:31 2006 -0600 [SCSI] iscsi: always release crypto Unconditionally free crypto state, as it is always allocated during TCP connection creation. Without this, crypto structures leak and crc32c module refcounts grow as connections are created and destroyed. Signed-off-by: Pete Wyckoff Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f7b2e8c76b3423a1d2501b9399261e9c9a33e100 Author: Steve French Date: Thu Nov 9 21:25:37 2006 +0000 [CIFS] Fix minor problem with previous patch The patch NFS stress test generates flood of "close with pending write was missing an if Signed-off-by: Steve French commit 7e28db5d8ff63b1cabc221c5cb84a5f45752f1c2 Author: Hoang-Nam Nguyen Date: Tue Nov 7 00:56:39 2006 +0100 IB/ehca: Assure 4K alignment for firmware control blocks Assure 4K alignment for firmware control blocks in 64K page mode, because kzalloc()'s result address might not be 4K aligned if 64K pages are enabled. Thus, we introduce wrappers called ehca_{alloc,free}_fw_ctrlblock(), which use a slab cache for objects with 4K length and 4K alignment in order to alloc/free firmware control blocks in 64K page mode. In 4K page mode those wrappers just are defines of get_zeroed_page() and free_page(). Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 8cc05f79d2a4e33d5cb621f36a448d5157f46893 Author: Vitaly Wool Date: Tue Oct 17 11:16:22 2006 +0100 [ARM] 3857/2: pnx4008: add devices' registration This patch adds platform devices' registration for the devices which drivers either have been added to the mainline or on the way to. arch/arm/mach-pnx4008/core.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit 63ef731aa6a81e286de78dcc92241d123424ed39 Author: Timo Teras Date: Thu Nov 2 19:43:27 2006 +0100 MMC: Do not set unsupported bits in OCR response The card might go to inactive state (according to specification), if there are unsupported bits set in the OCR. Signed-off-by: Timo Teras Signed-off-by: Pierre Ossman commit 25a122fd0d28b48782b9524a85895573e7ccf304 Author: Timo Teras Date: Wed Oct 25 09:37:41 2006 +0300 MMC: Poll card status after rescanning cards Some broken cards seem to process CMD1 even in stand-by state. The result is that the card replies with ILLEGAL_COMMAND error for the next command sent after rescanning. Currently the next command is select card, which would return the error. But CMD7 does actually succeed and retries of the command will timeout. The workaround is to poll card status after CMD1 to clear the pending error. Signed-off-by: Timo Teras Signed-off-by: Pierre Ossman commit 7ca63cb470f23a197f187afe936d4bf806197d6e Author: Douglas Gilbert Date: Fri Oct 27 17:47:49 2006 -0400 [SCSI] sg: fix incorrect last scatg length For certain LLDs the sg driver can cause on oops when the transfer length is large and not a multiple of PAGE_SIZE. ChangeLog: - correct the length of the last scatter gather list element. - fix some printk()s that have the wrong function name. Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 4039c30ef5d9189ff8dc72aaf610d1c933877e20 Author: adam radford Date: Thu Oct 26 18:01:06 2006 -0700 [SCSI] 3ware 9000 add support for 9650SE Updates the 3ware 9000 driver: - Free irq handler in __twa_shutdown(). - Serialize reset code. - Add support for 9650SE controllers. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 42961ee8fc4b05f5ca4d96ab34abd5149afe3541 Author: malahal@us.ibm.com Date: Wed Oct 4 17:34:03 2006 -0700 [SCSI] aic94xx SCSI timeout fix: SMP retry fix. Updating DDB0 inside aic94xx driver itself caused SMP command timeout. I hit this SMP timeout problem twice but I am not able to reproduce it since then. Here is a fix that retries an SMP command. Signed-off-by: Malahal Naineni Signed-off-by: James Bottomley commit 3f048109d9c4f8bb028ccb0d256ab65eb44f5988 Author: malahal@us.ibm.com Date: Wed Oct 4 17:28:37 2006 -0700 [SCSI] aic94xx SCSI timeout fix The patch updates DDB0 in the aic94xx driver itself. It doesn't supply or use lldd_port_formed field. DDB0 is updated prior to posting notification to libsas layer. Signed-off-by: Malahal Naineni Signed-off-by: James Bottomley commit 621da0f8af228525e4b40390e36fbdc44a587cf1 Author: Paul Mackerras Date: Thu Nov 9 16:00:06 2006 +1100 [POWERPC] Make sure initrd and dtb sections get into zImage correctly The "wrapper" script was using the wrong names for the initrd and dtb (device-tree blob) sections. This fixes it, and also ensures the symbols for the start and end of the dtb get defined correctly. Signed-off-by: Paul Mackerras commit 088406bcf66d6c7fd8a5c04c00aa410ae9077403 Author: J. Bruce Fields Date: Wed Nov 8 17:44:59 2006 -0800 [PATCH] nfsd: fix spurious error return from nfsd_create in async case Commit 6264d69d7df654ca64f625e9409189a0e50734e9 modified the nfsd_create() error handling in such a way that nfsd_create will usually return nfserr_perm even when succesful, if the export has the async export option. This introduced a regression that could cause mkdir() to always return a permissions error, even though the directory in question was actually succesfully created. Signed-off-by: J. Bruce Fields Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51f65ebccf55121832c265838f93949f898b12ff Author: Bryan O'Sullivan Date: Wed Nov 8 17:44:58 2006 -0800 [PATCH] IB/ipath - program intconfig register using new HT irq hook Eric's changes to the htirq infrastructure require corresponding modifications to the ipath HT driver code so that interrupts are still delivered properly. Signed-off-by: Bryan O'Sullivan Cc: Eric W. Biederman Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43539c38cd8edb915d1f0e1f55dcb70638b4cc8e Author: Eric W. Biederman Date: Wed Nov 8 17:44:57 2006 -0800 [PATCH] htirq: allow buggy drivers of buggy hardware to write the registers This patch adds a variant of ht_create_irq __ht_create_irq that takes an aditional parameter update that is a function that is called whenever we want to write to a drivers htirq configuration registers. This is needed to support the ipath_iba6110 because it's registers in the proper location are not actually conected to the hardware that controlls interrupt delivery. [bos@serpentine.com: fixes] Signed-off-by: Eric W. Biederman Cc: Andi Kleen Cc: Cc: Roland Dreier Signed-off-by: Bryan O'Sullivan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec68307cc5a8dc499e48693843bb42f6b6028458 Author: Eric W. Biederman Date: Wed Nov 8 17:44:57 2006 -0800 [PATCH] htirq: refactor so we only have one function that writes to the chip This refactoring actually optimizes the code a little by caching the value that we think the device is programmed with instead of reading it back from the hardware. Which simplifies the code a little and should speed things up a bit. This patch introduces the concept of a ht_irq_msg and modifies the architecture read/write routines to update this code. There is a minor consistency fix here as well as x86_64 forgot to initialize the htirq as masked. Signed-off-by: Eric W. Biederman Cc: Andi Kleen Acked-by: Bryan O'Sullivan Cc: Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64d9fe6973a9348e5211f3cc9f04b899329caeb4 Author: Alexey Dobriyan Date: Wed Nov 8 17:44:56 2006 -0800 [PATCH] ipmi_si_intf.c: fix "&& 0xff" typos Signed-off-by: Alexey Dobriyan Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46d52b09fa6a2d1e313cb75ca352d6f466e67bd1 Author: Corey Minyard Date: Wed Nov 8 17:44:55 2006 -0800 [PATCH] IPMI: retry messages on certain error returns Some more errors from the IPMI send message command are retryable, but are not being retried by the IPMI code. Make sure they get retried. Signed-off-by: Corey Minyard Cc: Frederic Lelievre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3ce6a0ead8c557e9acdc733addd23cbc206c7e3 Author: Corey Minyard Date: Wed Nov 8 17:44:52 2006 -0800 [PATCH] IPMI: Clean up the waiting message queue properly on unload A wrong function was being used to free a list; this fixes the problem. Otherwise, an oops at unload time was possible. But not likely, since you can't have any users when you unload the modules and it is very hard to get messages into this queue without users. Signed-off-by: Corey Minyard Cc: Patrick Schoeller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13bb7e37e5081d03643e2bd64f3f5d21f32e7221 Author: Eric W. Biederman Date: Wed Nov 8 17:44:51 2006 -0800 [PATCH] sysctl: Undeprecate sys_sysctl The basic issue is that despite have been deprecated and warned about as a very bad thing in the man pages since its inception there are a few real users of sys_sysctl. It was my assumption that because sysctl had been deprecated for all of 2.6 there would be no user space users by this point, so I initially gave sys_sysctl a very short deprecation period. Now that I know there are a few real users the only sane way to proceed with deprecation is to push the time limit out to a year or two work and work with distributions that have big testing pools like fedora core to find these last remaining users. Which means that the sys_sysctl interface needs to be maintained in the meantime. Since I have provided a technical measure that allows us to add new sysctl entries without reserving more binary numbers I believe that is enough to fix the sys_sysctl binary interface maintenance problems, because there is no longer a need to change the binary interface at all. Since the sys_sysctl implementation needs to stay around for a while and the worst of the maintenance issues that caused us to occasionally break the ABI have been addressed I don't see any advantage in continuing with the removal of sys_sysctl. So instead of merely increasing the deprecation period this patch removes the deprecation of sys_sysctl and modifies the kernel to compile the code in by default. With committing to maintain sys_sysctl we get all of the advantages of a fast interface for anything that needs it. Currently sys_sysctl is about 5x faster than /proc/sys, for the same string data. Signed-off-by: Eric W. Biederman Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c33eb39976b67628452ebc791834c7d590e545e Author: KAMEZAWA Hiroyuki Date: Wed Nov 8 17:44:50 2006 -0800 [PATCH] ia64: select ACPI_NUMA if ACPI When ACPI && NUMA, pxm_to_node is used and it exists in drivers/acpi/numa.c Tony said: The patch makes sense ... if you pick both of "ACPI" and "NUMA", then you need (and should automatically be given) ACPI_NUMA too. The only open question is whether there is a better way of getting there. Perhaps with less configuration options in the first place? We are heading towards a future where so many systems will be NUMA that there would seem to be little benefit in keeping ACPI_NUMA separate from ACPI ... but perhaps we aren't quite there yet. Signed-off-by: KAMEZAWA Hiroyuki Cc: Len Brown Acked-by: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bdc052eccdc7893d075d3f1f7103594a458c8c4 Author: Masami Hiramatsu Date: Wed Nov 8 17:44:49 2006 -0800 [PATCH] kretprobe: fix kretprobe-booster to save regs and set status There are two bugs in the kretprobe-booster. 1) It doesn't make room for gs registers. 2) It doesn't change status of the current kprobe. This status will effect the fault handling. This patch fixes these bugs and, additionally, saves skipped registers for compatibility with the original kretprobe. Signed-off-by: Masami Hiramatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b438a23fb05b6566393f9f0a3987ea3dcc1c0c4 Author: Rafael J. Wysocki Date: Wed Nov 8 17:44:48 2006 -0800 [PATCH] md: do not freeze md threads for suspend If there's a swap file on a software RAID, it should be possible to use this file for saving the swsusp's suspend image. Also, this file should be available to the memory management subsystem when memory is being freed before the suspend image is created. For the above reasons it seems that md_threads should not be frozen during the suspend and the appended patch makes this happen, but then there is the question if they don't cause any data to be written to disks after the suspend image has been created, provided that all filesystems are frozen at that time. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0692c6b1cf5537b190f90fb5903f1af89a41b0a8 Author: NeilBrown Date: Wed Nov 8 17:44:48 2006 -0800 [PATCH] md: fix sizing problem with raid5-reshape and CONFIG_LBD=n I forgot to has the size-in-blocks to (loff_t) before shifting up to a size-in-bytes. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4713036114dd13d1f4fe433b7f236250b65f5a Author: NeilBrown Date: Wed Nov 8 17:44:47 2006 -0800 [PATCH] md: change ONLINE/OFFLINE events to a single CHANGE event It turns out that CHANGE is preferred to ONLINE/OFFLINE for various reasons (not least of which being that udev understands it already). So remove the recently added KOBJ_OFFLINE (no-one is likely to care anyway) and change the ONLINE to a CHANGE event Cc: Kay Sievers Signed-off-by: Neil Brown Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5b9df697b166948f2770fb65d1b8809637a199b Author: Tigran Aivazian Date: Wed Nov 8 17:44:46 2006 -0800 [PATCH] Tigran has moved Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b196872cd65a06ad65853c4513e0d0f24452d32e Author: Adrian Bunk Date: Wed Nov 8 17:44:45 2006 -0800 [PATCH] drivers/telephony/ixj: fix an array overrun The Coverity checker noted that in drivers/telephony/ixj.c:ixj_build_filter_cadence(), filter_en[4] or filter_en[5] could be written to. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33184048dc4f9d5550d3b6a88c8e0ff92033eb6e Author: Jonathan E Brassow Date: Wed Nov 8 17:44:44 2006 -0800 [PATCH] dm: raid1: fix waiting for io on suspend All device-mapper targets must complete outstanding I/O before suspending. The mirror target generates I/O in its recovery phase and fails to wait for it. It needs to be tracked so we can ensure that it has completed before we suspend. [akpm@osdl.org: cleanup] Signed-off-by: Jonathan E Brassow Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d55fdf94998db1df9ee7f1def8806bfd0e5ff73 Author: Jonathan E Brassow Date: Wed Nov 8 17:44:43 2006 -0800 [PATCH] dm: multipath: fix rr_add_path order When adding paths to the round-robin path selector, their order gets inverted, which is not desirable. Fix by replacing list_add() with list_add_tail(). Signed-off-by: Jonathan E Brassow Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d287483d6d7a2d5b313aee155285f89b57d9cd4a Author: Alasdair G Kergon Date: Wed Nov 8 17:44:43 2006 -0800 [PATCH] dm: suspend: fix error path If the device is already suspended, just return the error and skip the code that would incorrectly wipe md->suspended_bdev. (This isn't currently a problem because existing code avoids calling this function if the device is already suspended.) Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfc5ecdf48b529f6a2bd98ba26bfac39ca8cd8a5 Author: Alasdair G Kergon Date: Wed Nov 8 17:44:42 2006 -0800 [PATCH] dm: fix find_device race There is a race between dev_create() and find_device(). If the mdptr has not yet been stored against a device, find_device() needs to behave as though no device was found. It already returns NULL, but there is a dm_put() missing: it must drop the reference dm_get_md() took. The bug was introduced by dm-fix-mapped-device-ref-counting.patch. It manifests itself if another dm ioctl attempts to reference a newly-created device while the device creation ioctl is still running. The consequence is that the device cannot be removed until the machine is rebooted. Certain udev configurations can lead to this happening. Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4 Author: Vivek Goyal Date: Wed Nov 8 17:44:41 2006 -0800 [PATCH] i386: Force data segment to be 4K aligned o Currently there is no specific alignment restriction in linker script and in some cases it can be placed non 4K aligned addresses. This fails kexec which checks that segment to be loaded is page aligned. o I guess, it does not harm data segment to be 4K aligned. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81ac95c5569d7a60ab5db6c1ccec56c12b3ebcb5 Author: J. Bruce Fields Date: Wed Nov 8 17:44:40 2006 -0800 [PATCH] nfsd4: fix open-create permissions In the case where an open creates the file, we shouldn't be rechecking permissions to open the file; the open succeeds regardless of what the new file's mode bits say. This patch fixes the problem, but only by introducing yet another parameter to nfsd_create_v3. This is ugly. This will be fixed by later patches. Signed-off-by: J. Bruce Fields Acked-by: Neil Brown Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af85852de0b32d92b14295aa6f5ba3a9ad044cf6 Author: J. Bruce Fields Date: Wed Nov 8 17:44:39 2006 -0800 [PATCH] nfsd4: reindent do_open_lookup() Minor rearrangement, cleanup of do_open_lookup(). No change in behavior. Signed-off-by: J. Bruce Fields Acked-by: Neil Brown Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75b2bd55bd7724c727856fbdf3ab71d2e4287ac8 Author: Oleg Nesterov Date: Wed Nov 8 17:44:38 2006 -0800 [PATCH] A minor fix for set_mb() in Documentation/memory-barriers.txt set_mb() is used by set_current_state() which needs mb(), not wmb(). I think it would be right to assume that set_mb() implies mb(), all arches seem to do just this. Signed-off-by: Oleg Nesterov Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d654c673d6394bc26e159b1057b357371b4ce1dc Author: Arjan van de Ven Date: Wed Nov 8 17:44:37 2006 -0800 [PATCH] Regression in 2.6.19-rc microcode driver If the microcode driver is built in (rather than module) there are some, ehm, interesting effects happening due to the new "call out to userspace" behavior that is introduced.. and which runs too early. The result is a boot hang; which is really nasty. The patch below is a minimally safe patch to fix this regression for 2.6.19 by just not requesting actual microcode updates during early boot. (That is a good idea in general anyway) The "real" fix is a lot more complex given the entire cpu hotplug scenario (during cpu hotplug you normally need to load the microcode as well); but the interactions for that are just really messy at this point; this fix at least makes it work and avoids a full detangle of hotplug. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e659c63998881e8f4a842edbe86ac8c5cdaee41 Author: Steve French Date: Wed Nov 8 23:10:46 2006 +0000 [CIFS] Fix mount failure when domain not specified Fixes Samba bugzilla #4176 When users do not specify their domain on mount, 2.6.18 started sending default domain instead of a null domain (which was the only way on some servers to use a default domain). Users of 2.6.18 who did not specify their domain name on mounts to certain common Windows servers that were members of a domain, but not the domain controller, would get mount failures which they did not get in 2.6.18 This fixes that issue and should remove complaints about mount behavior changing. Signed-off-by: Steve French commit 48797ebd9e8b16fddcd4ef062f792314a6b9219a Author: Linus Torvalds Date: Wed Nov 8 10:27:54 2006 -0800 x86-64: write IO APIC irq routing entries in correct order This is the x86-64 version of f9dadfa71bc594df09044da61d1c72701121d802 that did the same thing on i386. Since the "mask" bit is in the low word, when we write a new entry, we need to write the high word first, before we potentially unmask it. The exception is when we actually want to mask the interrupt, in which case we want to write the low word first to make sure that the high word doesn't change while the interrupt routing is still active. Signed-off-by: Linus Torvalds commit 6c0ffb9d2fd987c79c6cbb81c3f3011c63749b1a Author: Linus Torvalds Date: Wed Nov 8 10:23:03 2006 -0800 x86-64: clean up io-apic accesses This is just commit 130fe05dbc0114609cfef9815c0c5580b42decfa ported to x86-64, for all the same reasons. It cleans up the IO-APIC accesses in order to then fix the ordering issues. We move the accessor functions (that were only used by io_apic.c) out of a header file, and use proper memory-mapped accesses rather than making up our own "volatile" pointers. Signed-off-by: Linus Torvalds commit de8e7c12430a73654ae3cedbc45428d56c6b777b Author: Linus Torvalds Date: Wed Nov 8 10:09:28 2006 -0800 Revert "[PATCH] i386: Add MMCFG resources to i386 too" This reverts commit de09bddb9d6f96785be470c832b881e6d72d589f. It tried to reserve the MMCONFIG mmio memory ranges, but since the MMCONFIG information is broken and often bogus (which is why we don't dare use it most of the time _anyway_), it does more harm than good. Cc: Jeff Chua Cc: Adrian Bunk Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 68ff6e8e0e203580ecb118319b5a3b53962edf5a Author: Jeff Garzik Date: Wed Nov 8 07:46:02 2006 -0500 [libata] sata_via: fix obvious typo Spotted by Martin Devera. Signed-off-by: Jeff Garzik commit 80c218812786f619c9a1ce50d0e7c32c7afde4de Author: Linus Torvalds Date: Tue Nov 7 18:24:20 2006 -0800 Linux 2.6.19-rc5 Ok, things are clearly starting to calm down.. Finally. commit 3406118cd34762a7bf6b1a4f1095f9ea7576a354 Author: Adrian Bunk Date: Mon Nov 6 09:48:48 2006 -0600 [PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write() The Coverity checker noted that these "if (err)"'s couldn't ever be true. It seems the intention was to check the return values of the bcm43xx_pci_write_config32()'s? Signed-off-by: Adrian Bunk Signed-off-by: Larry Finger Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit ecac598bcd1f151ee4760489bded625c147fb366 Author: Michael Buesch Date: Mon Nov 6 09:45:31 2006 -0600 [PATCH] bcm43xx: Drain TX status before starting IRQs Drain the Microcode TX-status-FIFO before we enable IRQs. This is required, because the FIFO may still have entries left from a previous run. Those would immediately fire after enabling IRQs and would lead to an oops in the DMA TXstatus handling code. Signed-off-by: Michael Buesch Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 375d9d71838970030c8e0bf0ac2abcc1a3487df8 Author: Steven Whitehouse Date: Tue Nov 7 15:09:17 2006 -0800 [DECNET]: Endianess fixes (try #2) Here are some fixes to endianess problems spotted by Al Viro. Signed-off-by: Steven Whitehouse Signed-off-by: David S. Miller commit af2c6a4aaa2253f1e29df8fb59a3d92174d30a33 Author: Michael Chan Date: Tue Nov 7 14:57:51 2006 -0800 [TG3]: Fix array overrun in tg3_read_partno(). Use proper upper limits for the loops and check for all error conditions. The problem was noticed by Adrian Bunk. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 25f484a62e41be8020b9a31bf50a792baa58d2d4 Author: Herbert Xu Date: Tue Nov 7 14:57:15 2006 -0800 [NET]: Set truesize in pskb_copy Since pskb_copy tacks on the non-linear bits from the original skb, it needs to count them in the truesize field of the new skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8e365eec04c86899fab5db0f49a9c98554069bd0 Author: Chris Lalancette Date: Tue Nov 7 14:56:19 2006 -0800 [NETPOLL]: Compute checksum properly in netpoll_send_udp(). Signed-off-by: Chris Lalancette Signed-off-by: David S. Miller commit da33e3eb4876c43b78fdc7b7068653239f28714a Author: Stephen Hemminger Date: Tue Nov 7 14:54:46 2006 -0800 [PKT_SCHED] sch_htb: Use hlist_del_init(). Otherwise we can hit paths that (legally) do multiple deletes on the same node and OOPS with the HLIST poison values there instead of NULL. Signed-off-by: David S. Miller commit 9e950efa20dc8037c27509666cba6999da9368e8 Author: John Heffner Date: Mon Nov 6 23:10:51 2006 -0800 [TCP]: Don't use highmem in tcp hash size calculation. This patch removes consideration of high memory when determining TCP hash table sizes. Taking into account high memory results in tcp_mem values that are too large. Signed-off-by: John Heffner Signed-off-by: David S. Miller commit 3b6a792f6ace33584897d1af08630c9acc0ce221 Author: Jiri Slaby Date: Mon Nov 6 14:34:48 2006 -0800 [NET]: kconfig, correct traffic shaper As Patrick McHardy suggested, Traffic Shaper is now obsolete and alternative to it is no longer CBQ, since its problems with virtual devices, alter Kconfig text to reflect this -- put a link to the traffic schedulers as a whole. Signed-off-by: Jiri Slaby Acked-by: Patrick McHardy Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 16b7f4dcd340875625714438a812ea06400f9666 Author: Jan-Benedict Glaw Date: Tue Nov 7 23:50:37 2006 +0100 Update for the srm_env driver. This patch contains a fix for a bug introduced more than a year ago (not setting *eof) and updates whitespace a bit. Signed-off-by: Jan-Benedict Glaw commit 5e7098275094ec405f2b19285ec0c38aead42d53 Author: Ray Lehtiniemi Date: Tue Nov 7 03:19:15 2006 +0100 [ARM] 3927/1: Allow show_mem() to work with holes in memory map. show_mem() was not correctly handling holes in the memory map. It was treating the freed sections of the map as though they contained valid struct page entries. This could cause incorrect debugging output or even a kernel panic. This patch keeps the struct meminfo around after system initialization so that show_mem() can use it when scanning memory. show_mem() now walks over each bank of each online node, rather than assuming that each node contains a single contiguous bank. Signed-off-by: Ray Lehtiniemi Signed-off-by: Russell King commit 6d15cb42fe4f8c07c80c9d49db721fcfe2da0e90 Author: David Brownell Date: Mon Nov 6 19:29:16 2006 +0100 [ARM] 3926/1: make timer led handle HZ != 100 The timer LED is unusable at HZ=large, since it's got a hard-wired value of 100 ticks per cycle; when HZ=1024 (for example) it's essentially always-on. This patch just makes that be HZ ticks per cycle. Signed-off-by: David Brownell Signed-off-by: Russell King commit 5fe14c851efedf95b0e7652a3a7b93ec899d1599 Author: Steve French Date: Tue Nov 7 19:26:33 2006 +0000 [CIFS] Explicitly set stat->blksize CIFS may perform I/O over the network in larger chunks than the page size, so it should explicitly set stat->blksize to ensure optimal I/O bandwidth Signed-off-by: Dave Kleikamp Signed-off-by: Steve French commit 4891d53956abd4ad9d94127c50d931124319a324 Author: Steve French Date: Tue Nov 7 16:31:16 2006 +0000 [CIFS] NFS stress test generates flood of "close with pending write" messages Informational/debug message was being logged too often. The error case of logging having to send a close with (presumably stuck on buggy server) pending writes is still logged. Signed-off-by: Steve French commit edd106fc8ac1826dbe231b70ce0762db24133e5c Author: Auke Kok Date: Mon Nov 6 08:57:12 2006 -0800 [PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp e1000: Fix suspend/resume powerup and irq allocation From: Auke Kok After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled device showing garbled statistics and undetermined irq allocation state, where `ifconfig eth0 down` would display `trying to free already freed irq`. Explicitly free and allocate irq as well as powerup the PHY during resume fixes when needed. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit e78181feb0b94fb6afeaef3b28d4f5df1b847c98 Author: Johannes Berg Date: Mon Nov 6 23:17:20 2006 +0100 [PATCH] b44: change comment about irq mask register Through some experimentation with the similarly built bcm43xx I came to the conclusion that if the hw/firmware sets a bit in the interrupt register, an interrupt will only be raised if that bit is included in the interrupt mask. Hence, the interrupt mask is more like an interrupt control mask. This patch changes the comment to reflect that. Signed-off-by: Johannes Berg Signed-off-by: Jeff Garzik commit 73f4388aedade209650ed629ab767d3e2b636f7b Author: Ralf Baechle Date: Mon Nov 6 18:17:35 2006 +0000 [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). Signed-off-by: Ralf Baechle commit 4e5852f31a22094a19bbc305e42651b6c92f3008 Author: Ralf Baechle Date: Mon Nov 6 18:05:08 2006 +0000 [MIPS] EV64120: Fix PCI interrupt allocation. Signed-off-by: Ralf Baechle commit 4a4cf77923eeb3cec40a302656d6ab5ced04ba48 Author: Ralf Baechle Date: Mon Nov 6 17:41:06 2006 +0000 [MIPS] Make irq number allocator generally available for fixing EV64120. Signed-off-by: Ralf Baechle commit 325d08d1a44b601fbf70c259fb61c38d2af7d309 Author: Ralf Baechle Date: Mon Nov 6 13:32:39 2006 +0000 [MIPS] EV64120: Fix timer initialization for HZ != 100. Signed-off-by: Ralf Baechle commit ff28cbd2804105b144a7054e0302615e1da6749f Author: Ralf Baechle Date: Sun Nov 5 01:18:43 2006 +0000 [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle commit 907c51b2d1705b022c3fb65b66cb4e5e09346433 Author: Ralf Baechle Date: Sun Nov 5 01:18:11 2006 +0000 [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle commit d6b861c6402307e30c7df24dcda911df64a5f9d6 Author: Ralf Baechle Date: Sat Nov 4 23:26:27 2006 +0000 [MIPS] SB1: On bootup only flush cache on local CPU. This fixes a warning on bootup warning in smp_call_function. Signed-off-by: Ralf Baechle commit d19f7befe929d400df89699eb51b8d7f4ef1b2d8 Author: Ralf Baechle Date: Sat Nov 4 13:02:46 2006 +0000 [MIPS] Ocelot 3: Fix large number of warnings. Signed-off-by: Ralf Baechle commit ad0b365573718a4a83266f98c9a49305c8eaf0b8 Author: Ralf Baechle Date: Fri Nov 3 18:06:33 2006 +0000 [MIPS] Ocelot C: Fix mapping of ioport address range. o Fix warnings o 768MB worth of I/O ports were insane o 64-bit kernels don't need special handling because ioremap does the magic Signed-off-by: Ralf Baechle commit 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 Author: Ralf Baechle Date: Fri Nov 3 17:48:17 2006 +0000 [MIPS] Ocelot C: Fix warning about missmatching format string. CC arch/mips/momentum/ocelot_c/setup.o arch/mips/momentum/ocelot_c/setup.c: In function 'momenco_time_init': arch/mips/momentum/ocelot_c/setup.c:223: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int' Change data type to match format string; a 32-bit type better suits our needs. Signed-off-by: Ralf Baechle commit 9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 Author: Ralf Baechle Date: Fri Nov 3 17:45:25 2006 +0000 [MIPS] Ocelot C: fix eth registration after conversion to platform_device Signed-off-by: Ralf Baechle commit cca72333e71e348995859b88628c1abcb58b759e Author: Ralf Baechle Date: Fri Nov 3 17:42:47 2006 +0000 [MIPS] Ocelot C: Fix large number of warnings. Signed-off-by: Ralf Baechle commit e2de7f565521a76fbbb927f701c5a1d381c71a93 Author: Patrick Caulfield Date: Mon Nov 6 08:53:28 2006 +0000 [DLM] fix oops in kref_put when removing a lockspace Now that the lockspace struct is freed when the last sysfs object is released this patch prevents use of that lockspace by sysfs. We attempt to re-get the lockspace from the lockspace list and fail the request if it has been removed. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit ba542e3b92f9ea7c482ae56b68b9122eebc53a39 Author: Patrick Caulfield Date: Thu Nov 2 14:41:23 2006 +0000 [DLM] Fix kref_put oops This patch fixes the recounting on the lockspace kobject. Previously the lockspace was freed while userspace could have had a reference to one of its sysfs files, causing an oops in kref_put. Now the lockspace kfree is moved into the kobject release() function Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 26d83dedf61d26d85f10bc34b92f4de7660fd746 Author: Steven Whitehouse Date: Mon Oct 30 16:59:08 2006 -0500 [GFS2] Fix OOM error handling Fix the OOM error handling in inode.c where it was possible for a NULL pointer to be dereferenced. Signed-off-by: Steven Whitehouse commit 4a221953ed121692aa25998451a57c7f4be8b4f6 Author: Steven Whitehouse Date: Wed Nov 1 09:57:57 2006 -0500 [GFS2] Fix incorrect fs sync behaviour. This adds a sync_fs superblock operation for GFS2 and removes the journal flush from write_super in favour of sync_fs where it ought to be. This is more or less identical to the way in which ext3 does this. This bug was pointed out by Russell Cattelan Cc: Russell Cattelan Signed-off-by: Steven Whitehouse commit eb1dc33aa235b0e44ada6716cda385883c6e6bff Author: Alexey Dobriyan Date: Sat Oct 28 03:03:48 2006 +0400 [GFS2] don't panic needlessly First, SLAB_PANIC is unjustified. Second, all error propagating and backing out is in place. Signed-off-by: Alexey Dobriyan Signed-off-by: Steven Whitehouse commit 6af0f5f83169ef215b4579834ddfb2691e8a7bff Author: Haavard Skinnemoen Date: Mon Nov 6 14:06:45 2006 +0100 AVR32: Add missing return instruction in __raw_writesb __raw_writesb ends with a conditional branch, which is obviously wrong. It should return after the last loop terminates. Signed-off-by: Haavard Skinnemoen commit bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55 Author: Haavard Skinnemoen Date: Mon Nov 6 14:02:44 2006 +0100 AVR32: Wire up sys_epoll_pwait Signed-off-by: Haavard Skinnemoen commit c4972f33169e3e1ce06ad00917ddaf2c3b49b36a Author: Heiko Carstens Date: Mon Nov 6 10:49:02 2006 +0100 [S390] IRQs too early enabled. setup_lowcore() calls ctl_set_bit() which returns withs interrupts enabled. The setup arch code is not supposed to enable interrupts that early. Therefore use the __ctl_set_bit() variant. This fixes the not working lock dependency validator on non 64 bit systems. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit bcc8bcb1f0cc51c0042497d5de2d79743050e3bb Author: Heiko Carstens Date: Mon Nov 6 10:49:00 2006 +0100 [S390] revert add_active_range() usage patch. Commit 7676bef9c183fd573822cac9992927ef596d584c breaks DCSS support on s390. DCSS needs initialized struct pages to work. With the usage of add_active_range() only the struct pages for physically present pages are initialized. This could be fixed if the DCSS driver would initiliaze the struct pages itself, but this doesn't work too. This is because the mem_map array does not include holes after the last present memory area and therefore there is nothing that could be initialized. To fix this and to avoid some dirty hacks revert this patch for now. Will be added later when we move to a virtual mem_map. Cc: Carsten Otte Cc: Adrian Bunk Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 0c7bb31db0e35d4b772fac452b722460ca368acf Author: Akinobu Mita Date: Sun Nov 5 23:52:13 2006 -0800 [PATCH] sunrpc: add missing spin_unlock auth_domain_put() forgot to unlock acquired spinlock. Cc: Olaf Kirch Cc: Andy Adamson Cc: J. Bruce Fields Acked-by: Trond Myklebust Signed-off-by: Akinobu Mita Cc: Neil Brown Acked-by: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cc13edc139108bb527b692f0548dce6bc648572 Author: Eric W. Biederman Date: Sun Nov 5 23:52:13 2006 -0800 [PATCH] sysctl: implement CTL_UNNUMBERED This patch takes the CTL_UNNUMBERD concept from NFS and makes it available to all new sysctl users. At the same time the sysctl binary interface maintenance documentation is updated to mention and to describe what is needed to successfully maintain the sysctl binary interface. Signed-off-by: Eric W. Biederman Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d99f160ac53e51090f015a8f0617cea25f81a191 Author: Eric W. Biederman Date: Sun Nov 5 23:52:12 2006 -0800 [PATCH] sysctl: allow a zero ctl_name in the middle of a sysctl table Since it is becoming clear that there are just enough users of the binary sysctl interface that completely removing the binary interface from the kernel will not be an option for foreseeable future, we need to find a way to address the sysctl maintenance issues. The basic problem is that sysctl requires one central authority to allocate sysctl numbers, or else conflicts and ABI breakage occur. The proc interface to sysctl does not have that problem, as names are not densely allocated. By not terminating a sysctl table until I have neither a ctl_name nor a procname, it becomes simple to add sysctl entries that don't show up in the binary sysctl interface. Which allows people to avoid allocating a binary sysctl value when not needed. I have audited the kernel code and in my reading I have not found a single sysctl table that wasn't terminated by a completely zero filled entry. So this change in behavior should not affect anything. I think this mechanism eases the pain enough that combined with a little disciple we can solve the reoccurring sysctl ABI breakage. Signed-off-by: Eric W. Biederman Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e009be8a0c2309f3696df70f72ef0075aa34c9c Author: Eric W. Biederman Date: Sun Nov 5 23:52:11 2006 -0800 [PATCH] Improve the removed sysctl warnings Don't warn about libpthread's access to kernel.version. When it receives -ENOSYS it will read /proc/sys/kernel/version. If anything else shows up print the sysctl number string. Signed-off-by: Eric W. Biederman Cc: Cal Peake Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64efade11cddc4237c1b95ea4ca18af122a7e19e Author: Peter Zijlstra Date: Sun Nov 5 23:52:10 2006 -0800 [PATCH] lockdep: fix delayacct locking bug Make the delayacct lock irqsave; this avoids the possible deadlock where an interrupt is taken while holding the delayacct lock which needs to take the delayacct lock. Signed-off-by: Peter Zijlstra Acked-by: Oleg Nesterov Cc: Balbir Singh Cc: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5b9a335fd2180c6db1bcc4b24e83aff7481ebe3 Author: Tilman Schmidt Date: Sun Nov 5 23:52:08 2006 -0800 [PATCH] isdn/gigaset: convert warning message Make the failed-to-allocate-skb warning a non-debug message. Signed-off-by: Tilman Schmidt Cc: Hansjoerg Lipp Cc: Karsten Keil Cc: Kai Germaschewski Cc: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18a61e4adbc4dbe209e0d154df5cd37ce17dc314 Author: Ankita Garg Date: Sun Nov 5 23:52:07 2006 -0800 [PATCH] Fix for LKDTM MEM_SWAPOUT crashpoint The MEM_SWAPOUT crashpoint in LKDTM could be broken as some compilers inline the call to shrink_page_list() and symbol lookup for this function name fails. Replacing it with the function shrink_inactive_list(), which is the only function calling shrink_page_list(). Signed-off-by: Ankita Garg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b96b1a10cb00c867103b21f0f2a6c91b705db11 Author: Gautham R Shenoy Date: Sun Nov 5 23:52:04 2006 -0800 [PATCH] Fix the spurious unlock_cpu_hotplug false warnings Cpu-hotplug locking has a minor race case caused because of setting the variable "recursive" to NULL *after* releasing the cpu_bitmask_lock in the function unlock_cpu_hotplug,instead of doing so before releasing the cpu_bitmask_lock. This was the cause of most of the recent false spurious lock_cpu_unlock warnings. This should fix the problem reported by Martin Lorenz reported in http://lkml.org/lkml/2006/10/29/127. Thanks to Srinivasa DS for pointing it out. Signed-off-by: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 168c8fa32ff40d6caf7226a5abf2a0096f3393bf Author: Haavard Skinnemoen Date: Tue Oct 31 20:01:11 2006 +0100 AVR32: Fix thinko in generic_find_next_zero_le_bit() The existing implementation of this function seems to be looking for a one although it should be looking for a zero. This causes trouble for the ext2 filesystem, which tends to report -ENOSPC without this patch. Fix this by complementing each word before scanning. Signed-off-by: Haavard Skinnemoen commit e9a43850e6a99e335c8120579749389b376bc204 Author: Haavard Skinnemoen Date: Mon Oct 30 09:31:27 2006 +0100 AVR32: Get rid of board_early_init board_early_init() is left over from some early prototyping work where we had to initialize the SDRAM controller ourselves. This depends on the kernel being loaded into static RAM, which just isn't possible on any commercially available products today. In order to run without a boot loader, we need to create a zImage stub or have the debugger initialize the SDRAM for us (for really low-level debugging) Signed-off-by: Haavard Skinnemoen commit a81c52a81d6dbe6a36bce18112da04f20b175192 Author: Randy Dunlap Date: Wed Nov 1 21:18:58 2006 -0800 [PATCH] Kconfig: remove redundant NETDEVICES depends drivers/net/Kconfig says: # All the following symbols are dependent on NETDEVICES - do not repeat # that for each of the symbols. so remove duplicate 'depends' uses of NETDEVICES. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit a1d261c561522151cb96c75f1dd1a51cf17665cf Author: Thomas Klein Date: Fri Nov 3 17:48:23 2006 +0100 [PATCH] ehea: 64K page support fix This patch fixes 64k page support by using PAGE_MASK and appropriate pagesize defines in several places. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 07fd06b3bc1589e44aefd02eb28700a51b3c9d12 Author: Thomas Klein Date: Fri Nov 3 17:47:52 2006 +0100 [PATCH] ehea: Removed redundant define Removed define H_CB_ALIGNMENT which is already defined in include/asm-powerpc/hvcall.h Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 1b5135d9b922fdcf46e1e7383167d93d42635fb4 Author: Thomas Klein Date: Fri Nov 3 17:47:20 2006 +0100 [PATCH] ehea: Nullpointer dereferencation fix Fix: Must check for nullpointer before dereferencing it - not afterwards. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 59359ff87700f5e742c96a55da9cf0819984c128 Author: David S. Miller Date: Sun Nov 5 16:51:03 2006 -0800 [SPARC]: Fix robust futex syscalls and wire up migrate_pages. When I added the entries for the robust futex syscall entries, I forgot to bump NR_SYSCALLS. The current situation is error-prone because NR_SYSCALLS lives in entry.S where the system call limit checks are enforced. Move the definition to asm/unistd.h in order to make this mistake much more difficult to make. And wire up sys_migrate_pages since the powerpc folks implemented the compat wrapper for us. Signed-off-by: David S. Miller commit 38c94377a36f70e86665231c9f477e445c806618 Author: Paul Moore Date: Sun Nov 5 16:44:06 2006 -0800 [NETLABEL]: Fix build failure. > the build with the attached .config failed, make ends with: > ... > : undefined reference to `cipso_v4_sock_getattr' > net/built-in.o: In function `netlbl_socket_getattr': ... It looks like I was stupid and made NetLabel depend on CONFIG_NET and not CONFIG_INET, the patch below should fix this by making NetLabel depend on CONFIG_INET and CONFIG_SECURITY. Please review and apply for 2.6.19. Signed-off-by: Paul Moore Signed-off-by: David S. Miller commit daccff024ffeb21caa2cc479ccc33b2ec50705b1 Author: Patrick McHardy Date: Sun Nov 5 15:47:04 2006 -0800 [IPV6]: Give sit driver an appropriate module alias. It would be nice to keep things working even with this built as a module, it took me some time to realize my IPv6 tunnel was broken because of the missing sit module. This module alias fixes things until distributions have added an appropriate alias to modprobe.conf. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c Author: Dmitry Mishin Date: Fri Nov 3 16:08:19 2006 -0800 [IPV6]: Add ndisc_netdev_notifier unregister. If inet6_init() fails later than ndisc_init() call, or IPv6 module is unloaded, ndisc_netdev_notifier call remains in the list and will follows in oops later. Signed-off-by: Dmitry Mishin Signed-off-by: David S. Miller commit db38c179a759a9c4722525e8c9f09ac80e372377 Author: Larry Woodman Date: Fri Nov 3 16:05:45 2006 -0800 [NET]: __alloc_pages() failures reported due to fragmentation We have seen a couple of __alloc_pages() failures due to fragmentation, there is plenty of free memory but no large order pages available. I think the problem is in sock_alloc_send_pskb(), the gfp_mask includes __GFP_REPEAT but its never used/passed to the page allocator. Shouldnt the gfp_mask be passed to alloc_skb() ? Signed-off-by: Larry Woodman Signed-off-by: David S. Miller commit 0f37c6057414fb68024793966b1dcb6a135cb844 Author: Al Viro Date: Fri Nov 3 03:49:56 2006 -0800 [PKTGEN]: TCI endianness fixes open-coded variant there works only for little-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 36da4d869f23bc7d1a70a3185218cb626537845c Author: Michael Chan Date: Fri Nov 3 01:01:03 2006 -0800 [TG3]: Fix 2nd ifup failure on 5752M. This fixes a bug reported in: http://bugzilla.kernel.org/show_bug.cgi?id=7438 tg3_close() turns off the PHY if WoL and ASF are both disabled. On the next tg3_open(), some devices such as the 5752M will not be brought up correctly without a PHY reset early in the reset sequence. The PHY clock is needed for some internal MAC blocks to function correctly. This problem is fixed by always resetting the PHY early in tg3_reset_hw() when it is called from tg3_open() or tg3_resume(). tg3_setup_phy() can then be called later in the sequence without the reset_phy parameter set to 1, since the PHY reset is already done. Update version to 3.68. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit febf0a431e42f5a1fdb2b763273700610552ddcc Author: Al Viro Date: Fri Nov 3 00:59:17 2006 -0800 [NETFILTER] bug: skb->protocol is already net-endian htons() is not needed (and no, it's not misspelled ntohs() - userland expects net-endian here). Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d1208b999dd367b72168cc3c7f8d8d2c95143c67 Author: Al Viro Date: Fri Nov 3 00:58:41 2006 -0800 [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 7ac00a24f379f8ab9d3c968fea3dc030a45956fd Author: Al Viro Date: Fri Nov 3 00:58:17 2006 -0800 [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 95026cd242bd4188a036f2eba20994113ed5a5d7 Author: Al Viro Date: Fri Nov 3 00:55:35 2006 -0800 [IPV6]: Fix ECN bug on big-endian __constant_htons(2<<4) is not a replacement for htonl(2<<20). Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 02e60370d4dac83f22d5ae75d5512bcb9a3f24b7 Author: Al Viro Date: Fri Nov 3 00:28:23 2006 -0800 [IPX]: Annotate and fix IPX checksum Calculation of IPX checksum got buggered about 2.4.0. The old variant mangled the packet; that got fixed, but calculation itself got buggered. Restored the correct logics, fixed a subtle breakage we used to have even back then: if the sum is 0 mod 0xffff, we want to return 0, not 0xffff. The latter has special meaning for IPX (cheksum disabled). Observation (and obvious fix) nicked from history of FreeBSD ipx_cksum.c... Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4833ed094097323f5f219820f6ebdc8dd66f501f Author: Al Viro Date: Fri Nov 3 00:27:06 2006 -0800 [IPX]: Trivial parts of endianness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f Author: Linus Torvalds Date: Sat Nov 4 13:03:00 2006 -0800 Make sure "user->sigpending" count is in sync The previous commit (45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08, aka "Fix unlikely (but possible) race condition on task->user access") fixed a potential oops due to __sigqueue_alloc() getting its "user" pointer out of sync with switch_user(), and accessing a user pointer that had been de-allocated on another CPU. It still left another (much less serious) problem, where a concurrent __sigqueue_alloc and swich_user could cause sigqueue_alloc to do signal pending reference counting for a _different_ user than the one it then actually ended up using. No oops, but we'd end up with the wrong signal accounting. Another case of Oleg's eagle-eyes picking up the problem. This is trivially fixed by just making sure we load whichever "user" structure we decide to use (it doesn't matter _which_ one we pick, we just need to pick one) just once. Acked-by: Oleg Nesterov Cc: Andrew Morton Cc: Ingo Molnar Signed-off-by: Linus Torvalds commit 45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08 Author: Linus Torvalds Date: Sat Nov 4 10:06:02 2006 -0800 Fix unlikely (but possible) race condition on task->user access There's a possible race condition when doing a "switch_uid()" from one user to another, which could race with another thread doing a signal allocation and looking at the old thread ->user pointer as it is freed. This explains an oops reported by Lukasz Trabinski: http://permalink.gmane.org/gmane.linux.kernel/462241 We fix this by delaying the (reference-counted) freeing of the user structure until the thread signal handler lock has been released, so that we know that the signal allocation has either seen the new value or has properly incremented the reference count of the old one. Race identified by Oleg Nesterov. Cc: Lukasz Trabinski Cc: Oleg Nesterov Cc: Andrew Morton Cc: Ingo Molnar Signed-off-by: Linus Torvalds commit 80491eb90c750fcd7d13830062f27ae9b7cc5f75 Author: Linus Torvalds Date: Sat Nov 4 09:55:00 2006 -0800 Revert unintentional "volatile" changes in ipc/msg.c Commit 5a06a363ef48444186f18095ae1b932dddbbfa89 ("[PATCH] ipc/msg.c: clean up coding style") breaks fakeroot on Alpha (variously hangs or oopses), according to a report by Falk Hueffner. The fact that the code seems to rely on compiler access ordering through the use of "volatile" is a pretty certain sign that the code has locking problems, and we should fix those properly and then remove the whole "volatile" entirely. But in the meantime, the movement of "volatile" was unintentional, and should be reverted. Cc: Falk Hueffner Cc: Andrew Morton Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ddac0d39cf437d02fde9795ae57d9c4b4c146de9 Author: Jens Axboe Date: Sat Nov 4 12:49:32 2006 +0100 [PATCH] splice: fix problem introduced with inode diet After the inode slimming patch that unionised i_pipe/i_bdev/i_cdev, it's no longer enough to check for existance of ->i_pipe to verify that this is a pipe. Original patch from Eric Dumazet Final solution suggested by Linus. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit f1f2d8713d16a1e198880bbc716eb24fae09c858 Author: Andreas Gruenbacher Date: Thu Nov 2 22:07:29 2006 -0800 [PATCH] Fix user.* xattr permission check for sticky dirs The user.* extended attributes are only allowed on regular files and directories. Sticky directories further restrict write access to the owner and privileged users. (See the attr(5) man page for an explanation.) The original check in ext2/ext3 when user.* xattrs were merged was more restrictive than intended, and when the xattr permission checks were moved into the VFS, read access to user.* attributes on sticky directores ended up being denied in addition. Originally-from: Gerard Neil Signed-off-by: Andreas Gruenbacher Cc: Dave Kleikamp Cc: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ce08464d2c749610a52c4d6c7c11080a7eaaef1 Author: Stephen Rothwell Date: Thu Nov 2 22:07:28 2006 -0800 [PATCH] Fix sys_move_pages when a NULL node list is passed sys_move_pages() uses vmalloc() to allocate an array of structures that is fills with information passed from user mode and then passes to do_stat_pages() (in the case the node list is NULL). do_stat_pages() depends on a marker in the node field of the structure to decide how large the array is and this marker is correctly inserted into the last element of the array. However, vmalloc() doesn't zero the memory it allocates and if the user passes NULL for the node list, then the node fields are not filled in (except for the end marker). If the memory the vmalloc() returned happend to have a word with the marker value in it in just the right place, do_pages_stat will fail to fill the status field of part of the array and we will return (random) kernel data to user mode. Signed-off-by: Stephen Rothwell Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda5e61a8e0b11826780b8e5a4155683f0557c8b Author: Peer Chen Date: Thu Nov 2 22:07:27 2006 -0800 [PATCH] IDE: Add the support of nvidia PATA controllers of MCP67 to amd74xx.c Add support for PATA controllers of MCP67 to amd74xx.c. Signed-off-by: Peer Chen Cc: Jeff Garzik Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8804023061b3447fbaddbd286d78170ad88d1a43 Author: Oleg Nesterov Date: Thu Nov 2 22:07:26 2006 -0800 [PATCH] fix Documentation/accounting/getdelays.c buf size getdelays reports a "fatal reply error, errno 258". We don't have enough room for multi-threaded exit (PID + TGID). Signed-off-by: Oleg Nesterov Cc: Balbir Singh Cc: Shailabh Nagar Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f604c4bc078213aa1c4576efa0e8dad98522fa7 Author: Amol Lad Date: Thu Nov 2 22:07:25 2006 -0800 [PATCH] drivers/isdn/hysdn/hysdn_sched.c: sleep after taking spinlock fix spin_lock_irq{save,restore} is incorrectly called here (the function can sleep after acquring the lock). done the necessary corrections and removed unwanted cli/sti. Signed-off-by: Amol Lad Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43530d2b04b63ac4bb4ac25deee5f1180ccedc2e Author: Stephen Rothwell Date: Thu Nov 2 22:07:24 2006 -0800 [PATCH] powerpc: wire up sys_migrate_pages Signed-off-by: Stephen Rothwell Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fd593979802f81ff6452596ac61e3840f917589 Author: Stephen Rothwell Date: Thu Nov 2 22:07:24 2006 -0800 [PATCH] Create compat_sys_migrate_pages This is needed on bigendian 64bit architectures. Signed-off-by: Stephen Rothwell Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f6f61649d8c64d7a3a4d143405df9a7bdd4af10 Author: Jeff Dike Date: Thu Nov 2 22:07:23 2006 -0800 [PATCH] uml: include tidying In order to get the __NR_* constants, we need sys/syscall.h. linux/unistd.h works as well since it includes syscall.h, however syscall.h is more parsimonious. We were inconsistent in this, and this patch adds syscall.h includes where necessary and removes linux/unistd.h includes where they are not needed. asm/unistd.h also includes the __NR_* constants, but these are not the glibc-sanctioned ones, so this also removes one such inclusion. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53b173327d283b9bdbfb0c3b6de6f0eb197819d6 Author: Jeff Dike Date: Thu Nov 2 22:07:22 2006 -0800 [PATCH] uml: fix I/O hang Fix a UML hang in which everything would just stop until some I/O happened - a ping, someone whacking the keyboard - at which point everything would start up again as though nothing had happened. The cause was gcc reordering some code which absolutely needed to be executed in the order in the source. When unblock_signals switches signals from off to on, it needs to see if any interrupts had happened in the critical section. The interrupt handlers check signals_enabled - if it is zero, then the handler adds a bit to the "pending" bitmask and returns. unblock_signals checks this mask to see if any signals need to be delivered. The crucial part is this: signals_enabled = 1; save_pending = pending; if(save_pending == 0) return; pending = 0; In order to avoid an interrupt arriving between reading pending and setting it to zero, in which case, the record of the interrupt would be erased, signals are enabled. What happened was that gcc reordered this so that 'save_pending = pending' came before 'signals_enabled = 1', creating a one-instruction window within which an interrupt could arrive, set its bit in pending, and have it be immediately erased. When the I/O workload is purely disk-based, the loss of a block device interrupt stops the entire I/O system because the next block request will wait for the current one to finish. Thus the system hangs until something else causes some I/O to arrive, such as a network packet or console input. The fix to this particular problem is a memory barrier between enabling signals and reading the pending signal mask. An xchg would also probably work. Looking over this code for similar problems led me to do a few more things: - make signals_enabled and pending volatile so that they don't get cached in registers - add an mb() to the return paths of block_signals and unblock_signals so that the modification of signals_enabled doesn't get shuffled into the caller in the event that these are inlined in the future. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2c89a4284ea4ecfba77c6f2d7d6f96d52e801e5 Author: Jeff Mahoney Date: Thu Nov 2 22:07:20 2006 -0800 [PATCH] reiserfs: reset errval after initializing bitmap cache Callers after reiserfs_init_bitmap_cache() expect errval to contain -EINVAL until much later. If a condition fails before errval is reset later, reiserfs_fill_super() will mistakenly return 0, causing an Oops in do_add_mount(). This patch resets errval to -EINVAL after the call. I view this as a temporary fix and real error codes should be used throughout reiserfs_fill_super(). Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3e5a938e7ed718f6d191e8b6b176fcfeb88a294 Author: Andrew Morton Date: Thu Nov 2 22:07:20 2006 -0800 [PATCH] spi section fix WARNING: vmlinux - Section mismatch: reference to .init.text:spi_register_board_info from __ksymtab_gpl between '__ksymtab_spi_register_board_info' (at offset 0xc032f7d0) and '__ksymtab_spi_alloc_master' Fix this by removing the export. Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b918f6e62cd46774f9fc0a3fbba6bd10ad85ee14 Author: Rafael J. Wysocki Date: Thu Nov 2 22:07:19 2006 -0800 [PATCH] swsusp: debugging Add a swsusp debugging mode. This does everything that's needed for a suspend except for actually suspending. So we can look in the log messages and work out a) what code is being slow and b) which drivers are misbehaving. (1) # echo testproc > /sys/power/disk # echo disk > /sys/power/state This should turn off the non-boot CPU, freeze all processes, wait for 5 seconds and then thaw the processes and the CPU. (2) # echo test > /sys/power/disk # echo disk > /sys/power/state This should turn off the non-boot CPU, freeze all processes, shrink memory, suspend all devices, wait for 5 seconds, resume the devices etc. Cc: Pavel Machek Cc: Stefan Seyfried Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90d53909443b3986569b38ef145f09ea2359af75 Author: Andrew Morton Date: Thu Nov 2 22:07:18 2006 -0800 [PATCH] acpi_noirq section fix WARNING: vmlinux - Section mismatch: reference to .init.data:acpi_noirq from .text between 'pcibios_penalize_isa_irq' (at offset 0xc026ffa1) and 'pirq_serverworks_get' Acked-by: "Brown, Len" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c6b6ed3f597a583f58e3fc99256cc01ae8c394 Author: Andrew Morton Date: Thu Nov 2 22:07:17 2006 -0800 [PATCH] schedule removal of FUTEX_FD Apparently FUTEX_FD is unfixably racy and nothing uses it (or if it does, it shouldn't). Add a warning printk, give any remaining users six months to migrate off it. Cc: Ulrich Drepper Cc: Ingo Molnar Acked-by: Thomas Gleixner Cc: Rusty Russell Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f46c483357c2d87606bbefb511321e3efd4baae0 Author: Andrew Morton Date: Thu Nov 2 22:07:16 2006 -0800 [PATCH] Add printk_timed_ratelimit() printk_ratelimit() has global state which makes it not useful for callers which wish to perform ratelimiting at a particular frequency. Add a printk_timed_ratelimit() which utilises caller-provided state storage to permit more flexibility. This function can in fact be used for things other than printk ratelimiting and is perhaps poorly named. Cc: Ulrich Drepper Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f6b8876c7e66b0d15af134e2a5b87e55514eb6d Author: Daniel Yeisley Date: Thu Nov 2 22:07:14 2006 -0800 [PATCH] init_reap_node() initialization fix It looks like there is a bug in init_reap_node() in slab.c that can cause multiple oops's on certain ES7000 configurations. The variable reap_node is defined per cpu, but only initialized on a single CPU. This causes an oops in next_reap_node() when __get_cpu_var(reap_node) returns the wrong value. Fix is below. Signed-off-by: Dan Yeisley Cc: Andi Kleen Acked-by: Christoph Lameter Cc: Pekka Enberg Cc: Manfred Spraul Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d13adb604693374c5fce47cd1a2017bcf3178eae Author: Yvan Seth Date: Thu Nov 2 22:07:13 2006 -0800 [PATCH] ipmi_si_intf.c sets bad class_mask with PCI_DEVICE_CLASS Taken from http://bugzilla.kernel.org/show_bug.cgi?id=7439 It looks like device registration in drivers/char/ipmi/ipmi_si_intf.c was cleaned up and a small error was made when setting the class_mask. The fix is simple as the correct mask value is defined in the code but is not used. Acked-by: Corey Minyard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ef55b8a05c02db7c07d81827c69fe8f124e8654 Author: Srinivasa Ds Date: Thu Nov 2 22:07:12 2006 -0800 [PATCH] NFS4: fix for recursive locking problem When I was performing some operations on NFS, I got below error on server side. ============================================= [ INFO: possible recursive locking detected ] 2.6.19-prep #1 --------------------------------------------- nfsd4/3525 is trying to acquire lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x21/0x24 but task is already holding lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x21/0x24 other info that might help us debug this: 2 locks held by nfsd4/3525: #0: (client_mutex){--..}, at: [] mutex_lock+0x21/0x24 #1: (&inode->i_mutex){--..}, at: [] mutex_lock+0x21/0x24 stack backtrace: [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] __lock_acquire+0x778/0x99c [] lock_acquire+0x4b/0x6d [] __mutex_lock_slowpath+0xbc/0x20a [] mutex_lock+0x21/0x24 [] vfs_rmdir+0x76/0xf8 [] nfsd4_clear_clid_dir+0x2c/0x41 [nfsd] [] nfsd4_remove_clid_dir+0xb1/0xe8 [nfsd] [] laundromat_main+0x9b/0x1c3 [nfsd] [] run_workqueue+0x7a/0xbb [] worker_thread+0xd2/0x107 [] kthread+0xc3/0xf2 [] kernel_thread_helper+0x5/0xb =================================================================== Cause for this problem was,2 successive mutex_lock calls on 2 diffrent inodes ,as shown below static int nfsd4_clear_clid_dir(struct dentry *dir, struct dentry *dentry) { int status; /* For now this directory should already be empty, but we empty it of * any regular files anyway, just in case the directory was created by * a kernel from the future.... */ nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file); mutex_lock(&dir->d_inode->i_mutex); status = vfs_rmdir(dir->d_inode, dentry); ... int vfs_rmdir(struct inode *dir, struct dentry *dentry) { int error = may_delete(dir, dentry, 1); if (error) return error; if (!dir->i_op || !dir->i_op->rmdir) return -EPERM; DQUOT_INIT(dir); mutex_lock(&dentry->d_inode->i_mutex); ... So I have developed the patch to overcome this problem. Signed-off-by: Srinivasa DS Cc: Neil Brown Cc: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77d6e1397a004c9376fed855e4164ca2b1dba2ed Author: Akinobu Mita Date: Thu Nov 2 22:07:10 2006 -0800 [PATCH] edac_mc: fix error handling Call sysdev_class_unregister() on failure in edac_sysfs_memctrl_setup() and decrease identation level for clear logic. Acked-by: Doug Thompson Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7011774db8afca43be466f0f0428434a9edf053e Author: OGAWA Hirofumi Date: Thu Nov 2 22:07:10 2006 -0800 [PATCH] gfs2: ->readpages() fixes This just ignore the remaining pages, and remove unneeded unlock_pages(). Signed-off-by: OGAWA Hirofumi Cc: Steven French Cc: Miklos Szeredi Acked-by: Steven Whitehouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e Author: OGAWA Hirofumi Date: Thu Nov 2 22:07:09 2006 -0800 [PATCH] fuse: ->readpages() cleanup This just ignore the remaining pages. Signed-off-by: OGAWA Hirofumi Cc: Steven French Cc: Miklos Szeredi Cc: Steven Whitehouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05ac9d4b3d7eac9e8542c83341a0e22d09aecf8f Author: OGAWA Hirofumi Date: Thu Nov 2 22:07:08 2006 -0800 [PATCH] cifs: ->readpages() fixes This just ignore the remaining pages, and will fix a forgot put_pages_list(). Signed-off-by: OGAWA Hirofumi Cc: Steven French Cc: Miklos Szeredi Cc: Steven Whitehouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 029e332ea717810172e965ec50f942755ad0c58a Author: OGAWA Hirofumi Date: Thu Nov 2 22:07:06 2006 -0800 [PATCH] Cleanup read_pages() Current read_pages() assume ->readpages() frees the passed pages. This patch free the pages in ->read_pages(), if those were remaining in the pages_list. So, readpages() just can ignore the remaining pages in pages_list. Signed-off-by: OGAWA Hirofumi Cc: Steven French Cc: Miklos Szeredi Cc: Steven Whitehouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d861d920a86523bbeb56c19b9906c3fb1b58048 Author: Randy Dunlap Date: Thu Nov 2 22:07:06 2006 -0800 [PATCH] lkdtm: cleanup headers and module_param/MODULE_PARM_DESC Fix module_param/sysfs file permission typo. Clean up MODULE_PARM_DESC strings to avoid fancy (and incorrect) formatting. Fix header includes for lkdtm; add some needed ones, remove unused ones; and fix this gcc warning: drivers/misc/lkdtm.c:150: warning: 'struct buffer_head' declared inside parameter list drivers/misc/lkdtm.c:150: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Randy Dunlap Cc: Ankita Garg Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86f4f0f9ba6e35fbbc409dfc3d8615c1a9822482 Author: Eric Sandeen Date: Thu Nov 2 22:07:05 2006 -0800 [PATCH] fix UFS superblock alignment issues ufs2 fails to mount on x86_64, claiming bad magic. This is because ufs_super_block_third's fs_un1 member is padded out by 4 bytes for 8-byte alignment, pushing down the rest of the struct. Forcing this to be packed solves it. I took a quick look over other on-disk structures and didn't immediately find other problems. I was able to mount & ls a populated ufs2 filesystem w/ this change. Signed-off-by: Eric Sandeen Cc: Evgeniy Dushistov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 941c7105dc4f4961727acc518e18e00b9a03cbf3 Author: nkalmala Date: Thu Nov 2 22:07:04 2006 -0800 [PATCH] mm: un-needed add-store operation wastes a few bytes Un-needed add-store operation wastes a few bytes. 8 bytes wasted with -O2, on a ppc. Signed-off-by: nkalmala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 Author: Pavel Emelianov Date: Thu Nov 2 22:07:03 2006 -0800 [PATCH] Fix ipc entries removal Fix two issuses related to ipc_ids->entries freeing. 1. When freeing ipc namespace we need to free entries allocated with ipc_init_ids(). 2. When removing old entries in grow_ary() ipc_rcu_putref() may be called on entries set to &ids->nullentry earlier in ipc_init_ids(). This is almost impossible without namespaces, but with them this situation becomes possible. Found during OpenVZ testing after obvious leaks in beancounters. Signed-off-by: Pavel Emelianov Cc: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 733b72c31efb0d6b29577655939ccfe835381b52 Author: Randy Dunlap Date: Thu Nov 2 22:07:02 2006 -0800 [PATCH] docbook: merge journal-api into filesystems.tmpl Move journal-api into filesystems.tmpl as a Chapter. Applies on top of the previous docbook: make a filesystems book patch. Remove trailing whitespace from journal-api chapter. Align some of the tags. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6120938365df9976dc07c536e1c14190ead48e3 Author: Randy Dunlap Date: Thu Nov 2 22:07:01 2006 -0800 [PATCH] update some docbook comments Correct a few comments in kernel-doc Doc and source files. (akpm: note: the patch removes a non-ascii character and might have to be applied by hand..) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87c2b7c045a44f6c1c7af23e64f2b286e6f7130a Author: Heiko Carstens Date: Thu Nov 2 22:06:58 2006 -0800 [PATCH] sys_pselect7 vs compat_sys_pselect7 uaccess error handling 758333458aa719bfc26ec16eafd4ad3a9e96014d fixes the not checked copy_to_user return value of compat_sys_pselect7. I ran into this too because of an old source tree, but my fix would look quite a bit different to Andi's fix. The reason is that the compat function IMHO should behave the very same as the non-compat function if possible. Since sys_pselect7 does not return -EFAULT in this specific case, change the compat code so it behaves like sys_pselect7. Cc: David Woodhouse Cc: Andi Kleen Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7870db4c7fa1b03fec133c4f4e67fdaa04c5ac15 Author: NeilBrown Date: Thu Nov 2 22:06:57 2006 -0800 [PATCH] md: send online/offline uevents when an md array starts/stops This allows udev to do something intelligent when an array becomes available. Acked-by: Greg KH Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df66b8552be5fdab5c4b4d53ee08b99388b9bd02 Author: Andrew Morton Date: Thu Nov 2 22:06:56 2006 -0800 [PATCH] tidy "md: check bio address after mapping through partitions" Neil's xterms are too wide. Cc: Neil Brown Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bd473fcc217adec000f213e8864bf9a161d57e1 Author: Michael Halcrow Date: Thu Nov 2 22:06:56 2006 -0800 [PATCH] eCryptfs: Fix pointer deref I missed a pointer dereference in this kmalloc result check. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 Author: David Brownell Date: Thu Nov 2 12:29:12 2006 -0800 USB: use MII hooks only if CONFIG_MII is enabled Fix mcs7830 patch The recent mcs7830 update to make the MII support sharable goofed various pre-existing configurations in two ways: - it made the usbnet infrastructure reference MII symbols even when they're not needed in the kernel being built - it didn't enable MII along with the mcs7830 minidriver This patch fixes these two problems. However, there does seem to be a Kconfig reverse dependency bug in that MII gets wrongly enabled in some cases (like USBNET=y and USBNET_MII=n); I think I've noticed that same problem in other situations too. So the result can mean kernels being bloated by stuff that's needlessly enabled ... better than wrongly being disabled, but contributing to bloat. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9b823b43ff308c914530ec7fde5e2d79cb37b51a Author: Jan Mate Date: Fri Oct 20 14:51:44 2006 -0700 USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB Storage: this patch adds support for Sony Ericsson P990i Signed-off-by: Jan Mate Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d518b2b48a9c11fc381b179709f5321bce1f3b39 Author: Dominic Cerquetti Date: Fri Oct 20 14:51:45 2006 -0700 USB: xpad: additional USB id's added Adding additional USB vendor/product ID's for XBOX pads provided by the XBOX Linux team. Signed-off-by: Dominic Cerquetti Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 11bd44abbd204f580ea91e75c84e012988971012 Author: David Brownell Date: Wed Nov 1 14:26:26 2006 -0800 USB: fix compiler issues with newer gcc versions Remove complaint from newer GCCs; they don't like forward function declarations except in top-level contexts. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 23b0d968c2c82c2574ca97148ce092eff4ab84a6 Author: Naranjo Manuel Francisco Date: Fri Oct 27 16:08:54 2006 -0300 USB: HID: add blacklist AIRcable USB, little beautification This patch add AIRcable USBto USB-HID blacklist, makes some little changes things in the Kconfig to make AIRcable USB look as all the rest of drivers. And it removes the readme part that was on Documentation/usb/usb-serial.txt because it is not needed anymore. Signed-off-by: Naranjo Manuel Francisco commit 5a69ebe1e90d9e8d43131f08d344751cf42254c5 Author: Oliver Neukum Date: Sat Oct 28 18:07:25 2006 +0200 USB: usblp: fix system suspend for some systems this has been confirmed to fix suspend problems with usblp. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 6c8df79f8c0f8d861ea25e6e104a29398d8398f4 Author: Oliver Neukum Date: Sat Oct 28 11:36:59 2006 +0200 USB: failure in usblp's error path if urb submission fails due to a transient error here eg. ENOMEM , the driver is dead. This fixes it. Regards Oliver Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d8fa59a8f6f7c9a1bc294154fd6805c6b247683d Author: Daniel Ritz Date: Fri Oct 27 22:46:03 2006 +0200 usbtouchscreen: use endpoint address from endpoint descriptor use the endpoint address from the endpoint descriptor instead of the hardcoding it to 0x81. at least some ITM based screen use a different address and don't work without this. Signed-off-by: Daniel Ritz Cc: Ralf Lehmann Cc: J.P. Delport Signed-off-by: Greg Kroah-Hartman commit baafe37c6a58d4ddb8c2c62cd0f20340b4c66b35 Author: Jan Luebbe Date: Fri Oct 27 18:59:24 2006 +0200 USB: sierra: Fix id for Sierra Wireless MC8755 in new table The new version of sierra.c has introduced tables for the 1 port and 3 port variants. The device id i added in my last patch needs to be added to the 3 port table. Signed-off-by: Jan Luebbe Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 78001e3d75c5d3ae1e8dc9875892b9461e4c8d4b Author: Bjorn Schneider Date: Sat Oct 28 12:42:04 2006 +0200 USB: new VID/PID-combos for cp2101 3 new VID/PID combinations (registered with Silicon Laboratories Inc.) added for devices made by Lipowsky Industrie Elektronik GmbH all using the CP2102 usb-to-serial converter (Baby-JTAG, Baby-LIN, HARP-1). Signed-off-by: Bjorn Schneider Signed-off-by: Greg Kroah-Hartman commit 68717950e11eab8ff754b2721d23e9cb3a47b56f Author: Grant Grundler Date: Thu Oct 19 15:09:51 2006 -0700 hid-core: big-endian fix fix Adam Kropelin had posted 32-bit fix in June 2005 about two weeks after I originally had posted my fixes for big endian support. Adam has a UPS device which reports LINEV using 32-bits. Added comments to describe the limitations of the code. extract() is the same version I posted earlier and tested in user space. Made similar changes to implement() routine. I've written (and will shortly post) a test for implement(). Code tested on C3600 (parisc) with USB keyboard/mouse attached. I've dropped test_implement.c and a few other user space test programs on http://iou.parisc-linux.org/~grundler/tests/ -rw-r--r-- 1 grundler grundler 1750 Oct 18 09:13 test_extract.c -rw-r--r-- 1 grundler grundler 561 Jan 25 2006 test_ffs.c -rw-r--r-- 1 grundler users 7175 Apr 8 2005 test_fls.c -rw-r--r-- 1 grundler grundler 206 Sep 1 15:52 test_gettimeofday.c -rw-r--r-- 1 grundler grundler 1886 Oct 19 09:20 test_implement.c -rw-r--r-- 1 grundler users 2707 Jun 4 2005 test_unaligned.c I would appreciate if someone else would look at the output of test_implement.c to make it does The Right Thing. Signed-off-by: Grant Grundler Cc: Matthew Wilcox Cc: Dmitry Torokhov Acked-By: Adam Kropelin Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bc724b98c5e782c2d6781428ed87768daa34921d Author: Phil Dibowitz Date: Thu Oct 19 00:11:17 2006 -0700 USB: usb-storage: Unusual_dev update The protocol in this entry is needed for some versions of the device but not others. This adds the NEED_OVERRIDE flag to prevent it complaining to users who don't need it. Signed-off-by: Phil Dibowitz commit 90ac3c8124453fb355c10d3e1a27af5c0ab21099 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 USB: add another sierra wireless device id As reported by Peter Kucmeroski and Jason Ganovsky. Cc: Peter Kucmeroski Cc: Jason Ganovsky Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 3f84ada6c173d856b5e06b239931866ed7dd7a16 Author: Ben Dooks Date: Fri Nov 3 18:47:10 2006 +0100 [ARM] 3923/1: S3C24XX: update s3c2410_defconfig with new drivers Add the new drivers, such as SPI, LED and RTC core, to the s3c2410_defconfig. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit da86341856befac4e2f4b16965d6f78379dc960a Author: Ben Dooks Date: Fri Nov 3 18:38:02 2006 +0100 [ARM] 3922/1: S3C24XX: update s3c2410_defconfig to 2.6.19-rc4 Update the s3c2410_defconfig to 2.6.19-rc4 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 73d15da44f34626b4ad18eb4d56e1c2c4aaed578 Author: Ben Dooks Date: Fri Nov 3 18:33:43 2006 +0100 [ARM] 3921/1: S3C24XX: remove bast_defconfig Remove the bast_defconfig, as it has not been updated since 2.6.13. The s3c2410_defconfig should be a good replacement. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d91f75fb761e1e691796287889774cc8690034c1 Author: Ben Dooks Date: Fri Nov 3 18:30:12 2006 +0100 [ARM] 3920/1: S3C24XX: Remove smdk2410_defconfig Remove the smdk2410_defconifg as it is out of data and has not been touched since 2.6.11. Use the s3c2410_defconfig instead. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 1f4a39319e9226c3b1d5b91a1e4d3559ef8740e4 Author: Enrico Scholz Date: Fri Nov 3 13:47:39 2006 +0100 [ARM] 3919/1: Fixed definition of some PXA270 CIF related registers Fixed definition of some CIF registers; see PXA27x Developer\'s Manual. Signed-off-by: Enrico Scholz Signed-off-by: Russell King commit 984d115bbf2d731ed2264031fe49c1378d730db0 Author: Kevin Hilman Date: Fri Nov 3 01:47:20 2006 +0100 [ARM] 3918/1: ixp4xx irq-chip rework This is a rework of the ixp4xx irq_chip implementation. The use of two irq_chip structures and potentially switching between them is a violation of the intended use of the IRQ framework. The current implementation does not work with current in-kernel spinlock debugging or lockdep due to lock recursion problems caused by calling set_irq_chip/handler from within the chip's set_irq_type(). This patch goes back to using one irq_chip structure and handling the differences between edge/level, normal/GPIO interrupts inside the ack/mask/unmask routines themselves. Signed-off-by: Kevin Hilman Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 Author: Adrian Bunk Date: Fri Oct 27 16:12:30 2006 -0700 PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN PCI_MULTITHREAD_PROBE is an interesting feature, but in its current state it seems to be more of a trap for users who accidentally enable it. This patch lets PCI_MULTITHREAD_PROBE depend on BROKEN for 2.6.19. The intention is to get this patch reversed in -mm as soon as it's in Linus' tree, and reverse it for 2.6.20 or 2.6.21 after the fallout of in-kernel problems PCI_MULTITHREAD_PROBE causes got fixed. (akpm: I get enough bug reports already) Signed-off-by: Adrian Bunk Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6851ecc6e2fa4a01449a0fec9f4abd9aec43afde Author: Greg Kroah-Hartman Date: Thu Nov 2 23:02:24 2006 -0800 PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable" This reverts commit 53e4d30dd666d7f83598957ee4a415eefb47c9a6. It was found that it caused unneeded problems (see http://bugzilla.kernel.org/show_bug.cgi?id=7082 for details of one such issue. Signed-off-by: Greg Kroah-Hartman commit c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Trent Piepho Date: Sat Oct 14 15:44:44 2006 -0300 V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel When a front-end is disabled, card drivers that use it are compiled with a stub version of the front-end's attach function. This way they have no references to the front-end's code and don't need it to be loaded. If a card driver is compiled into the kernel, and a front-end is a module, then that front-end is effectively disabled wrt the card driver. In this case, the card driver should get the stub version. This was not happening. The stub vs real attach function selection is changed so that when the front-end is a module the real attach function is only used if the card driver is a module as well. This means a module front-end will be supported by card drivers that are modules and not supported by card drivers compiled into the kernel. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 9bb6e2593ad4cb94944f547154baee64b4734598 Author: Oliver Endriss Date: Fri Oct 27 18:02:01 2006 -0300 V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines TT DVB-C 2300 runs at 137 kHz I2C speed. short_delay mode did not work reliably on fast machines with that speed. Increased max loop count from 20 to 50. Moved dummy access out of the loop. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 588f98312c7fd1d86290583189d2eb24da70f752 Author: Hartmut Hackmann Date: Wed Oct 18 17:30:42 2006 -0300 V4L/DVB (4770): Fix mode switch of Compro Videomate T300 The board did not return to analog mode since the board specific "demod sleep" function was not called. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 9e741b74afc975da51ec60c5a8147b2ebcf7e33a Author: Raymond Mantchala Date: Mon Oct 30 23:20:50 2006 -0300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T Technotrend 1500 T card have "inverted inversion". This patch fixes that. Many thanks to Martin Zwickel from Technotrend for his confirmation and correction proposal. Signed-off-by: Raymond Mantchala Signed-off-by: Perceval Anichini Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c2625bff997f195e067ae11c9b0aa7217fb32991 Author: Randy Dunlap Date: Sun Oct 29 11:12:27 2006 -0300 V4L/DVB (4786): Pvrusb2: use NULL instead of 0 Fix sparse NULL usage warnings: drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit ecba77f246011344f0b8f46eb25ae01ab4ae282d Author: David Härdeman Date: Fri Oct 27 20:56:51 2006 -0300 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default The IR chip has no address decoding, so the IR data is always present in the high byte when doing a read from the saa7146 chip. This means that the DEBI address used is irrelevant to the IR decoding logic. DEBI addresses 0x1XXX are mapped to the registers on the CI module itself, but only the lowest two bits are actually used (see EN50221, section A.2.2.1), meaning that 0x1234 is equivalent to 0x1000 which maps to register 0 (the data register). A read from the data register is supposed to be preceded by a read from the size register, so some CI modules will be confused (the AlphaCrypt CAM will hang completely). The attached patch changes the address used when reading the IR data to use 0x4000 instead. This is the CI version address, which is a safer default, works with the AlphaCrypt CAM and matches the behaviour of the Windows driver (AFAIK). Signed-off-by: David Härdeman Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6c8c21b9119cfe68a99825085014bba4f9c0c768 Author: Trent Piepho Date: Sat Oct 14 16:21:02 2006 -0300 V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 Let the MT2060 be customized like most of the other DVB PLLs/front-ends. Also, add a missing dependency on I2C. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 Author: Peer Chen Date: Thu Nov 2 18:55:48 2006 -0500 pci_ids.h: Add NVIDIA PCI ID Signed-off-by: Jeff Garzik commit 895663cd92574367054e0eb604a7428852f359b8 Author: Peer Chen Date: Thu Nov 2 17:59:46 2006 -0500 [libata] Add support for AHCI controllers of MCP67. Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 8f7f9435e6df0985c877d10259393bdfaac3655f Author: Paul Gortmaker Date: Fri Oct 27 05:13:19 2006 +0100 [ARM] 3912/1: Make PXA270 advertise HWCAP_IWMMXT capability ARM patch 3756/1 added HWCAP_IWMMXT. This patch adds support for broadcasting that info via /proc/cpuinfo and sets it for the CPU features of the PXA270. I've booted 19rc3 on a pxa270 and confirmed that the /proc/cpuinfo shows "iwmmxt" in the Features. Signed-off-by: Paul Gortmaker Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 94c52fde553260e86f263448034930abe364faec Author: Ben Dooks Date: Mon Oct 30 02:27:45 2006 +0100 [ARM] 3915/1: S3C2412: Add s3c2410_gpio_getirq() to general gpio.c s3c2410_gpio_getirq() holds for the S3C2412 build, so ensure that it gets built for all the current S3C24XX architectures Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 05e2867a7bcc76de37e103a97ed48ba6872db797 Author: Peer Chen Date: Thu Nov 2 17:58:21 2006 -0500 [libata] Add support for PATA controllers of MCP67 to pata_amd.c. Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 73218187e8650c08d4e4735dbeeeb860f438da7c Author: Kevin Hilman Date: Thu Nov 2 23:44:24 2006 +0100 [ARM] 3917/1: Fix dmabounce symbol exports dma_sync_single is no more (and to be removed in 2.7) so this export should be dma_sync_single_for_cpu. Also export dma_sync_single_for_device. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit 7a118df3ea23820b9922a1b51cd2f24e464f4c17 Author: Sean Hefty Date: Tue Oct 31 11:12:59 2006 -0800 RDMA/addr: Use client registration to fix module unload race Require registration with ib_addr module to prevent caller from unloading while a callback is in progress. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 236d333c3c05c179e31f461285c09271256a1381 Author: Atsushi Nemoto Date: Tue Oct 10 22:13:55 2006 +0900 [MIPS] Do not use -msym32 option for modules. On 64-bit kernel, modules are loaded into XKSEG for now. While XKSEG address is not a sign-extended 32-bit address, we can not use -msym32 option. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 904880e717c5466041485ca6d6e8c6c1ef06d0fd Author: Ralf Baechle Date: Fri Oct 13 11:32:50 2006 +0100 [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. Found and original patch by bile@landofbile.com. Signed-off-by: Ralf Baechle commit 8b922a851731037b2f1e1669e9b1a0baff3ab5dc Author: Ralf Baechle Date: Mon Oct 30 12:48:04 2006 +0000 [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning. CC arch/mips/momentum/ocelot_g/gt-irq.o arch/mips/momentum/ocelot_g/gt-irq.c:30:5: warning: "CURRENTLY_UNUSED" is not defined arch/mips/momentum/ocelot_g/gt-irq.c:199:5: warning: "CURRENTLY_UNUSED" is not defined Signed-off-by: Ralf Baechle commit 9ba126cfbf505f4d5b39ed294cedd241321c7a91 Author: Ralf Baechle Date: Fri Oct 13 11:22:52 2006 +0100 [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD. Signed-off-by: Ralf Baechle commit 1a5c5de1b64ec510a6ab6994702c295db00b9acc Author: Ralf Baechle Date: Thu Nov 2 17:23:33 2006 +0000 [MIPS] IP27: Allow SMP ;-) Another changeset messed up by patch. When lmo commit 4ef893e0515e8bf336dfbd200884f244869fbb43 was merged to kernel.org as e73ea273ef87a04ff59fc368fa33333dca275dde patch happily applied the IP27 segment to IP22. f63f36c18b11e166d0f362ac04dbcd7e6ea23f9e did fix the effects partially - and with a wrong log message. Now fixed for real (tm). Signed-off-by: Ralf Baechle commit 8a88ca8f7fd15d06e53a848c6b3558ed9973327c Author: Ralf Baechle Date: Thu Nov 2 17:23:33 2006 +0000 [MIPS] Fix merge screwup by patch(1) Patch happily applied an Ocelot G patch to Ocelot C when merging linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into kernel.org as 6ceb6d3ab2d402cea326320a4143db90a66fd216. Signed-off-by: Ralf Baechle commit 8427829711b35e0e62668618cec577f65c102935 Author: Ralf Baechle Date: Thu Nov 2 02:00:02 2006 +0000 Revert "[MIPS] Make SPARSEMEM selectable on QEMU." This reverts commit 31473747bd441719f9f6a07385684dce547533e0. Another amazing example of patch(1) messing up - lmo changeset 66e8560d11d02bcadc261498471831a6375ad046 was merged twice to kernel.org and ended up doing this rubbish job. Signed-off-by: Ralf Baechle commit d572b87946f8c598b3cad86a7913862dd48daadb Author: Dave Kleikamp Date: Thu Nov 2 10:50:40 2006 -0600 JFS: Remove redundant xattr permission checking The vfs handles most permissions for setting and retrieving xattrs. This patch removes a redundant and wrong check so that it won't override the correct behavior which is being fixed in the vfs. Signed-off-by: Dave Kleikamp commit 8e87d4dc159148f04f515bc072df22a2c089e7f2 Author: Steve French Date: Thu Nov 2 03:45:24 2006 +0000 [CIFS] report rename failure when target file is locked by Windows Fixes Samba bugzilla bug # 4182 Rename by handle failures (retry after rename by path) were not being returned back. Signed-off-by: Steve French commit 732f74a46711c0724885703fb689c79139c84a3c Author: Jeff Garzik Date: Wed Nov 1 22:09:21 2006 -0500 Revert "[PATCH] Add 0x7110 piix to ata_piix.c" This reverts commit f833229c96c0bf53c05995e4bd58709d9e9edd67: According to reviewers and the lspci data provided in commit message itself, PCI ID 0x7110 should not have been added to ata_piix. Signed-off-by: Jeff Garzik commit 6f5b7ef6b5816dc497094048d7d8a270004602d6 Author: Meelis Roos Date: Wed Nov 1 18:07:27 2006 -0800 [NETFILTER]: silence a warning in ebtables net/bridge/netfilter/ebtables.c: In function 'ebt_dev_check': net/bridge/netfilter/ebtables.c:89: warning: initialization discards qualifiers from pointer target type So make the char* a const char * and the warning is gone. Signed-off-by: Meelis Roos Signed-off-by: David S. Miller commit c7fed9d75074f7c243ec8ff2c55d04de2839a6f6 Author: David S. Miller Date: Wed Nov 1 16:30:39 2006 -0800 [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation. I copied the logic from ll/sc arch implementations, but that was wrong and makes no sense at all. Just do a straight compare-exchange instruction, just like x86. Based upon bug reports from Dennis Gilmore and Fabio Massimo. Signed-off-by: David S. Miller commit 5b1225454f7891970cb5ba87c8ef24edb1fa6c3a Author: Al Viro Date: Wed Nov 1 15:28:58 2006 -0800 [IPV6]: File the fingerprints off ah6->spi/esp6->spi In theory these are opaque 32bit values. However, we end up allocating them sequentially in host-endian and stick unchanged on the wire. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b1736a71404b3961f061c795a81210aa7f945fc0 Author: Stephen Hemminger Date: Tue Oct 31 17:31:33 2006 -0800 [TCP]: Set default congestion control when no sysctl. The setting of the default congestion control was buried in the sysctl code so it would not be done properly if SYSCTL was not enabled. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d55b4c631e89a008e80b003e5aa4291d9ec800ac Author: Adrian Bunk Date: Tue Oct 31 16:59:35 2006 -0800 [TIPC] net/tipc/port.c: fix NULL dereference The correct order is: NULL check before dereference Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e Author: Paul Mackerras Date: Thu Nov 2 09:44:37 2006 +1100 [PATCH] powerpc: Eliminate "exceeds stub group size" linker warning It turns out that the linker warnings on 64-bit powerpc about "section blah exceeds stub group size" were being triggered by conditional branches in head_64.S branching to global symbols, whether in head_64.S or in other files. This eliminates the warnings by making some global symbols in head_64.S no longer global, and by rearranging some branches. Signed-off-by: Paul Mackerras [ Yee-haa. Maybe I'll notice newly introduced real warnings now - Linus ] Signed-off-by: Linus Torvalds commit f9dadfa71bc594df09044da61d1c72701121d802 Author: Linus Torvalds Date: Wed Nov 1 10:05:35 2006 -0800 i386: write IO APIC irq routing entries in correct order Since the "mask" bit is in the low word, when we write a new entry, we need to write the high word first, before we potentially unmask it. The exception is when we actually want to mask the interrupt, in which case we want to write the low word first to make sure that the high word doesn't change while the interrupt routing is still active. Signed-off-by: Linus Torvalds commit 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 Author: Yoichi Yuasa Date: Wed Nov 1 18:55:22 2006 +0900 [MIPS] Fix warning in mips-boards generic PCI arch/mips/mips-boards/generic/pci.c: In function `mips_pcibios_init': arch/mips/mips-boards/generic/pci.c:227: warning: comparison of distinct pointer types lacks a cast arch/mips/mips-boards/generic/pci.c:228: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 64c590b7a62ae1272fe4afd7b915de314591f35e Author: Ralf Baechle Date: Wed Nov 1 00:22:00 2006 +0000 [MIPS] SMTC: Synchronize cp0 counters on bootup. Signed-off-by: Ralf Baechle commit cb56837ea5f15fa5279fd490f292134c3a92e5de Author: Ralf Baechle Date: Tue Oct 31 22:49:04 2006 +0000 [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. Signed-off-by: Ralf Baechle commit 242954b5aa8e5ec84f46a84637daf08ee4247c6e Author: Ralf Baechle Date: Tue Oct 24 02:29:01 2006 +0100 [MIPS] 16K & 64K page size fixes Derived from Peter Watkins 's work. Signed-off-by: Ralf Baechle commit 130fe05dbc0114609cfef9815c0c5580b42decfa Author: Linus Torvalds Date: Wed Nov 1 09:11:00 2006 -0800 i386: clean up io-apic accesses This is preparation for fixing the ordering of the accesses that got broken by the commit cf4c6a2f27f5db810b69dcb1da7f194489e8ff88 when factoring out the "common" io apic routing entry accesses. Move the accessor function (that were only used by io_apic.c) out of a header file, and use proper memory-mapped accesses rather than making up our own "volatile" pointers. Signed-off-by: Linus Torvalds commit 8fc2d9cae99e47e236cb7b77015b9faf69a097cc Author: Peer Chen Date: Wed Nov 1 05:23:11 2006 -0500 [libata] sata_nv: Add PCI IDs Signed-off-by: Jeff Garzik commit 1244a19cde42c268aa159d264fc2df072a3ff82f Author: Tejun Heo Date: Wed Nov 1 17:19:18 2006 +0900 [PATCH] ahci: fix status register check in ahci_softreset ahci_softreset() used to use ahci_tf_read() which reads D2H_REG area to check for the Status register. However, this area is zeroed on initialization and not set by initial signature FIS. Replace it with ahci_check_status(). This bug prevented CLO code from being activated whenever BSY and/or DRQ is set prior to softreset. This fix makes AHCI_FLAG_RESET_NEEDS_CLO flag redundant. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4393c4f6788cee65095dd838cfeca6edefbfeb52 Author: Benjamin Herrenschmidt Date: Wed Nov 1 15:11:39 2006 +1100 [POWERPC] Make alignment exception always check exception table The alignment exception used to only check the exception table for -EFAULT, not for other errors. That opens an oops window if we can coerce the kernel into getting an alignment exception for other reasons in what would normally be a user-protected accessor, which can be done via some of the futex ops. This fixes it by always checking the exception tables. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca Author: Gui,Jian Date: Wed Nov 1 10:50:15 2006 +0800 [POWERPC] Disallow kprobes on emulate_step and branch_taken On powerpc, probing on emulate_step function will crash 2.6.18.1 when it is triggered. When kprobe is triggered, emulate_step() is on its kernel path and will cause recursive kprobe fault. And branch_taken() is called in emulate_step(). This disallows kprobes on both of them. Signed-off-by: Paul Mackerras commit 292f86f005e3867277b2126c2399eea3e773a4fc Author: Hugh Dickins Date: Tue Oct 31 18:41:51 2006 +0000 [POWERPC] Make mmiowb's io_sync preempt safe If mmiowb() is always used prior to releasing spinlock as Doc suggests, then it's safe against preemption; but I'm not convinced that's always the case. If preemption occurs between sync and get_paca()->io_sync = 0, I believe there's no problem. But in the unlikely event that gcc does the store relative to another register than r13 (as it did with current), then there's a small danger of setting another cpu's io_sync to 0, after it had just set it to 1. Rewrite ppc64 mmiowb to prevent that. The remaining io_sync assignments in io.h all get_paca()->io_sync = 1, which is harmless even if preempted to the wrong cpu (the context switch itself syncs); and those in spinlock.h are while preemption is disabled. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit 96268889ee369b36203b7a06e8aabb197270216e Author: Hugh Dickins Date: Tue Oct 31 18:40:39 2006 +0000 [POWERPC] Make high hugepage areas preempt safe Checking source for other get_paca()->field preemption dangers found that open_high_hpage_areas does a structure copy into its paca while preemption is enabled: unsafe however gcc accomplishes it. Just remove that copy: it's done safely afterwards by on_each_cpu, as in open_low_hpage_areas. Signed-off-by: Hugh Dickins Acked-by: David Gibson Signed-off-by: Paul Mackerras commit 5fe8e8b88e68e517637e3f8287f1fee89e2d9252 Author: Hugh Dickins Date: Tue Oct 31 18:39:31 2006 +0000 [POWERPC] Make current preempt-safe Repeated -j20 kernel builds on a G5 Quad running an SMP PREEMPT kernel would often collapse within a day, some exec failing with "Bad address". In each case examined, load_elf_binary was doing a kernel_read, but generic_file_aio_read's access_ok saw current->thread.fs.seg as USER_DS instead of KERNEL_DS. objdump of filemap.o shows gcc 4.1.0 emitting "mr r5,r13 ... ld r9,416(r5)" here for get_paca()->__current, instead of the expected and much more usual "ld r9,416(r13)"; I've seen other gcc4s do the same, but perhaps not gcc3s. So, if the task is preempted and rescheduled on a different cpu in between the mr and the ld, r5 will be looking at a different paca_struct from the one it's now on, pick up the wrong __current, and perhaps the wrong seg. Presumably much worse could happen elsewhere, though that split is rare. Other architectures appear to be safe (x86_64's read_pda is more limiting than get_paca), but ppc64 needs to force "current" into one instruction. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit 302439d2167e0f1e01a6480ac40c06063f4e16a1 Author: Timur Tabi Date: Tue Oct 31 17:53:42 2006 +0800 [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR Changed qe_issue_cmd() to write cmd_input to the CECDR unmodified. It was treating cmd_input as a virtual address and tried to convert it to a physical address. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 5d2efba64b231a1733c4048d1708d77e07f26426 Author: Linas Vepstas Date: Mon Oct 30 16:15:59 2006 +1100 [POWERPC] Use 4kB iommu pages even on 64kB-page systems The 10Gigabit ethernet device drivers appear to be able to chew up all 256MB of TCE mappings on pSeries systems, as evidenced by numerous error messages: iommu_alloc failed, tbl c0000000010d5c48 vaddr c0000000d875eff0 npages 1 Some experimentation indicates that this is essentially because one 1500 byte ethernet MTU gets mapped as a 64K DMA region when the large 64K pages are enabled. Thus, it doesn't take much to exhaust all of the available DMA mappings for a high-speed card. This patch changes the iommu allocator to work with its own unique, distinct page size. Although the patch is long, its actually quite simple: it just #defines a distinct IOMMU_PAGE_SIZE and then uses this in all the places that matter. As a side effect, it also dramatically improves network performance on platforms with H-calls on iommu translation inserts/removes (since we no longer call it 16 times for a 1500 bytes packet when the iommu HW is still 4k). In the future, we might want to make the IOMMU_PAGE_SIZE a variable in the iommu_table instance, thus allowing support for different HW page sizes in the iommu itself. Signed-off-by: Linas Vepstas Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit dd6c89f686bdb2a5de72fab636fc839e5a0add6d Author: Andy Fleming Date: Fri Oct 27 15:06:32 2006 -0500 [POWERPC] Fix oprofile support for e500 in arch/powerpc Fixed a compile error in building the 85xx support with oprofile, and in the process cleaned up some issues with the fsl_booke performance monitor code. * Reorganized FSL Book-E performance monitoring code so that the 7450 wouldn't be built if the e500 was, and cleaned it up so it was more self-contained. * Added a cpu_setup function for FSL Book-E. The original cpu_setup function prototype had no arguments, assuming that the reg_setup function would copy the required information into variables which represented the registers. This was silly for e500, since it has 1 register per counter (rather than 3 for all counters), so the code has been restructured to have cpu_setup take the current counter config array as an argument, with op_powerpc_setup() invoking op_powerpc_cpu_setup() through on_each_cpu(), and op_powerpc_cpu_setup() invoking the model-specific cpu_setup function with an argument. The argument is ignored on all other platforms at present. * Fixed a confusing line where a trinary operator only had two arguments Signed-off-by: Andrew Fleming Signed-off-by: Paul Mackerras commit e0da0daee14862e0a5c49f2059641a8deb27eca2 Author: Andy Fleming Date: Fri Oct 27 14:31:07 2006 -0500 [POWERPC] Fix rmb() for e500-based machines it The e500 core generates an illegal instruction exception when it tries to execute the lwsync instruction, which we currently use for rmb(). This fixes it by using the LWSYNC macro, which turns into a plain sync on 32-bit machines. Signed-off-by: Andrew Fleming Signed-off-by: Paul Mackerras commit 441cbd8dace80545db2ac43175ac1c097d96f75c Author: Benjamin Herrenschmidt Date: Thu Oct 26 15:38:10 2006 +1000 [POWERPC] Fix various offb issues This patch fixes a few issues in offb: - A test was inverted causing the palette hack to never work (no device node was passed down to the init function) - Some cards seem to have their assigned-addresses property in a random order, thus we need to try using of_get_pci_address() first, which will fail if it's not a PCI device, and fallback to of_get_address() in that case. of_get_pci_address() properly parsees assigned-addresses to test the BAR number and thus will get it right whatever the order is. - Some cards (like GXT4500) provide a linebytes of 0xffffffff in the device-tree which does no good. This patch handles that by using the screen width when that happens. (Also fixes btext.c while at it). - Add detection of the GXT4500 in addition to the GXT2000 for the palette hacks (we use the same hack, palette is linear in register space at offset 0x6000). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb Author: Larry Finger Date: Tue Oct 17 23:38:26 2006 -0500 [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom The bcm43xx driver uses 4 locations in the devices sprom to determine the behavior of the leds. Certain defaults are assigned if all bits are set in those locations. On at least one BCM4303 chip, the sprom contains values other than the default, which executes an assertion placed in the default case of a following switch statement. This patch makes the leds on the above mentioned interface behave correctly. In addition, it limits the number of logged messages to 20 for the case of unexpected values in the sprom locations. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 81e171b95d2d06a64465a1e6ab1e2fb864ea2448 Author: Michael Buesch Date: Sat Oct 28 17:52:34 2006 -0500 [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts This fixes a netdev watchdog timeout problem. The software needs to call netif_tx_disable before running the hardware calibration code. The problem condition can be shown by the following timegraph. |---5secs - ~10 jiffies time---|---|OOPS ^ ^ last real TX periodic work stops netif At OOPS, the following happens: The watchdog timer triggers, because the timeout of 5secs is over. The watchdog first checks for stopped TX. _Usually_ TX is only stopped from the TX handler to indicate a full TX queue. But this is different. We need to stop TX here, regardless of the TX queue state. So the watchdog recognizes the stopped device and assumes it is stopped due to full TX queues (Which is a _wrong_ assumption in this case). It then tests how far the last TX has been in the past. If it's more than 5secs (which is the case for low or no traffic), it will fire a TX timeout. Signed-off-by: Michael Buesch Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 115e222d538e7838bffa0f76409acd9816a0ef32 Author: Pavel Roskin Date: Tue Oct 24 22:41:27 2006 -0400 [PATCH] hostap_plx: fix CIS verification The length of the manfid CIS should be at least 4, and it's normally 4. It's incorrect to require it to be at least 5. This breaks support for most (if not all) cards. The right place to ensure that we don't access beyond the CIS buffer is to strengthen another check. Make sure that the next tuple begins at least at the CIS buffer end (in which case we stop processing) or before that. Reported by ph35sm@free.fr Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit aec41a0d02342fc9e3b6bb278eae50fa29f04d1f Author: Jiri Benc Date: Wed Oct 18 19:34:40 2006 +0200 [PATCH] ieee80211: don't flood log with errors The "ieee80211: Workaround malformed 802.11 frames from AP" patch (see http://kernel.org/git/?p=linux/kernel/git/linville/wireless-2.6.git;a=commit;h=f09fc44d8c25f22c4d985bb93857338ed02feac6 ) fixes the problem with some buggy APs but also converts debug message into an error one. This floods the log with errors when you are near such AP (you get a message for every beacon). This patch reverts the error message back to the debug one. Signed-off-by: Jiri Benc Signed-off-by: John W. Linville commit c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Author: Tejun Heo Date: Mon Oct 9 13:23:58 2006 +0900 [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M ICH7M was separated from ICH6M to allow undocumented MAP value 01b which was spotted on an ASUS notebook. However, there is also notebooks with MAP value 01b on ICH6M. This patch re-merges ICH6M and ICH7M entries and allows MAP value 01b for both. This problem has been reported and initial patch provided by Jonathan Dieter. Signed-off-by: Tejun Heo Cc: Jonathan Dieter Cc: Tom Deblauwe Signed-off-by: Jeff Garzik commit 6e42acc4115bc376b8523acbcba2b2b7cc27d016 Author: Tejun Heo Date: Fri Oct 27 19:08:42 2006 -0700 [PATCH] libata: unexport ata_dev_revalidate() ata_dev_revalidate() isn't used outside of libata core. Unexport it. Signed-off-by: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit f833229c96c0bf53c05995e4bd58709d9e9edd67 Author: Jens Axboe Date: Tue Oct 31 09:31:37 2006 +0100 [PATCH] Add 0x7110 piix to ata_piix.c Hi Jeff, I tested the PATA support on my old VAIO notebook, and it failed to find my piix device: 00:07.1 Class 0101: 8086:7111 (rev 01) (prog-if 80 [Master]) Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- SERR- Signed-off-by: Jeff Garzik commit cf0e812f0e90ee496af072b136e8bd02770387e6 Author: Tejun Heo Date: Fri Oct 27 19:08:47 2006 -0700 [PATCH] sata_sis: fix flags handling for the secondary port sis_init_one() modifies probe_ent->port_flags after allocating and initializing it using ata_pci_init_native_mode(). This makes port_flags for the secondary port (probe_ent->pinfo2->flags) go out of sync resulting in misdetection of device due to incorrectly initialized SCR access flag. This patch make probe_ent alloc/init happen after the final port flags value is determined. This is fragile but probe_ent and all the related mess are scheduled to go away soon for exactly this reason. We just need to hold everything together till then. This has been spotted and diagnosed and tested by Patrick McHardy. Signed-off-by: Tejun Heo Cc: Patric McHardy Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0ca43235b34c92278fa903297acef37198ec3e26 Author: Stephen Hemminger Date: Wed Oct 18 13:39:28 2006 -0700 [PATCH] sky2: netpoll on dual port cards The sky2 driver uses a single NAPI poll routine for both ports on dual ported cards (because there is a single IRQ and status ring). Netpoll makes assumptions about the relationship between network device and NAPI that aren't correct on the second port, this will cause the port to never clear work. Most systems, just have single port, so not a big issue. The easy fix is just make the second port, not netpoll capable. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b Author: Stephen Hemminger Date: Sun Oct 22 20:16:57 2006 -0700 [PATCH] skge, sky2, et all. gplv2 only I don't want my code to downgraded to GPLv3 because of cut-n-pasted the comments. These files which I hold copyright on were started before it was clear what GPLv3 was going to be. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2ceaac755423cb93c1bb2f59ebd1a06f027ac095 Author: David Rientjes Date: Mon Oct 30 14:19:25 2006 -0800 [PATCH] net s2io: return on NULL dev_alloc_skb() Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent dereference. Cc: Jeff Garzik Cc: Christoph Hellwig Signed-off-by: David Rientjes Signed-off-by: Jeff Garzik commit 1e1675ccf758cbb4303ab052d58405cda6c745a7 Author: Jan-Bernd Themann Date: Wed Oct 25 13:11:42 2006 +0200 [PATCH] ehea: kzalloc GFP_ATOMIC fix This patch fixes kzalloc parameters (GFP_ATOMIC instead of GFP_KERNEL) Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 1e7bed081968c42469bd02842b4190a115008221 Author: Brice Goglin Date: Thu Oct 26 22:51:33 2006 +0200 [PATCH] myri10ge: ServerWorks HT2000 PCI id is already defined in pci_ids.h No need to keep defining PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE in the driver code since it is now defined in pci_ids.h. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit f479b322a0949d540b45aea645793058b0c50be5 Author: Stephen Hemminger Date: Fri Oct 27 10:22:10 2006 -0700 [PATCH] sky2: not experimental The sky2 driver is no longer in experimental state. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 09669585b5d0cfdebe28250d442693b3baac66a2 Author: Akinobu Mita Date: Sun Oct 29 03:47:12 2006 +0900 [PATCH] n2: fix confusing error code modprobe n2 with no parameters or no such devices will get confusing error message. # modprobe n2 ... Kernel does not have module support This patch replaces return code from -ENOSYS to -EINVAL. Cc: Jeff Garzik Cc: Krzysztof Halasa Signed-off-by: Akinobu Mita drivers/net/wan/n2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik commit 9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 Author: Akinobu Mita Date: Sun Oct 29 03:52:14 2006 +0900 [PATCH] tokenring: fix module_init error handling - Call platform_driver_unregister() before return when no cards found. (fixes data corruption when no cards found) - Check platform_device_register_simple() return value Cc: Jeff Garzik Cc: Mike Phillips Signed-off-by: Akinobu Mita drivers/net/tokenring/proteon.c | 9 +++++++-- drivers/net/tokenring/skisa.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 06f0015ace46ce9d313ec02d6b13c47c8e795a6c Author: Lennert Buytenhek Date: Mon Oct 30 19:54:08 2006 +0100 [PATCH] ep93xx_eth: don't report RX errors Flooding the console with error messages for every RX FIFO overrun, checksum error and framing error isn't very sensible. Each of these errors can occur during normal operation, so stop printk'ing error messages for RX errors at all. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit 79c356f44b26da9fe357ed1a11e7faec4fd94e13 Author: Lennert Buytenhek Date: Mon Oct 30 19:52:54 2006 +0100 [PATCH] ep93xx_eth: fix unlikely(x) > y test Fix unlikely(x) > y test in ep93xx_eth. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit 2d38caba5fd148976f54930782e8209fa45879a0 Author: Lennert Buytenhek Date: Mon Oct 30 19:52:31 2006 +0100 [PATCH] ep93xx_eth: fix RX/TXstatus ring full handling Ray Lehtiniemi reported that an incoming UDP packet flood can lock up the ep93xx ethernet driver. Herbert Valerio Riedel noted that due to the way ep93xx_eth manages the RX/TXstatus rings, it cannot distinguish a full ring from an empty one, and correctly suggested that this was likely to be causing this lockup to occur. Instead of looking at the hardware's RX/TXstatus ring write pointers to determine when to stop reading from those rings, we should just check every individual RX/TXstatus descriptor's valid bit instead, since there is no other way to distinguish an empty ring from a full ring, and if there is a descriptor waiting, we take the hit of reading the descriptor from memory anyway. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit 024e4f2c5175a482c234cf67ed22368d770bf78f Author: Keith Owens Date: Wed Oct 18 15:36:49 2006 +1000 [IA64] Correct definition of handle_IPI The declaration of handle_IPI in arch/ia64/kernel/smp.c was changed but not the definition of this function. Remove struct pt_regs from handle_IPI(). Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit fa1d19e5d9a94120f31e5783ab44758f46892d94 Author: Troy Heber Date: Wed Oct 25 14:46:15 2006 -0600 [IA64] move SAL_CACHE_FLUSH check later in boot The check to see if the firmware drops interrupts during a SAL_CACHE_FLUSH is done to early in the boot. SAL_CACHE_FLUSH expects to be able to make PAL calls in virtual mode, on some cell based machines a fault occurs causing a MCA. This patch moves the check after mmu_context_init so the TLB and VHPT are properly setup. Signed-off-by Troy Heber Signed-off-by: Tony Luck commit 264b0f99308436deaee38bab99e586612d012fc1 Author: Russ Anderson Date: Wed Oct 25 17:59:47 2006 -0500 [IA64] MCA recovery: Montecito support The information in MCA records is filled in slightly differently on Montecito than on Madison/McKinley. Usually, the cache check and bus check target identifiers have the same address. On Montecito the cache check and bus check target identifiers can be different if a corrected error (ie SBE or unconsumed poison data) was encountered and then an uncorrected error (ie DBE) was consumed. In that case, the cache check target identifier is the physical address of the DBE (that caused the MCA to surface) while the bus check target identifier is the physical address of the SBE. This patch correctly finds the target identifier that triggered the MCA. If there are multiple valid cache target identifiers in the same error record then use the one with the lowest cache level. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 Author: Kenji Kaneshige Date: Fri Oct 27 19:49:53 2006 +0900 [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI Signed-off-by: Kenji Kaneshige Acked-by: Satoru Takeuchi Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Tony Luck commit 16b7b2ac0148e839da86af8747b6fa4aad43a9b7 Author: Atsushi Nemoto Date: Tue Oct 24 00:21:27 2006 +0900 [MIPS] Fixup migration to GENERIC_TIME Since we already moved to GENERIC_TIME, we should implement alternatives of old do_gettimeoffset routines to get sub-jiffies resolution from gettimeofday(). This patch includes: * MIPS clocksource support (based on works by Manish Lachwani). * remove unused gettimeoffset routines and related codes. * remove unised 64bit do_div64_32(). * simplify mips_hpt_init. (no argument needed, __init tag) * simplify c0_hpt_timer_init. (no need to write to c0_count) * remove some hpt_init routines. * mips_hpt_mask variable to specify bitmask of hpt value. * convert jmr3927_do_gettimeoffset to jmr3927_hpt_read. * convert ip27_do_gettimeoffset to ip27_hpt_read. * convert bcm1480_do_gettimeoffset to bcm1480_hpt_read. * simplify sb1250 hpt functions. (no need to subtract and shift) Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 70e46f48cb5933119712ee27945309a4bfc98282 Author: Ralf Baechle Date: Tue Oct 31 18:33:09 2006 +0000 [MIPS] VSMP: Synchronize cp0 counters on bootup. Signed-off-by: Ralf Baechle commit e79f55a8c7aaae5a33e8c2b29682ec8e603b5434 Author: Ralf Baechle Date: Tue Oct 31 19:53:15 2006 +0000 [MIPS] Flags must be unsigned long. Signed-off-by: Ralf Baechle commit 781b0f8d4f9c90137ea32771346ab49f0e5319b3 Author: Ralf Baechle Date: Tue Oct 31 18:25:10 2006 +0000 [MIPS] VSMP: Fix initialization ordering bug. Signed-off-by: Ralf Baechle commit 3ab0f40f333007eb31dc1e08f578ec224c7d71c2 Author: Yoichi Yuasa Date: Tue Oct 31 13:44:38 2006 +0900 [MIPS] Fix warning of printk format in mips_srs_init() arch/mips/kernel/traps.c:1115: warning: int format, long unsigned int arg (arg 2) Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 38384c8bd82474bf74ea68e4e44aaa14504deb07 Author: Yoichi Yuasa Date: Tue Oct 31 13:38:44 2006 +0900 [MIPS] Yosemite: fix uninitialized variable in titan_i2c_xfer() Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c21e6d65f70d64b359a37545592f39e28074864e Author: Ralf Baechle Date: Tue Oct 31 13:41:59 2006 +0000 [MIPS] Sort out missuse of __init for prom_getcmdline() Signed-off-by: Ralf Baechle commit e8f05de54055e90e6d58e45866f84ecdb0b48acd Author: Manish Lachwani Date: Sat Jan 22 09:23:38 2005 -0800 [MIPS] Add missing file for support of backplane on TX4927 based board Signed-off-by: Manish Lachwani Signed-off-by: Ralf Baechle commit 0887fa5158fe7da4a46ae526d313ae636440deae Author: Ralf Baechle Date: Tue Oct 31 11:52:03 2006 +0000 [MIPS] TX4927: Remove indent error message that somehow ended in the code. Signed-off-by: Ralf Baechle commit 68586b67ab1a2fd618f79e29a06f10ae886f4b46 Author: Michael S. Tsirkin Date: Mon Oct 30 16:31:52 2006 +0200 IB/mthca: Fix MAD extended header format for MAD_IFC firmware command Several fields in an incoming MAD extended info header were passed into the MAD_IFC firmware command at incorrect offsets (mostly off by 4 bytes). As the result, the HCA will fail to generate traps in which this info is needed (e.g. traps which include the GRH of the incoming packet), in violation of the IB spec. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 80fc115d461031dc66bb7f31b8c84868e370fea6 Author: Randy Dunlap Date: Mon Oct 30 20:41:11 2006 -0800 [PATCH] SCSI: ISCSI build failure SCSI_QLA_ISCSI needs to depend on NET to prevent build (link) failures that are caused by selecting SCSI_ISCSI_ATTRS. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 5fccbf61be2a7f32d2002b04afca4c5009612a58 Author: Jens Axboe Date: Tue Oct 31 14:21:55 2006 +0100 [PATCH] CFQ: request <-> request merging rr_list fixup In very rare circumstances would we be pruning a merged request and at the same time delete the implicated cfqq from the rr_list, and not readd it when the merged request got added. This could cause io stalls until that process issued io again. Fix it up by putting the rr_list add handling into cfq_add_rq_rb(), identical to how pruning is handled in cfq_del_rq_rb(). This fixes a hang reproducible with fsx-linux. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 5ddfe9691c91a244e8d1be597b6428fcefd58103 Author: NeilBrown Date: Mon Oct 30 22:07:21 2006 -0800 [PATCH] md: check bio address after mapping through partitions. Partitions are not limited to live within a device. So we should range check after partition mapping. Note that 'maxsector' was being used for two different things. I have split off the second usage into 'old_sector' so that maxsector can be still be used for it's primary usage later in the function. Cc: Jens Axboe Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45ec4ababe999cb95f9c0cad03b2689cb0b77a2b Author: Michael Halcrow Date: Mon Oct 30 22:07:20 2006 -0800 [PATCH] eCryptfs: Fix handling of lower d_count Fix the use of dget/dput calls to balance out on the lower filesystem. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 316bb95e8ed0ddcd767e8aa54264b6c6190f150c Author: Michael Halcrow Date: Mon Oct 30 22:07:20 2006 -0800 [PATCH] eCryptfs: Remove ecryptfs_umount_begin There is no point to calling the lower umount_begin when the eCryptfs umount_begin is called. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ff1d74f5670329ac4b5959a675f8698ba95be20 Author: Michael Halcrow Date: Mon Oct 30 22:07:19 2006 -0800 [PATCH] eCryptfs: Consolidate lower dentry_open's Opens on lower dentry objects happen in several places in eCryptfs, and they all involve the same steps (dget, mntget, dentry_open). This patch consolidates the lower open events into a single function call. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bba066f4e3854755a303cee37ea37bd080a46b3 Author: Michael Halcrow Date: Mon Oct 30 22:07:18 2006 -0800 [PATCH] eCryptfs: Cipher code to new crypto API Update cipher block encryption code to the new crypto API. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 565d9724b8ce49b530287de34aa17f45f21624d5 Author: Michael Halcrow Date: Mon Oct 30 22:07:17 2006 -0800 [PATCH] eCryptfs: Hash code to new crypto API Update eCryptfs hash code to the new kernel crypto API. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d9cbde6ce0001e49994df5fcdcbeff8be8037b Author: Michael Halcrow Date: Mon Oct 30 22:07:16 2006 -0800 [PATCH] eCryptfs: Clean up crypto initialization Clean up the crypto initialization code; let the crypto API take care of the key size checks. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a279ff1ea1cf325775ada983035123fcdc8e986 Author: Oleg Nesterov Date: Mon Oct 30 22:07:15 2006 -0800 [PATCH] taskstats: fix sub-threads accounting If there are no listeners, taskstats_exit_send() just returns because taskstats_exit_alloc() didn't allocate *tidstats. This is wrong, each sub-thread should do fill_tgid_exit() on exit, otherwise its ->delays is not recorded in ->signal->stats and lost. Q: We don't send TASKSTATS_TYPE_AGGR_TGID when single-threaded process exits. Is it good? How can the listener figure out that it was actually a process exit, not sub-thread? Signed-off-by: Oleg Nesterov Cc: Balbir Singh Acked-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 525fdb6cc929b515ad7e0be40fd023cff8660ed8 Author: Jeff Dike Date: Mon Oct 30 22:07:14 2006 -0800 [PATCH] uml: add INITCALLS This is the UML piece of the INITCALLS tidying. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1480c56feb2a894fd47fb399999a5b320c3e103 Author: Jeff Dike Date: Mon Oct 30 22:07:13 2006 -0800 [PATCH] uml: add _text definition to linker scripts kallsyms now refers to addresses as '_text + 0xADDRESS', rather than just '0xADDRESS', so we need to define _text. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8d7c28ec0b50ac57ddc909ae6eca1519473f300 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:12 2006 -0800 [PATCH] uml ubd driver: various little changes Fix a small memory leak in ubd_config, and clearify the confusion which lead to it. Then, some little changes not affecting operations - * move init functions together, * add a comment about a potential problem in case of some evolution in the block layer, * mark all initcalls as static __init functions * mark an used once little function as inline * document that mconsole methods are all called in process context (was triggered when checking ubd mconsole methods). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bf16bffeef65622603af22151156807323d7dc7 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:11 2006 -0800 [PATCH] uml ubd driver: do not store error codes as ->fd To simplify error handling, make sure fd is saved into ubd_dev->fd only when we are sure it is an fd and not an error code. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84e945e399ce9710a34035ea81eaf5719aa709af Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:10 2006 -0800 [PATCH] uml ubd driver: use bitfields where possible Use bitfields for boolean fields in ubd data structure. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7f6552f237498c805af9f01aba168b731e0a4ce Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:09 2006 -0800 [PATCH] uml ubd driver: reformat ubd_config Pure whitespace and style fixes split out from subsequent patch. Some changes (err -> ret) don't make sense now, only later, but I split them out anyway since they cluttered the patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2fe30a34a141c2188ff2cdd670d031088d9c5d20 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:09 2006 -0800 [PATCH] uml ubd driver: convert do_ubd to a boolean variable do_ubd is actually just a boolean variable - the way it is used currently is a leftover from the old 2.4 block layer, but it is still used; its use is suspicious, but removing it would be too intrusive for now and needs more thinking. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33f775eea185e8df7701c4afc2c8fcee85c83282 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:08 2006 -0800 [PATCH] uml ubd driver: ubd_io_lock usage fixup Add some comments about requirements for ubd_io_lock and expand its use. When an irq signals that the "controller" (i.e. another thread on the host, which does the actual requests and is the only one blocked on I/O on the host) has done some work, we call again the request function ourselves (do_ubd_request). We now do that with ubd_io_lock held - that's useful to protect against concurrent calls to elv_next_request and so on. XXX: Maybe we shouldn't call at all the request function. Input needed on this. Are we supposed to plug and unplug the queue? That code "indirectly" does that by setting a flag, called do_ubd, which makes the request function return (it's a residual of 2.4 block layer interface). Meanwhile, however, merge this patch, which improves things. Cc: Jens Axboe Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7fb2c3865ca0f95d92e2864c3dc9220789d83f5 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:07 2006 -0800 [PATCH] uml ubd driver: change ubd_lock to be a mutex This lock protects ubd setup and teardown, so is only used in process context; beyond that, during such setup memory allocations must be performed and some generic functions which can sleep must be called (such as add_disk()). So the only correct solution is to make it a mutex instead of a spin_lock. No other change is done - this lock must be acquired in different places but it's done afterwards. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f75a4f887a35b99878fc07ed749a90375194b63 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:06 2006 -0800 [PATCH] uml ubd driver: give better names to some functions. To rethink locking, I needed to understand well what each function does. While doing this I renamed some: * ubd_close -> ubd_close_dev (since it pairs with ubd_open_dev) * ubd_new_disk -> ubd_disk_register (it handles registration with the block layer - one hopes this makes clearer the difference with ubd_add()) Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d314e346d6081e8013a96206e601a48528d8f60 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:05 2006 -0800 [PATCH] uml ubd driver: var renames Rename the ubd_dev array to ubd_devs and then call any "struct ubd" ubd_dev instead of dev, which doesn't make clear what we're treating (and no, it's not hungarian notation - not any more than calling all vm_area_struct vma or all inodes inode). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a9d32f682b2b4928dcd4680bc99e98a3d096816 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:04 2006 -0800 [PATCH] uml ubd driver: document some struct fields Add documentation about some fields in struct ubd, whose meaning is non-obvious due to struct names (should change names altogether, I agree). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97d88ac83540f9ba9536326c30db4815c5b9169b Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Oct 30 22:07:03 2006 -0800 [PATCH] uml ubd driver: allow using up to 16 UBD devices With 256 minors and 16 minors used per each UBD device, we can allow the use of up to 16 UBD devices per UML. Also chnage parse_unit and leave to the caller (which already do it) the check for excess numbers, since this is just supposed to do raw parsing. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36a561d6a95c4b89ae4845bf91456b4f784b6eec Author: Andrew Morton Date: Mon Oct 30 22:07:03 2006 -0800 [PATCH] find_bd_holder() fix fs/block_dev.c: In function 'find_bd_holder': fs/block_dev.c:666: warning: return makes integer from pointer without a cast fs/block_dev.c:669: warning: return makes integer from pointer without a cast fs/block_dev.c: In function 'add_bd_holder': fs/block_dev.c:685: warning: unused variable 'tmp' fs/block_dev.c: In function 'bd_claim_by_kobject': fs/block_dev.c:773: warning: assignment makes pointer from integer without a cast Acked-by: Jun'ichi Nomura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b7c2dbc07bf0663a41e3dc838992930019f08fd Author: James Morris Date: Tue Oct 31 00:43:44 2006 -0800 [IPV6]: fix flowlabel seqfile handling There's a bug in the seqfile show operation for flowlabel objects, where each hash chain is traversed cumulatively for each element. The following function is called for each element of each chain: static void ip6fl_fl_seq_show(struct seq_file *seq, struct ip6_flowlabel *fl) { while(fl) { seq_printf... fl = fl->next; } } Thus, objects can appear mutliple times when reading /proc/net/ip6_flowlabel, as the above is called for each element in the chain. The solution is to remove the while() loop from the above, and traverse each chain exactly once, per the patch below. This also removes the ip6fl_fl_seq_show() function, which does nothing else. Signed-off-by: James Morris Signed-off-by: David S. Miller commit 0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea Author: Jack Morgenstein Date: Wed Oct 25 12:54:20 2006 +0200 IB/uverbs: Return sq_draining value in query_qp response Return the sq_draining value back to user space for query_qp instead of the en_sqd_async notify value, which is valid only for modify_qp. For query_qp, the draining status should returned. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit d7b748d63c908a0a85099ce546594192ae0926f6 Author: Steve Wise Date: Mon Oct 30 20:52:53 2006 -0800 IB/amso1100: Fix incorrect pr_debug() pr_debug() was printing the wrong stuff. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 Author: Steve Wise Date: Fri Oct 27 17:28:35 2006 -0500 IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single The Ammasso driver needs to use dma_alloc_coherent() for allocating memory that will be used by the HW for dma. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 04d03bc576f244bfa9692452aab83fa357ac0d57 Author: Paul Mackerras Date: Wed Oct 25 15:28:08 2006 +1000 IB/ehca: Fix eHCA driver compilation for uniprocessor The eHCA driver does not compile for a uniprocessor configuration (CONFIG_SMP=n), due to H_SUCCESS and other symbols being undefined. This fixes it. Signed-off-by: Paul Mackerras Acked-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 255d0c14b3757e8bd85add874e4dca4c3621b39e Author: Krishna Kumar Date: Tue Oct 24 13:22:28 2006 -0700 RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count rdma_bind_addr() leaks a cma_dev reference count in failure case. Signed-off-by: Krishna Kumar Signed-off-by: Sean Hefty commit 2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 Author: Erez Zilber Date: Sun Oct 22 10:28:38 2006 +0200 IB/iser: Start connection after enabling iSER When a connection is started (a new connection or a recovered one), iSER should prepare its resources for full-featured mode and only then notify the iSCSI layer that it is ready to start queueing commands. Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit 4731f2dfd5049b7a2b3b5a7131525f6151855f0d Author: Jamie Lenehan Date: Tue Oct 31 12:36:35 2006 +0900 sh: Titan defconfig update. Small defconfig update for titan for 2.6.19-rc3, adding SH-RTC. Signed-off-by: Jamie Lenehan Signed-off-by: Paul Mundt commit bd71ab88deab3358241f22ed6c035c427aacc4e7 Author: Jamie Lenehan Date: Tue Oct 31 12:35:02 2006 +0900 sh: Fix IPR-IRQ's for IRQ-chip change breakage. The conversion from IPR-IRQ to IRQ-chip resulted in the ipr data being allocated in a local variable in make_ipr_irq - breaking anything using IPR interrupts. This changes all of the callers of make_ipr_irq to allocate a static structure containing the IPR data which is then passed to make_ipr_irq. This removes the need for make_ipr_irq to allocate any additional space for the IPR information. Signed-off-by: Jamie Lenehan Signed-off-by: Paul Mundt commit 1f6c526c409ed7ecdd02469c46ab4b4a50ebec45 Author: Paul Mundt Date: Tue Oct 31 12:33:30 2006 +0900 sh: Update r7780rp_defconfig. Small defconfig updates for R7780RP, enabling SH-RTC. Signed-off-by: Paul Mundt commit 1aea7e00f6b83d32d359aeb8d670f1f7aaa88d55 Author: Kristoffer Ericson Date: Tue Oct 31 11:47:27 2006 +0900 video: Fix include in hp680_bl. The hp6xx.h header moved location, causing the build to fail, fix it up. Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt commit 6887d83d6a537b5002edff7efa1a7c600af0ce26 Author: Paul Mundt Date: Tue Oct 31 11:44:25 2006 +0900 sh: Wire up new syscalls. This wires up sys_move_pages, sys_getcpu, and sys_epoll_pwait. Signed-off-by: Paul Mundt commit ae99a78af33f00565a05dbbc6ca9b247fed002c5 Author: Linus Torvalds Date: Mon Oct 30 19:37:36 2006 -0800 Linux 2.6.19-rc4 Not halloween. Not scary. Just a regular -rc release. commit 5af47db796cb7e06e9bafb0d75ad98693b55f8b6 Author: David S. Miller Date: Mon Oct 30 01:10:20 2006 -0800 [SPARC64]: Add some missing print_symbol() calls. Signed-off-by: David S. Miller commit 9001f2850ff92b52d7654379e7b7feb72f78f161 Author: David S. Miller Date: Sun Oct 29 16:32:31 2006 -0800 [SPARC64]: Fix Tomatillo/Schizo IRQ handling. The code in schizo_irq_trans_init() should set irq_data->sync_reg to the location of the SYNC register if this is Tomatillo, and set it to zero otherwise. But that is not what it is doing. As a result, non-Tomatillo systems were trying to access a non-existent register resulting in bus errors at the first PCI interrupt. Thanks to Roland Stigge for the bug report. Signed-off-by: David S. Miller commit df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc Author: Jun'ichi Nomura Date: Mon Oct 30 16:23:56 2006 -0500 [PATCH] clean up add_bd_holder() add_bd_holder() is called from bd_claim_by_kobject to put a given struct bd_holder in the list if there is no matching entry. There are 3 possible results of add_bd_holder(): 1. there is no matching entry and add the given one to the list 2. there is matching entry, so just increment reference count of the existing one 3. something failed during its course 1 and 2 are successful cases. But for case 2, someone has to free the unused struct bd_holder. The current code frees it inside of add_bd_holder and returns same value 0 for both cases 1 and 2. However, it's natural and less error-prone if caller frees it since it's allocated by the caller. Signed-off-by: Jun'ichi Nomura Signed-off-by: Linus Torvalds commit bcb55165d3d1ae3ec95807d118fd6d5956cd127b Author: Jun'ichi Nomura Date: Mon Oct 30 16:23:45 2006 -0500 [PATCH] fix bd_claim_by_kobject error handling This fixes bd_claim_by_kobject to release bdev correctly in case that bd_claim succeeds but following add_bd_holder fails. Signed-off-by: Jun'ichi Nomura Signed-off-by: Linus Torvalds commit c6817e4c32d8c4118405d2dec30ac1c264349085 Author: James Morris Date: Mon Oct 30 18:56:06 2006 -0800 [IPV6]: return EINVAL for invalid address with flowlabel lease request Currently, when an application requests a lease for a flowlabel via the IPV6_FLOWLABEL_MGR socket option, no error is returned if an invalid type of destination address is supplied as part of the request, leading to a silent failure. This patch ensures that EINVAL is returned to the application in this case. Signed-off-by: James Morris Signed-off-by: David S. Miller commit de76e695a5ce19c121ba7e246b45f258be678a75 Author: Vlad Yasevich Date: Mon Oct 30 18:55:11 2006 -0800 [SCTP]: Remove temporary associations from backlog and hash. Every time SCTP creates a temporary association, the stack hashes it, puts it on a list of endpoint associations and increments the backlog. However, the lifetime of a temporary association is the processing time of a current packet and it's destroyed after that. In fact, we don't really want anyone else finding this association. There is no reason to do this extra work. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 4f4443088b763ca4ac7521e9b4a881b52c294dec Author: Vlad Yasevich Date: Mon Oct 30 18:54:32 2006 -0800 [SCTP]: Correctly set IP id for SCTP traffic Make SCTP 1-1 style and peeled-off associations behave like TCP when setting IP id. In both cases, we set the inet_sk(sk)->daddr and initialize inet_sk(sk)->id to a random value. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit f8687afefcc821fc47c75775eec87731fe3de360 Author: Paul Moore Date: Mon Oct 30 15:22:15 2006 -0800 [NetLabel]: protect the CIPSOv4 socket option from setsockopt() This patch makes two changes to protect applications from either removing or tampering with the CIPSOv4 IP option on a socket. The first is the requirement that applications have the CAP_NET_RAW capability to set an IPOPT_CIPSO option on a socket; this prevents untrusted applications from setting their own CIPSOv4 security attributes on the packets they send. The second change is to SELinux and it prevents applications from setting any IPv4 options when there is an IPOPT_CIPSO option already present on the socket; this prevents applications from removing CIPSOv4 security attributes from the packets they send. Signed-off-by: Paul Moore Signed-off-by: James Morris Signed-off-by: David S. Miller commit 920b868ae1dfdac77c5e8c97e7067b23680f043e Author: Dmitry Mishin Date: Mon Oct 30 15:14:27 2006 -0800 [NETFILTER]: ip_tables: compat code module refcounting fix This patch fixes bug in iptables modules refcounting on compat error way. As we are getting modules in check_compat_entry_size_and_hooks(), in case of later error, we should put them all in translate_compat_table(), not in the compat_copy_entry_from_user() or compat_copy_match_from_user(), as it is now. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c073e3fa8b7f9841aa6451885f135656d455f511 Author: Martin Josefsson Date: Mon Oct 30 15:13:58 2006 -0800 [NETFILTER]: nf_conntrack: add missing unlock in get_next_corpse() Add missing unlock in get_next_corpse() in nf_conntrack. It was missed during the removal of listhelp.h . Also remove an unneeded use of nf_ct_tuplehash_to_ctrack() in the same function. Should be applied before 2.6.19 is released. Signed-off-by: Martin Josefsson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ef4512e76679b4f4997f60f93f8a576a0d20c26b Author: Vasily Averin Date: Mon Oct 30 15:13:28 2006 -0800 [NETFILTER]: ip_tables: compat error way cleanup This patch adds forgotten compat_flush_offset() call to error way of translate_compat_table(). May lead to table corruption on the next compat_do_replace(). Signed-off-by: Vasily Averin Acked-by: Dmitry Mishin Acked-by: Kirill Korotaev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 590bdf7fd2292b47c428111cb1360e312eff207e Author: Dmitry Mishin Date: Mon Oct 30 15:12:55 2006 -0800 [NETFILTER]: Missed and reordered checks in {arp,ip,ip6}_tables There is a number of issues in parsing user-provided table in translate_table(). Malicious user with CAP_NET_ADMIN may crash system by passing special-crafted table to the *_tables. The first issue is that mark_source_chains() function is called before entry content checks. In case of standard target, mark_source_chains() function uses t->verdict field in order to determine new position. But the check, that this field leads no further, than the table end, is in check_entry(), which is called later, than mark_source_chains(). The second issue, that there is no check that target_offset points inside entry. If so, *_ITERATE_MATCH macro will follow further, than the entry ends. As a result, we'll have oops or memory disclosure. And the third issue, that there is no check that the target is completely inside entry. Results are the same, as in previous issue. Signed-off-by: Dmitry Mishin Acked-by: Kirill Korotaev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 844dc7c88046ecd2e52596730d7cc400d6c3ad67 Author: Patrick McHardy Date: Mon Oct 30 15:12:16 2006 -0800 [NETFILTER]: remove masq/NAT from ip6tables Kconfig help Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bcd620757d3a4ae78ef0ca41adb5d9e400ed92b6 Author: James Morris Date: Mon Oct 30 15:08:42 2006 -0800 [IPV6]: fix lockup via /proc/net/ip6_flowlabel There's a bug in the seqfile handling for /proc/net/ip6_flowlabel, where, after finding a flowlabel, the code will loop forever not finding any further flowlabels, first traversing the rest of the hash bucket then just looping. This patch fixes the problem by breaking after the hash bucket has been traversed. Note that this bug can cause lockups and oopses, and is trivially invoked by an unpriveleged user. Signed-off-by: James Morris Signed-off-by: David S. Miller commit a27b58fed90cc5654e2daf1d292cc5bc61be4dd7 Author: Heiko Carstens Date: Mon Oct 30 15:06:12 2006 -0800 [NET]: fix uaccess handling Signed-off-by: Heiko Carstens Signed-off-by: David S. Miller commit 28cd7752734563d5b0967b96a6bade7a1dc89c7f Author: Herbert Xu Date: Sun Oct 29 23:46:42 2006 -0800 [SCTP]: Always linearise packet on input I was looking at a RHEL5 bug report involving Xen and SCTP (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=212550). It turns out that SCTP wasn't written to handle skb fragments at all. The absence of any calls to skb_may_pull is testament to that. It just so happens that Xen creates fragmented packets more often than other scenarios (header & data split when going from domU to dom0). That's what caused this bug to show up. Until someone has the time sits down and audits the entire net/sctp directory, here is a conservative and safe solution that simply linearises all packets on input. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c20e3945c761502b9d5d73ef0ff5f1a84b3a717e Author: David S. Miller Date: Sun Oct 29 16:14:55 2006 -0800 [ETH1394]: Fix unaligned accesses. Several u64 objects are derefernced in situations where the pointer is not guarenteed to be aligned correctly. Use get_unaligned() as needed. Thanks to Will Simoneau for lots of testing and debugging help. Signed-off-by: David S. Miller Acked-by: Stefan Richter commit 234af4840135342ab295b4e1219fd35c27fdd439 Author: Randy Dunlap Date: Sun Oct 29 16:03:30 2006 -0800 [DCCP]: fix printk format warnings Fix printk format warnings: build2.out:net/dccp/ccids/ccid2.c:355: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:360: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:482: warning: long long unsigned int format, u64 arg (arg 5) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 4) build2.out:net/dccp/ccids/ccid2.c:674: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:720: warning: long long unsigned int format, u64 arg (arg 3) Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c8884edd078748905552d667857259e5358e1232 Author: Herbert Xu Date: Sun Oct 29 15:59:41 2006 -0800 [NET]: Fix segmentation of linear packets skb_segment fails to segment linear packets correctly because it tries to write all linear parts of the original skb into each segment. This will always panic as each segment only contains enough space for one MSS. This was not detected earlier because linear packets should be rare for GSO. In fact it still remains to be seen what exactly created the linear packets that triggered this bug. Basically the only time this should happen is if someone enables GSO emulation on an interface that does not support SG. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 54489c14c058822f7019648b3718bd3820dee802 Author: David S. Miller Date: Fri Oct 27 15:29:47 2006 -0700 [XFRM] xfrm_user: Fix unaligned accesses. Use memcpy() to move xfrm_address_t objects in and out of netlink messages. The vast majority of xfrm_user was doing this properly, except for copy_from_user_state() and copy_to_user_state(). Signed-off-by: David S. Miller commit 201a95afaa324b23188eeec268f6bb0b4b70b710 Author: David S. Miller Date: Fri Oct 27 15:26:21 2006 -0700 [APPLETALK]: Fix potential OOPS in atalk_sendmsg(). atrtr_find() can return NULL, so do not blindly dereference rt->dev before we check for rt being NULL. Signed-off-by: David S. Miller commit d458fd82c9bb536e4a582955e88554a02a92bf78 Author: Randy Dunlap Date: Thu Oct 26 17:15:20 2006 -0700 [NET] sealevel: uses arp_broken_ops On Wed, 25 Oct 2006 18:03:13 +0200 Toralf Förster wrote: > WARNING: "arp_broken_ops" [drivers/net/wan/sealevel.ko] undefined! > make[1]: *** [__modpost] Error 1 > make: *** [modules] Error 2 > > Here's the config: ... > # CONFIG_INET is not set > CONFIG_SEALEVEL_4021=m Sealevel uses arp_broken_ops so it needs to depend on INET. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 Author: Steve French Date: Mon Oct 30 21:46:13 2006 +0000 [CIFS] Allow null user connections Some servers are configured to only allow null user mounts for guest access. Allow nul user (anonymous) mounts e.g. mount -t cifs //server/share /mnt -o username= Signed-off-by: Steve French commit 7ca85ba752e521f1b5ead1f3b91c562cc3910c7b Author: Steve French Date: Mon Oct 30 21:42:57 2006 +0000 [CIFS] Fix readdir breakage when blocksize set too small Do not treat filldir running out of space as an error that needs to be returned. Fixes Redhat bugzilla bug # 211070 Signed-off-by: Steve French commit 21e9ac7b2dd96dfca997313bae6d9a8f642635c7 Author: Ralf Baechle Date: Mon Oct 30 21:38:22 2006 +0000 [MIPS] MIPS doesn't need compat_sys_getdents. Signed-off-by: Ralf Baechle commit e52331845784daeefb78ab3b13efce51af3255bc Author: Ralf Baechle Date: Mon Oct 30 15:32:27 2006 +0000 [MIPS] JMR3927: Fixup another victim of the irq pt_regs cleanup. Signed-off-by: Ralf Baechle commit 77aec99906367276afedf6f5583671de2ff609be Author: Ralf Baechle Date: Mon Oct 30 14:59:54 2006 +0000 [MIPS] EMMA 2 / Markeins: struct resource takes physical addresses. Signed-off-by: Ralf Baechle commit 4aad7b726996a2d453d210cd5691730aca087b83 Author: Ralf Baechle Date: Mon Oct 30 14:47:21 2006 +0000 [MIPS] EMMA 2 / Markeins: Convert to name struct resource initialization. This fixes the wreckage caused by shuffeling the order of struct resource members. Signed-off-by: Ralf Baechle commit e30e66becaa237d1753d148703cf8f1301ab27f0 Author: Ralf Baechle Date: Mon Oct 30 14:30:07 2006 +0000 [MIPS] EMMA 2 / Markeins: Formitting fixes split from actual address fixes. Signed-off-by: Ralf Baechle commit 408d3258f99458f2dabcb1aa33918250e4864f00 Author: Ralf Baechle Date: Mon Oct 30 14:19:37 2006 +0000 [MIPS] EMMA 2 / Markeins: Fix build wreckage due to genirq wreckage. I wonder if the original contributor still cares ... Signed-off-by: Ralf Baechle commit 6ceb6d3ab2d402cea326320a4143db90a66fd216 Author: Ralf Baechle Date: Mon Oct 30 12:52:16 2006 +0000 [MIPS] Ocelot G: Fix build error and numerous warnings. The cause of the build errors was a 64-bit kernel being configured in ocelot_g_defconfig without the code being 64-bit proof. Fixed for now by limiting 64-bit selection to SYS_SUPPORTS_64BIT_KERNEL if BROKEN. Signed-off-by: Ralf Baechle commit c39c30da2dad1aa3fb61862039634e9480a16fde Author: Yoichi Yuasa Date: Sun Oct 29 23:37:55 2006 +0900 [MIPS] Fix return value of TXX9 SPI interrupt handler Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit a597a473b422f5a69b1f567f12e04db39fa01f39 Author: Yoichi Yuasa Date: Sun Oct 29 23:37:40 2006 +0900 [MIPS] Au1000: Fix warning about unused variable. arch/mips/au1000/common/time.c: In function `mips_timer_interrupt': arch/mips/au1000/common/time.c:82: warning: unused variable `count' Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 991ea26dcbc2524a054f37911ea375e631cb8891 Author: Ralf Baechle Date: Sun Oct 29 21:07:40 2006 +0000 [MIPS] Wire up getcpu(2) and epoll_wait(2) syscalls. Signed-off-by: Ralf Baechle commit 9448b8f6a014f46450ef65d81c0be2ca5a81c867 Author: Manish Lachwani Date: Thu Oct 5 16:30:44 2006 -0700 [MIPS] Make SB1 cache flushes not to use on_each_cpu This fixes the start_kernel(): bug: interrupts were enabled early messages. Signed-off-by: Manish Lachwani Signed-off-by: Ralf Baechle commit f0ec69e52989986e861a352099803cbb77ca53ba Author: Yoichi Yuasa Date: Sat Oct 28 00:42:24 2006 +0900 [MIPS] Fix warning about unused definition in c-sb1.c arch/mips/mm/c-sb1.c: In function `sb1_cache_init': arch/mips/mm/c-sb1.c:447: warning: unused variable `handle_vec2_sb1' Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 8cde4a3162fdcccaf0ecbf3c21cdb13df422936d Author: Ralf Baechle Date: Thu Oct 26 14:29:01 2006 +0100 [MIPS] SMTC: Make 8 the default number of processors. 8 is the next larger power of two of the currently 5 supported TCs. Signed-off-by: Ralf Baechle commit ea3df4ac7d4adad915e2d0431a9407b10617114c Author: Ralf Baechle Date: Mon Oct 23 23:21:21 2006 +0100 [MIPS] Oprofile: Fix MIPSxx counter number detection. Signed-off-by: Ralf Baechle commit 53c1b192ece077e1c3892e6afb453ab6f009af81 Author: Sergei Shtylyov Date: Sun Sep 3 22:17:10 2006 +0400 [MIPS] Au1xx0 code sets incorrect mips_hpt_frequency Alchemy CPU counter ticks at the full CPU clock speed. Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit be609f3546d3dd96afd7df8856a91fa2b8825fbc Author: Ralf Baechle Date: Mon Oct 23 13:22:06 2006 +0100 [MIPS] Oprofile: fix on non-VSMP / non-SMTC SMP configurations. Signed-off-by: Ralf Baechle commit a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 Author: Albert Cahalan Date: Sun Oct 29 22:26:17 2006 -0500 [PATCH] fix i386 regparm=3 RT signal handlers on x86_64 The recent change to make x86_64 support i386 binaries compiled with -mregparm=3 only covered signal handlers without SA_SIGINFO. (the 3-arg "real-time" ones) This is useful for klibc at least. Signed-off-by: Albert Cahalan Signed-off-by: Linus Torvalds commit 202dd450246cd658e298a86dddca5592fcb898cd Author: Andrew Morton Date: Sun Oct 29 22:57:57 2006 -0800 [PATCH] fix "sunrpc: fix refcounting problems in rpc servers" - printk should remain dprintk - fix coding-style. Cc: Neil Brown Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4b23e9833f0816b57d07401eac5e184b627fd7 Author: Kristian Mueller Date: Sun Oct 29 22:46:46 2006 -0800 [PATCH] APM: URL of APM 1.2 specs has changed APM BIOS Interface Secification can now be found at http://www.microsoft.com/whdc/archive/amp_12.mspx Signed-off-by: Kristian Mueller Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6740df98e12a8e49ef3a699dcc1e2913f22c51b Author: Neil Brown Date: Sun Oct 29 22:46:45 2006 -0800 [PATCH] sunrpc: fix refcounting problems in rpc servers A recent patch fixed a problem which would occur when the refcount on an auth_domain reached zero. This problem has not been reported in practice despite existing in two major kernel releases because the refcount can never reach zero. This patch fixes the problems that stop the refcount reaching zero. 1/ We were adding to the refcount when inserting in the hash table, but only removing from the hashtable when the refcount reached zero. Obviously it never would. So don't count the implied reference of being in the hash table. 2/ There are two paths on which a socket can be destroyed. One called svcauth_unix_info_release(). The other didn't. So when the other was taken, we can lose a reference to an ip_map which in-turn holds a reference to an auth_domain So unify the exit paths into svc_sock_put. This highlights the fact that svc_delete_socket has slightly odd semantics - it does not drop a reference but probably should. Fixing this need a bit more thought and testing. Signed-off-by: Neil Brown Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b52c9590d5ad2fb67b720ec12018dd2cf061480 Author: Sergey Vlasov Date: Sun Oct 29 22:46:44 2006 -0800 [PATCH] drivers/ide/pci/generic.c: add missing newline to the all-generic-ide message Signed-off-by: Sergey Vlasov Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 Author: Oleg Nesterov Date: Sun Oct 29 22:46:43 2006 -0800 [PATCH] xacct_add_tsk: fix pure theoretical ->mm use-after-free Paranoid fix. The task can free its ->mm after the 'if (p->mm)' check. Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d45e44d4be60ef508579001792f33753b5cb6d36 Author: akpm@osdl.org Date: Sun Oct 29 22:46:42 2006 -0800 [PATCH] uml: fix compilation options for USER_OBJS From: Jeff Dike , Paolo Giarrusso Make sure that when compiling USER_OBJS the correct compilation options are passed; since they are compiled with USER_CFLAGS which is derived from CFLAGS, make sure it is a recursively evaluated variable, so that changes to CFLAGS done afterwards the inclusion of arch/$(ARCH)/Makefile are reflected in USER_CFLAGS. For instance, without this patch userspace objects are never compiled with debug info active. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b428b51ed9a4ff8445ea50769961f948480c1d36 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 29 22:46:41 2006 -0800 [PATCH] Fix "Remove the use of _syscallX macros in UML" Fix commit 5f4c6bc1f369f20807a8e753c2308d1629478c61: it spits out warnings about missing syscall prototype (it is in ) and it does not recognize that two uses of _syscallX are to be resolved against kernel headers in the source tree, not against _syscallX; they in fact do not compile and would not work anyway. If _syscallX macros will be removed from the kernel tree altogether, the only reasonable solution for that piece of code is switching to open-coded inline assembly (it's remapping the whole executable from memory, except the page containing this code). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbb5bbb037812ba36d638014a93134148a568684 Author: Randy Dunlap Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] docbook: make a filesystems book Make a filesystems DocBook book/file by moving all filesystems info from kernel-api.tmpl. Will also merge journal-api.tmpl into it soon (with permission from Roger Gammans). Localizes filesystem info and reduces size of the huge (produced) kernel-api output files. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 351edd240d0ba8620789ca9e24f5a38b62157f23 Author: Randy Dunlap Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] MTD: fix last kernel-doc warning Fix the last current kernel-doc warning: Warning(/var/linsrc/linux-2619-rc3g5//include/linux/mtd/nand.h:416): No description found for parameter 'write_page' Signed-off-by: Randy Dunlap Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8da1f746588ba997734274b4aadc5ae501fbd88 Author: Alexey Dobriyan Date: Sun Oct 29 22:46:39 2006 -0800 [PATCH] cryptocop: double spin_lock_irqsave() Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7259f0d05d595b73ef312a082e628627c6414969 Author: Peter Zijlstra Date: Sun Oct 29 22:46:36 2006 -0800 [PATCH] lockdep: annotate DECLARE_WAIT_QUEUE_HEAD kernel: INFO: trying to register non-static key. kernel: the code is fine but needs lockdep annotation. kernel: turning off the locking correctness validator. kernel: [] show_trace_log_lvl+0x58/0x16a kernel: [] show_trace+0xd/0x10 kernel: [] dump_stack+0x19/0x1b kernel: [] __lock_acquire+0xf0/0x90d kernel: [] lock_acquire+0x4b/0x6b kernel: [] _spin_lock_irqsave+0x22/0x32 kernel: [] prepare_to_wait+0x17/0x4b kernel: [] lpfc_do_work+0xdd/0xcc2 [lpfc] kernel: [] kthread+0xc3/0xf2 kernel: [] kernel_thread_helper+0x5/0xb Another case of non-static lockdep keys; duplicate the paradigm set by DECLARE_COMPLETION_ONSTACK and introduce DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Signed-off-by: Peter Zijlstra Cc: Greg KH Cc: Markus Lidel Acked-by: Ingo Molnar Cc: Arjan van de Ven Cc: James Bottomley Cc: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70812522b847bdb8fabee963191734f5fa3143f3 Author: Akinobu Mita Date: Sun Oct 29 22:46:35 2006 -0800 [PATCH] isdn/gigaset: avoid cs->dev null pointer dereference When gigaset_initbcs() is called, cs->dev is not initialized yet. If dev_alloc_skb() failed in this function, NULL poinster dereference will happen at dev_warn(). Cc: Kai Germaschewski Cc: Hansjoerg Lipp Cc: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf Author: Randy Dunlap Date: Sun Oct 29 22:46:34 2006 -0800 [PATCH] ndiswrapper: don't set the module->taints flags For ndiswrapper, don't set the module->taints flags, just set the kernel global tainted flag. This should allow ndiswrapper to continue to use GPL symbols. Signed-off-by: Randy Dunlap Cc: Florin Malita Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b Author: Andrew Morton Date: Sun Oct 29 22:46:33 2006 -0800 [PATCH] ioc4_serial: irq flags fix Use the correct type for the CPU flags. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37af6560f7978c60791b5f3df17ce8b3e97f2d6e Author: Christophe Saout Date: Mon Oct 30 20:39:08 2006 +0100 [PATCH] Fix dmsetup table output change Fix dm-crypt after the block cipher API changes to correctly return the backwards compatible cipher-chainmode[-ivmode] format for "dmsetup table". Signed-off-by: Christophe Saout Cc: Alasdair G Kergon Cc: Herbert Xu Signed-off-by: Linus Torvalds diff linux-2.6.19-rc3.orig/drivers/md/dm-crypt.c linux-2.6.19-rc3/drivers/md/dm-crypt.c commit c1b707d253fe918b92882cff1dbd926b47e14fd2 Author: Jens Axboe Date: Mon Oct 30 19:54:23 2006 +0100 [PATCH] CFQ: bad locking in changed_ioprio() When the ioprio code recently got juggled a bit, a bug was introduced. changed_ioprio() is no longer called with interrupts disabled, so using plain spin_lock() on the queue_lock is a bug. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 0261d6886eb5822867a5310dc1e4479b940a1942 Author: Jens Axboe Date: Mon Oct 30 19:07:48 2006 +0100 [PATCH] CFQ: use irq safe locking in cfq_cic_link() If cfq_set_request() is called for a new process AND a non-fs io request (so that __GFP_WAIT may not be set), cfq_cic_link() may use spin_lock_irq() and spin_unlock_irq() with interrupts already disabled. Fix is to always use irq safe locking in cfq_cic_link() Acked-By: Arjan van de Ven Acked-by: Ingo Molnar Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 89f68225876db7df638de2884b561facb1870239 Author: Daniel Drake Date: Mon Oct 30 11:47:02 2006 -0600 jfs: Add splice support This allows the splice() and tee() syscalls to be used with JFS. Signed-off-by: Daniel Drake Signed-off-by: Dave Kleikamp commit 209ad53bc19667a128d9c51beba873a5c62bff6e Author: Linus Torvalds Date: Sun Oct 29 17:31:49 2006 -0800 Revert "r8169: mac address change support" This reverts commit a2b98a697fa4e7564f78905b83db122824916cf9. As per Guennadi Liakhovetski, the mac address change support code breaks some normal uses (_without_ any address changes), and until it's all sorted out, we're better off without it. Says Francois: "Go revert it. Despite what I claimed, I can not find a third-party confirmation by email that it works elsewhere. It would probably be enough to remove the call to __rtl8169_set_mac_addr() in rtl8169_hw_start() though." See also http://bugzilla.kernel.org/show_bug.cgi?id=6032 Cc: Guennadi Liakhovetski Acked-by: Francois Romieu Signed-off-by: Linus Torvalds commit 9f0f9313cec8c76c89bc8a68653f928fa12fab96 Author: Kristoffer Ericson Date: Sun Oct 29 22:38:08 2006 +0100 [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) "K4S281632b-1H" should read "K4S281632B-1H" (As it does everywhere else). No more coffe! Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd Author: Akinobu Mita Date: Sun Oct 29 03:43:19 2006 +0900 [WATCHDOG] sc1200wdt.c pnp unregister fix. If no devices found or invalid parameter is specified, scl200wdt_pnp_driver is left unregistered. It breaks global list of pnp drivers. Signed-off-by: Akinobu Mita Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 Author: Geert Uytterhoeven Date: Sun Oct 29 11:21:51 2006 +0100 [PATCH] m68k: consolidate initcall sections Commit 61ce1efe6e40233663d27ab8ac9ba9710eebcaad missed the m68k initcall sections. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 3d8334def5cf831d2ed438aae021696a2faa4ddd Author: Oleg Nesterov Date: Sun Oct 29 18:57:16 2006 +0300 [PATCH] taskstats: fix sk_buff size calculation prepare_reply() adds GENL_HDRLEN to the payload (genlmsg_total_size()), but then it does genlmsg_put()->nlmsg_put(). This means we forget to reserve a room for 'struct nlmsghdr'. Signed-off-by: Oleg Nesterov Cc: Thomas Graf Cc: Andrew Morton Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Linus Torvalds commit d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 Author: Oleg Nesterov Date: Sun Oct 29 16:45:58 2006 +0300 [PATCH] taskstats: fix sk_buff leak 'return genlmsg_cancel()' in taskstats_user_cmd/taskstats_exit_send potentially leaks a skb. Unless we pass 'rep_skb' to the netlink layer we own sk_buff. This means we should always do kfree_skb() on failure. [ Thomas acked and pointed out missing return value in original version ] Signed-off-by: Oleg Nesterov Acked-by: Thomas Graf Cc: Andrew Morton Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Linus Torvalds commit 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 Author: Stefan Richter Date: Sun Oct 29 19:52:49 2006 +0100 ieee1394: ohci1394: revert fail on error in suspend Some errors during preparation for suspended state can be skipped with a warning instead of a failure of the whole suspend transition, notably an error in pci_set_power_state. Signed-off-by: Stefan Richter commit 811c9a4b618ffc7de097490f8dc61b43b8464b9c Author: Lennert Buytenhek Date: Sun Oct 29 14:15:10 2006 +0100 [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port The second ethernet port on the Thecus n2100 was incorrectly assigned to XINT1 instead of the correct XINT3 (PCI INTB instead of INTD), which caused that port to be non-functional. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 5211e6e6c671f0d4b1e1a1023384d20227d8ee65 Author: Giridhar Pemmasani Date: Sun Oct 29 04:46:55 2006 -0800 [PATCH] Fix GFP_HIGHMEM slab panic As reported by Martin J. Bligh , we let through some non-slab bits to slab allocation through __get_vm_area_node when doing a vmalloc. I haven't been able to reproduce this, although I understand why it happens: vmalloc allocates memory with GFP_KERNEL | __GFP_HIGHMEM and commit 52fd24ca1db3a741f144bbc229beefe044202cac resulted in the same flags are passed down to cache_alloc_refill, causing the BUG. The following patch fixes it. Note that when calling kmalloc_node, I am masking off __GFP_HIGHMEM with GFP_LEVEL_MASK, whereas __vmalloc_area_node does the same with ~(__GFP_HIGHMEM | __GFP_ZERO). IMHO, using GFP_LEVEL_MASK is preferable, but either should fix this problem. Signed-off-by: Giridhar Pemmasani (pgiri@yahoo.com) Cc: Martin J. Bligh Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 51342d7126342e1f1a40cd96a5798a3cfd6136eb Author: Russell King Date: Sun Oct 29 12:51:05 2006 +0000 [ARM] Add KBUILD_IMAGE target support Add support for KBUILD_IMAGE on ARM. This takes the usual target specifiers (zImage/Image/etc) in the same way that powerpc does (iow, without the arch/arm/boot prefix). Signed-off-by: Russell King commit 9468613b2bb0a386af563953b613efc6c77bd8c1 Author: Russell King Date: Sat Oct 28 22:42:56 2006 +0100 [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver The PXA2xx PCMCIA driver was registering a device_driver with the platform_bus_type. Unfortunately, this causes data outside the device_driver structure to be dereferenced as if it were a platform_driver structure, causing an oops. Convert the PXA2xx core driver to use the proper platform_driver structure. Signed-off-by: Russell King commit 84b5abe69ff600a559e1a1fa29f1edad707d4e2f Author: Russell King Date: Sat Oct 28 22:30:17 2006 +0100 [ARM] Fix i2c-pxa slave mode support i2c-pxa times out when trying to enable slave mode due to an incorrect test. Also, check that i2c->slave is non-NULL before dereferencing it. Signed-off-by: Russell King commit 0c6cb974636dd29681b03f8eb0ae227decab01fb Author: Mel Gorman Date: Sat Oct 28 10:38:59 2006 -0700 [PATCH] Calculation fix for memory holes beyong the end of physical memory absent_pages_in_range() made the assumption that users of the arch-independent zone-sizing API would not care about holes beyound the end of physical memory. This was not the case and was "fixed" in a patch called "Account for holes that are outside the range of physical memory". However, when given a range that started before a hole in "real" memory and ended beyond the end of memory, it would get the result wrong. The bug is in mainline but a patch is below. It has been tested successfully on a number of machines and architectures. Additional credit to Keith Mannthey for discovering the problem, helping identify the correct fix and confirming it Worked For Him. Signed-off-by: Mel Gorman Cc: keith mannthey Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 057647fc47b3a5fbcfa997041db3f483d506603c Author: Alan Stern Date: Sat Oct 28 10:38:58 2006 -0700 [PATCH] workqueue: update kerneldoc This patch (as812) changes the kerneldoc comments explaining the return values from queue_work(), queue_delayed_work(), and queue_delayed_work_on(). The updated comments explain more accurately the meaning of the return code and avoid suggesting that a 0 value means the routine was unsuccessful. Signed-off-by: Alan Stern Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c333526f489044be2b93085720eb898f0037b346 Author: Alan Cox Date: Sat Oct 28 10:38:57 2006 -0700 [PATCH] JMB 368 PATA detection The Jmicron JMB368 is PATA only so has the PATA on function zero. Don't therefore skip function zero on this device when probing Signed-off-by: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fa1d7d3b2c51594c0f3aa151983dd51f605e07d Author: Satoru Takeuchi Date: Sat Oct 28 10:38:57 2006 -0700 [PATCH] cpu-hotplug: release `workqueue_mutex' properly on CPU hot-remove _cpu_down() acquires `workqueue_mutex' on its process, but doen't release it if __cpu_disable() fails. Signed-off-by: Satoru Takeuchi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb1d860551c4307b1a7ee9a21b120319075e987e Author: Jim Houston Date: Sat Oct 28 10:38:56 2006 -0700 [PATCH] time_adjust cleared before use I notice that the code which implements adjtime clears the time_adjust value before using it. The attached patch makes the obvious fix. Acked-by: Roman Zippel Signed-off-by: Jim Houston Cc: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eba6cd671427df295c10b54ee69cd5de419d38fe Author: Randy Dunlap Date: Sat Oct 28 10:38:55 2006 -0700 [PATCH] move SYS_HYPERVISOR inside the Generic Driver menu Put SYS_HYPERVISOR inside the Generic Driver Config menu where it should be. Otherwise xconfig displays it as a dangling (lost) menu item under Device Drivers, all by itself (when all options are displayed). Signed-off-by: Randy Dunlap Cc: Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7c3f5f231c60d7e6ada5770b536df2b3ec1bd08 Author: Oleg Nesterov Date: Sat Oct 28 10:38:54 2006 -0700 [PATCH] fill_tgid: cleanup delays accounting fill_tgid() should skip not only an already exited group leader. If the task has ->exit_state != 0 it already did exit_notify(), so it also did fill_tgid_exit()->delayacct_add_tsk(->signal->stats) and we should skip it to avoid a double accounting. This patch doesn't close the race completely, but it cleanups the code. Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a98b6094261c0112e9c455c96995972181bff049 Author: Oleg Nesterov Date: Sat Oct 28 10:38:54 2006 -0700 [PATCH] taskstats: don't use tasklist_lock Remove tasklist_lock from taskstats.c. find_task_by_pid() is rcu-safe. ->siglock allows us to traverse subthread without tasklist. Q: delay accounting looks wrong to me. If sub-thread has already called taskstats_exit_send() but didn't call release_task(self) yet it will be accounted twice. The window is big. No? Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8534d7bd89df0cd41cd47bcd6733a05ea9a691a Author: Oleg Nesterov Date: Sat Oct 28 10:38:53 2006 -0700 [PATCH] taskstats: kill ->taskstats_lock in favor of ->siglock signal_struct is (mostly) protected by ->sighand->siglock, I think we don't need ->taskstats_lock to protect ->stats. This also allows us to simplify the locking in fill_tgid(). Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17b02695b254aa2ef0e53df9c8e6548f86e66a9d Author: Oleg Nesterov Date: Sat Oct 28 10:38:52 2006 -0700 [PATCH] taskstats_tgid_alloc: optimization Every subthread (except first) does unneeded kmem_cache_alloc/kmem_cache_free. Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 093a8e8aecd77b2799934996a55a6838e1e2b8f3 Author: Oleg Nesterov Date: Sat Oct 28 10:38:51 2006 -0700 [PATCH] taskstats_tgid_free: fix usage taskstats_tgid_free() is called on copy_process's error path. This is wrong. IF (clone_flags & CLONE_THREAD) We should not clear ->signal->taskstats, current uses it, it probably has a valid accumulated info. ELSE taskstats_tgid_init() set ->signal->taskstats = NULL, there is nothing to free. Move the callsite to __exit_signal(). We don't need any locking, entire thread group is exiting, nobody should have a reference to soon to be released ->signal. Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05d5bcd60e8202e5c7b28cf61186043a4d612623 Author: Oleg Nesterov Date: Sat Oct 28 10:38:50 2006 -0700 [PATCH] bacct_add_tsk: fix unsafe and wrong parent/group_leader dereference 1. ts = timespec_sub(uptime, current->group_leader->start_time); It is possible that current != tsk. Probably it was supposed to be 'tsk->group_leader->start_time. But why we are reading group_leader's start_time ? This accounting is per thread, not per procees, I changed this to 'tsk->start_time. Please corect me. 2. stats->ac_ppid = (tsk->parent) ? tsk->parent->pid : 0; tsk->parent never == NULL, and it is unsafe to dereference it. Both the task and it's parent may exit after the caller unlocks tasklist_lock, the memory could be unmapped (DEBUG_SLAB). (And we should use ->real_parent->tgid in fact). Q: I don't understand the 'if (thread_group_leader(tsk))' check. Why it is needed ? Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Acked-by: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fca178c0c6e8d52a1875be36b070f30884ebfae9 Author: Oleg Nesterov Date: Sat Oct 28 10:38:49 2006 -0700 [PATCH] fill_tgid: fix task_struct leak and possible oops 1. fill_tgid() forgets to do put_task_struct(first). 2. release_task(first) can happen after fill_tgid() drops tasklist_lock, it is unsafe to dereference first->signal. This is a temporary fix, imho the locking should be reworked. Signed-off-by: Oleg Nesterov Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jay Lan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6d9fa6f95e382bb2d5725dda18b9e811418e79 Author: Michael Holzheu Date: Sat Oct 28 10:38:47 2006 -0700 [PATCH] strstrip remove last blank fix strstrip() does not remove the last blank from strings which only consist of blanks. Example: char string[] = " "; strstrip(string); results in " ", but should produce an empty string! The following patch solves this problem: Acked-by: Martin Schwidefsky Signed-off-by: Michael Holzheu Acked-by: Pekka Enberg Acked-by Joern Engel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fa3839a64203b2ab727dcb37da9b2d7079fca28 Author: Stephen Rothwell Date: Sat Oct 28 10:38:46 2006 -0700 [PATCH] Constify compat_get_bitmap argument This means we can call it when the bitmap we want to fetch is declared const. Signed-off-by: Stephen Rothwell Cc: Christoph Lameter Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f87135762de4328c6f17897e803e6909bc056feb Author: David Howells Date: Sat Oct 28 10:38:46 2006 -0700 [PATCH] VFS: Fix an error in unused dentry counting With Vasily Averin Fix an error in unused dentry counting in shrink_dcache_for_umount_subtree() in which the count is modified without the dcache_lock held. Signed-off-by: David Howells Cc: Vasily Averin Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6eac3f93f5e6b7256fb20b7608d62ec192da12be Author: Vasily Averin Date: Sat Oct 28 10:38:44 2006 -0700 [PATCH] missing unused dentry in prune_dcache()? On the the following patch: http://linux.bkbits.net:8080/linux-2.6/gnupatch@449b144ecSF1rYskg3q-SeR2vf88zg # ChangeSet # 2006/06/22 15:05:57-07:00 neilb@suse.de # [PATCH] Fix dcache race during umount # If prune_dcache finds a dentry that it cannot free, it leaves it where it # is (at the tail of the list) and exits, on the assumption that some other # thread will be removing that dentry soon. However as far as I see this comment is not correct: when we cannot take s_umount rw_semaphore (for example because it was taken in do_remount) this dentry is already extracted from dentry_unused list and we do not add it into the list again. Therefore dentry will not be found by prune_dcache() and shrink_dcache_sb() and will leave in memory very long time until the partition will be unmounted. The patch adds this dentry into tail of the dentry_unused list. Signed-off-by: Vasily Averin Cc: Neil Brown Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebed4bfc8da8df5b6b0bc4a5064a949f04683509 Author: Hugh Dickins Date: Sat Oct 28 10:38:43 2006 -0700 [PATCH] hugetlb: fix absurd HugePages_Rsvd If you truncated an mmap'ed hugetlbfs file, then faulted on the truncated area, /proc/meminfo's HugePages_Rsvd wrapped hugely "negative". Reinstate my preliminary i_size check before attempting to allocate the page (though this only fixes the most obvious case: more work will be needed here). Signed-off-by: Hugh Dickins Cc: Adam Litke Cc: David Gibson Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 856fc29505556cf263f3dcda2533cf3766c14ab6 Author: Hugh Dickins Date: Sat Oct 28 10:38:43 2006 -0700 [PATCH] hugetlb: fix prio_tree unit hugetlb_vmtruncate_list was misconverted to prio_tree: its prio_tree is in units of PAGE_SIZE (PAGE_CACHE_SIZE) like any other, not HPAGE_SIZE (whereas its radix_tree is kept in units of HPAGE_SIZE, otherwise slots would be absurdly sparse). At first I thought the error benign, just calling __unmap_hugepage_range on more vmas than necessary; but on 32-bit machines, when the prio_tree is searched correctly, it happens to ensure the v_offset calculation won't overflow. As it stood, when truncating at or beyond 4GB, it was liable to discard pages COWed from lower offsets; or even to clear pmd entries of preceding vmas, triggering exit_mmap's BUG_ON(nr_ptes). Signed-off-by: Hugh Dickins Cc: Adam Litke Cc: David Gibson Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9d7e6ae82da124dc9c579fe1061264ef2a69407 Author: Hugh Dickins Date: Sat Oct 28 10:38:41 2006 -0700 [PATCH] hugetlb: fix size=4G parsing On 32-bit machines, mount -t hugetlbfs -o size=4G gave a 0GB filesystem, size=5G gave a 1GB filesystem etc: there's no point in masking size with HPAGE_MASK just before shifting its lower bits away, and since HPAGE_MASK is a UL, that removed all the higher bits of the unsigned long long size. Signed-off-by: Hugh Dickins Cc: Adam Litke Cc: David Gibson Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b92aadfdae85ef837db343be38d4172115be72b Author: Randy Dunlap Date: Sat Oct 28 10:38:40 2006 -0700 [PATCH] cciss: fix printk format warning Fix printk format warnings: drivers/block/cciss.c:2000: warning: long long int format, long unsigned int arg (arg 2) drivers/block/cciss.c:2035: warning: long long int format, long unsigned int arg (arg 2) Signed-off-by: Randy Dunlap Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 760fe9ad1692361770bb56fa5c69cf6b3354858c Author: Randy Dunlap Date: Sat Oct 28 10:38:39 2006 -0700 [PATCH] ioc4: fix printk format warning Fix printk format warning: drivers/misc/ioc4.c:213: warning: long long int format, u64 arg (arg 3) Signed-off-by: Randy Dunlap Acked-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d4d262769cd1894a0306b9c57e72f005cd9e75a Author: Jan Dittmer Date: Sat Oct 28 10:38:38 2006 -0700 [PATCH] Add missing space in module.c for taintskernel Obvious fix. Signed-off-by: Jan Dittmer Acked-by: Florin Malita Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d892f11aae7125fe078cf93ec5cf6af288c5e7 Author: Andrey Panin Date: Sat Oct 28 10:38:35 2006 -0700 [PATCH] visws build fix Fix this: > Subject : CONFIG_X86_VISWS=3Dy, CONFIG_SMP=3Dn compile error > References : http://lkml.org/lkml/2006/10/7/51 > Submitter : Jesper Juhl > Caused-By : David Howells > commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 > Status : unknown Via undescribed means. Signed-off-by: Andrey Panin Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52fd24ca1db3a741f144bbc229beefe044202cac Author: Giridhar Pemmasani Date: Sat Oct 28 10:38:34 2006 -0700 [PATCH] __vmalloc with GFP_ATOMIC causes 'sleeping from invalid context' If __vmalloc is called to allocate memory with GFP_ATOMIC in atomic context, the chain of calls results in __get_vm_area_node allocating memory for vm_struct with GFP_KERNEL, causing the 'sleeping from invalid context' warning. This patch fixes it by passing the gfp flags along so __get_vm_area_node allocates memory for vm_struct with the same flags. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a2aae06cc1e87e9712a26a639f6a2f3442e2027 Author: Pavel Emelianov Date: Sat Oct 28 10:38:33 2006 -0700 [PATCH] Fix potential OOPs in blkdev_open() blkdev_open() calls bc_acquire() to get a struct block_device. Since bc_acquire() may return NULL when system is out of memory an appropriate check is required. Signed-off-by: Pavel Emelianov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d0aa5bf8d4f7ae4cb1a7feebf5b1afddd0b9b0 Author: Yasunori Goto Date: Sat Oct 28 10:38:32 2006 -0700 [PATCH] memory hotplug: __GFP_NOWARN is better for __kmalloc_section_memmap() Add __GFP_NOWARN flag to calling of __alloc_pages() in __kmalloc_section_memmap(). It can reduce noisy failure message. In ia64, section size is 1 GB, this means that order 8 pages are necessary for each section's memmap. It is often very hard requirement under heavy memory pressure as you know. So, __alloc_pages() gives up allocation and shows many noisy stack traces which means no page for each sections. (Current my environment shows 32 times of stack trace....) But, __kmalloc_section_memmap() calls vmalloc() after failure of it, and it can succeed allocation of memmap. So, its stack trace warning becomes just noisy. I suppose it shouldn't be shown. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 969b755aadf7bcf3df5991a127a103acd0145a52 Author: Randy Dunlap Date: Sat Oct 28 10:38:32 2006 -0700 [PATCH] md: fix printk format warnings, seen on powerpc64: drivers/md/raid1.c:1479: warning: long long unsigned int format, long unsigned int arg (arg 4) drivers/md/raid10.c:1475: warning: long long unsigned int format, long unsigned int arg (arg 4) Signed-off-by: Randy Dunlap Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 750a8f3e8f64654a584e54038c2c8db380813c79 Author: NeilBrown Date: Sat Oct 28 10:38:31 2006 -0700 [PATCH] md: fix up maintenance of ->degraded in multipath A recent fix which made sure ->degraded was initialised properly exposed a second bug - ->degraded wasn't been updated when drives failed or were hot-added. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01ab5662f573fe3a6bcefa200f15ab3069cec8a3 Author: NeilBrown Date: Sat Oct 28 10:38:30 2006 -0700 [PATCH] md: simplify checking of available size when resizing an array When "mdadm --grow --size=xxx" is used to resize an array (use more or less of each device), we check the new siza against the available space in each device. We already have that number recorded in rdev->size, so calculating it is pointless (and wrong in one obscure case). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b6e845986347ef86729e8651908af3e8a8441f5 Author: NeilBrown Date: Sat Oct 28 10:38:30 2006 -0700 [PATCH] md: fix bug where spares don't always get rebuilt properly when they become live If save_raid_disk is >= 0, then the device could be a device that is already in sync that is being re-added. So we need to default this value to -1. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae74589cb381cc2838107f92d4e0e1f178c6825d Author: bibo,mao Date: Sat Oct 28 10:38:29 2006 -0700 [PATCH] fix efi_memory_present_wrapper() efi_memory_present_wrapper() parameter start/end is physical address, but function memory_present parameter is PFN, this patch converts physical address to PFN. Signed-off-by: bibo, mao Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b57988db9b2c81794546cb792133f0cfd064ea8 Author: Eric Sandeen Date: Sat Oct 28 10:38:28 2006 -0700 [PATCH] jbd2: journal_dirty_data re-check for unmapped buffers When running several fsx's and other filesystem stress tests, we found cases where an unmapped buffer was still being sent to submit_bh by the ext3 dirty data journaling code. I saw this happen in two ways, both related to another thread doing a truncate which would unmap the buffer in question. Either we would get into journal_dirty_data with a bh which was already unmapped (although journal_dirty_data_fn had checked for this earlier, the state was not locked at that point), or it would get unmapped in the middle of journal_dirty_data when we dropped locks to call sync_dirty_buffer. By re-checking for mapped state after we've acquired the bh state lock, we should avoid these races. If we find a buffer which is no longer mapped, we essentially ignore it, because journal_unmap_buffer has already decided that this buffer can go away. I've also added tracepoints in these two cases, and made a couple other tracepoint changes that I found useful in debugging this. Signed-off-by: Eric Sandeen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f58a74dca88d48b0669609b4957f3dd757bdc898 Author: Eric Sandeen Date: Sat Oct 28 10:38:27 2006 -0700 [PATCH] jbd: journal_dirty_data re-check for unmapped buffers When running several fsx's and other filesystem stress tests, we found cases where an unmapped buffer was still being sent to submit_bh by the ext3 dirty data journaling code. I saw this happen in two ways, both related to another thread doing a truncate which would unmap the buffer in question. Either we would get into journal_dirty_data with a bh which was already unmapped (although journal_dirty_data_fn had checked for this earlier, the state was not locked at that point), or it would get unmapped in the middle of journal_dirty_data when we dropped locks to call sync_dirty_buffer. By re-checking for mapped state after we've acquired the bh state lock, we should avoid these races. If we find a buffer which is no longer mapped, we essentially ignore it, because journal_unmap_buffer has already decided that this buffer can go away. I've also added tracepoints in these two cases, and made a couple other tracepoint changes that I found useful in debugging this. Signed-off-by: Eric Sandeen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1939e49a0cb9d73785857bf312f4f65661b4b513 Author: Randy Dunlap Date: Sat Oct 28 10:38:26 2006 -0700 [PATCH] ext4: fix printk format warnings fs/ext4/resize.c:72: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:76: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:81: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:85: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:89: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:89: warning: long long unsigned int format, __u64 arg (arg 5) fs/ext4/resize.c:93: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:93: warning: long long unsigned int format, __u64 arg (arg 5) fs/ext4/resize.c:98: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:103: warning: long long unsigned int format, __u64 arg (arg 4) fs/ext4/resize.c:109: warning: long long unsigned int format, __u64 arg (arg 4) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbdb396a60b2ebf7de3b717991e5d3e28c8b7bbd Author: Martin Bligh Date: Sat Oct 28 10:38:25 2006 -0700 [PATCH] Use min of two prio settings in calculating distress for reclaim If try_to_free_pages / balance_pgdat are called with a gfp_mask specifying GFP_IO and/or GFP_FS, they will reclaim the requisite number of pages, and the reset prev_priority to DEF_PRIORITY (or to some other high (ie: unurgent) value). However, another reclaimer without those gfp_mask flags set (say, GFP_NOIO) may still be struggling to reclaim pages. The concurrent overwrite of zone->prev_priority will cause this GFP_NOIO thread to unexpectedly cease deactivating mapped pages, thus causing reclaim difficulties. Fix this is to key the distress calculation not off zone->prev_priority, but also take into account the local caller's priority by using min(zone->prev_priority, sc->priority) Signed-off-by: Martin J. Bligh Cc: Nick Piggin Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bb1a852ab6c9cdf211a2f4a2f502340c8c38eca Author: Martin Bligh Date: Sat Oct 28 10:38:24 2006 -0700 [PATCH] vmscan: Fix temp_priority race The temp_priority field in zone is racy, as we can walk through a reclaim path, and just before we copy it into prev_priority, it can be overwritten (say with DEF_PRIORITY) by another reclaimer. The same bug is contained in both try_to_free_pages and balance_pgdat, but it is fixed slightly differently. In balance_pgdat, we keep a separate priority record per zone in a local array. In try_to_free_pages there is no need to do this, as the priority level is the same for all zones that we reclaim from. Impact of this bug is that temp_priority is copied into prev_priority, and setting this artificially high causes reclaimers to set distress artificially low. They then fail to reclaim mapped pages, when they are, in fact, under severe memory pressure (their priority may be as low as 0). This causes the OOM killer to fire incorrectly. From: Andrew Morton __zone_reclaim() isn't modifying zone->prev_priority. But zone->prev_priority is used in the decision whether or not to bring mapped pages onto the inactive list. Hence there's a risk here that __zone_reclaim() will fail because zone->prev_priority ir large (ie: low urgency) and lots of mapped pages end up stuck on the active list. Fix that up by decreasing (ie making more urgent) zone->prev_priority as __zone_reclaim() scans the zone's pages. This bug perhaps explains why ZONE_RECLAIM_PRIORITY was created. It should be possible to remove that now, and to just start out at DEF_PRIORITY? Cc: Nick Piggin Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae88149a27cadf2840e0ab8155bef13be285c03 Author: Nick Piggin Date: Sat Oct 28 10:38:23 2006 -0700 [PATCH] mm: clean up pagecache allocation - Consolidate page_cache_alloc - Fix splice: only the pagecache pages and filesystem data need to use mapping_gfp_mask. - Fix grab_cache_page_nowait: same as splice, also honour NUMA placement. Signed-off-by: Nick Piggin Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0f205d9c656da9dad6340f75e33a96014b7d23f Author: Takashi Ohmasa Date: Mon Oct 23 11:19:40 2006 +0100 [ARM] 3900/1: Fix VFP Division by Zero exception handling. The SIGFPE signal should be generated if Division by Zero exception is detected. Signed-off-by: Takashi Ohmasa Signed-off-by: Russell King commit e816d71a50a714b532e3965364f3f53c23a53d42 Author: Takashi Ohmasa Date: Mon Oct 23 08:30:35 2006 +0100 [ARM] 3899/1: Fix the normalization of the denormal double precision number. The significand should be shifted until the value of bit [62] is 1 to normalize the denormal double number. Signed-off-by: Takashi Ohmasa Signed-off-by: Russell King commit 75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 Author: Kevin Hilman Date: Wed Oct 25 23:07:50 2006 +0100 [ARM] 3909/1: Disable UWIND_INFO for ARM (again) According to Daniel Jacobowitz, UNWIND_INFO is not useful on ARM, and in fact doesn't even compile. This patch disables the option for ARM. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit 9957329800b8b554b1af669bcc6878282338c34e Author: Russell King Date: Thu Oct 26 10:27:42 2006 +0100 [ARM] Add __must_check to uaccess functions Signed-off-by: Russell King commit a233bf9ee819c726c581af48010e0c0f1cdde245 Author: Russell King Date: Wed Oct 25 14:25:52 2006 +0100 [ARM] Add realview SMP default configuration Signed-off-by: Russell King commit c97d4869a23c439d2bc23cb26c1147c099f9ff78 Author: Russell King Date: Wed Oct 25 13:59:16 2006 +0100 [ARM] Fix SMP irqflags support The IRQ changes a while back broke the build for SMP machines. Fix up the SMP code to use set_irq_regs/get_irq_regs as appropriate. Also, fix a warning in arch/arm/kernel/time.c where 'regs' becomes unused for SMP builds. Signed-off-by: Russell King commit efbfe96c5d839c367249bf1cd53249716450c0a2 Author: Jesper Juhl Date: Fri Oct 27 23:24:47 2006 +0200 [PATCH] silence 'make xmldocs' warning by adding missing description of 'raw' in nand_base.c:1485 Add description of 'raw' in comments for drivers/mtd/nand/nand_base.c::nand_write_page_syndrome() so 'make xmldocs' will not spew a warning at us. Signed-off-by: Jesper Juhl Acked-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 735a7ffb739b6efeaeb1e720306ba308eaaeb20e Author: Andrew Morton Date: Fri Oct 27 11:42:37 2006 -0700 [PATCH] drivers: wait for threaded probes between initcall levels The multithreaded-probing code has a problem: after one initcall level (eg, core_initcall) has been processed, we will then start processing the next level (postcore_initcall) while the kernel threads which are handling core_initcall are still executing. This breaks the guarantees which the layered initcalls previously gave us. IOW, we want to be multithreaded _within_ an initcall level, but not between different levels. Fix that up by causing the probing code to wait for all outstanding probes at one level to complete before we start processing the next level. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61ce1efe6e40233663d27ab8ac9ba9710eebcaad Author: Andrew Morton Date: Fri Oct 27 11:41:44 2006 -0700 [PATCH] vmlinux.lds: consolidate initcall sections Add a vmlinux.lds.h helper macro for defining the eight-level initcall table, teach all the architectures to use it. This is a prerequisite for a patch which performs initcall synchronisation for multithreaded-probing. Cc: Greg KH Signed-off-by: Andrew Morton [ Added AVR32 as well ] Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 3560cc5ec3488b20d927f7160a21a0df1d1fda20 Author: Karsten Wiese Date: Fri Oct 20 14:45:36 2006 -0700 PCI: Remove quirk_via_abnormal_poweroff My K8T800 mobo resumes fine from suspend to ram with and without patch applied against 2.6.18. quirk_via_abnormal_poweroff makes some boards not boot 2.6.18, so IMO patch should go to head, 2.6.18.2 and everywhere "ACPI: ACPICA 20060623" has been applied. Remove quirk_via_abnormal_poweroff Obsoleted by "ACPI: ACPICA 20060623": Implemented support for "ignored" bits in the ACPI registers. According to the ACPI specification, these bits should be preserved when writing the registers via a read/modify/write cycle. There are 3 bits preserved in this manner: PM1_CONTROL[0] (SCI_EN), PM1_CONTROL[9], and PM1_STATUS[11]. http://bugzilla.kernel.org/show_bug.cgi?id=3691 Signed-off-by: Karsten Wiese Cc: Bob Moore Cc: "Brown, Len" Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2449e06a5696b7af1c8a369b04c97f3b139cf3bb Author: Shaohua Li Date: Fri Oct 20 14:45:32 2006 -0700 PCI: reset pci device state to unknown state for resume Considering below scenario: 1.Unload a PCI device's driver, the device ->current remains in PCI_D0. 2.Do suspend/resume circle. After that, BIOS puts the device to D3. 3.Reload the device driver. The calling pci_set_power_state in the driver can't change the state to D0, as set_power_state thinks the device is already in D0. A bug is reported at http://bugzilla.kernel.org/show_bug.cgi?id=6024 Pat attached a patch at http://marc.theaimsgroup.com/?l=linux-pci&m=114049761428561&w=2 for this issue, but it's lost. As pci_set_power_state can handle D3 -> D0 correctly (restore config space), I simplified Patrick's patch. Signed-off-by: Shaohua Li Cc: Patrick Mochel Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3095fc0c9772b4afb3c81f76664f341ef716d380 Author: Dave Jones Date: Fri Oct 20 14:45:33 2006 -0700 PCI: x86-64: mmconfig missing printk levels Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6b5c76b8e2ff204fa8d7201acce461188873bf2b Author: Eiichiro Oiwa Date: Mon Oct 23 15:14:07 2006 +0900 PCI: fix pci_fixup_video as it blows up on sparc64 This reverts much of the original pci_fixup_video change and makes it work for all arches that need it. fixed, and tested on x86, x86_64 and IA64 dig. Signed-off-by: Eiichiro Oiwa Acked-by: David Miller Signed-off-by: Greg Kroah-Hartman commit 35ae61a0f43ebbabc3cb4345136ca529fc4d6700 Author: MUNEDA Takahiro Date: Wed Oct 25 11:44:57 2006 -0700 acpiphp: fix latch status pci_hotplug.h says: * @latch_status: if the latch (if any) is open or closed (1/0) However, acpiphp returns opposite value. This patch fixes this issue. I tested this patch on my ia64 machine that has some apciphp based hotplug slots. Signed-off-by: MUNEDA Takahiro Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 3c9da7ba049d11caccc219576a3a23404aa2fc50 Author: Cornelia Huck Date: Fri Oct 27 12:39:33 2006 +0200 [S390] cio: Make ccw_device_register() static. ccw_device_register() is only called from io_subchannel_register() and io_subchannel_probe() and will never be called for possible non-io subchannels. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f3b017d8c9915cbaa8bab178dde1bd9dbbf5012c Author: Ralph Wuerthner Date: Fri Oct 27 12:39:26 2006 +0200 [S390] Improve AP bus device removal. Added a call to device_unregister() in ap_scan_bus() to actively remove unavailable AP bus devices with every bus scan. Previously devices were only removed in ap_queue_message() or __ap_poll_all(). Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit 12bae23507129a7337378e6433bff6f8696bdb45 Author: Heiko Carstens Date: Fri Oct 27 12:39:22 2006 +0200 [S390] uaccess error handling. Consider return values for all user space access function and return -EFAULT on error. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit c2b1449bd1fd73103ed5ff1a28d8f7cbc8a01b52 Author: Cornelia Huck Date: Fri Oct 27 12:39:17 2006 +0200 [S390] cio: css_probe_device() must be called enabled. Move css_probe_device() behind giving up the lock for the old subchannel in css_evaluate_known_subchannel() so we aren't disabled when we call it. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 95425f19beed99cb9b0a79f69731eda907d9db99 Author: Gerald Schaefer Date: Fri Oct 27 12:39:13 2006 +0200 [S390] Initialize interval value to 0. sscanf() could leave the interval value unchanged in which case it would be used uninitialized. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit f4880391860f2e38bb6ff400a0bd6c85443c5b9e Author: Paul Mundt Date: Fri Oct 27 12:39:10 2006 +0200 [S390] sys_getcpu compat wrapper. Looking at the new syscall additions, I noticed that sys_getcpu_wrapper wraps in to sys_tee, in what appears to be a copy and paste error. Switch it to point to sys_getcpu.. Signed-off-by: Paul Mundt Signed-off-by: Martin Schwidefsky commit f5ef9d11fd255b30b455d18f8d721bc44cd1296b Author: David S. Miller Date: Fri Oct 27 01:03:31 2006 -0700 [SPARC]: Fix bus_id[] string overflow. dp->path_component_name can be larger than ->bus_id[] so use a different naming scheme for this stuff. Noticed by Jurij Smakov. Signed-off-by: David S. Miller commit f2454a1a4b2aca38d3b7887619f43291d773c1ee Author: Jes Sorensen Date: Wed Oct 25 05:49:53 2006 -0400 [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access Don't PAGE_SHIFT pointer before handing it to virt_to_page() in xlate_dev_kmem_ptr() as it results in a double shift. Spotted by Bob Montgomery. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 1842c4bef61f985fbec6df7150041b85d8b52b1a Author: Randy Dunlap Date: Wed Oct 25 23:07:37 2006 -0700 [BRIDGE]: correct print message typo Correct message typo/spello. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 2a272f98619f188efe22119b0415aac6bc34a13f Author: Gavin McCullagh Date: Wed Oct 25 23:05:52 2006 -0700 [TCP] H-TCP: fix integer overflow When using H-TCP with a single flow on a 500Mbit connection (or less actually), alpha can exceed 65000, so alpha needs to be a u32. Signed-off-by: Gavin McCullagh Signed-off-by: Doug Leith Signed-off-by: David S. Miller commit 22119240b1c8f64eebb6ffb368c927b2f8be4136 Author: Stephen Hemminger Date: Wed Oct 25 23:04:12 2006 -0700 [TCP] cubic: scaling error Doug Leith observed a discrepancy between the version of CUBIC described in the papers and the version in 2.6.18. A math error related to scaling causes Cubic to grow too slowly. Patch is from "Sangtae Ha" . I validated that it does fix the problems. See the following to show behavior over 500ms 100 Mbit link. Sender (2.6.19-rc3) --- Bridge (2.6.18-rt7) ------- Receiver (2.6.19-rc3) 1G [netem] 100M http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-orig.png http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-fix.png Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 012d64ff68f304df1c35ce5902f5023dc14b643f Author: David S. Miller Date: Wed Oct 25 22:33:07 2006 -0700 [SPARC64]: Fix memory corruption in pci_4u_free_consistent(). The second argument to free_npages() was being incorrectly calculated, which would thus access far past the end of the arena->map[] bitmap. Signed-off-by: David S. Miller commit 4130a4b206e7c628482aa12ec30949382c8cdc5e Author: David S. Miller Date: Wed Oct 25 22:31:06 2006 -0700 [SPARC64]: Fix central/FHC bus handling on Ex000 systems. 1) probe_other_fhcs() wants to see only non-central FHC busses, so skip FHCs that don't sit off the root 2) Like SBUS, FHC can lack the appropriate address and size cell count properties, so add an of_busses[] entry and handlers for that. 3) Central FHC irq translator probing was buggy. We were trying to use dp->child in irq_trans_init but that linkage is not setup at this point. So instead, pass in the parent of "dp" and look for the child "fhc" with parent "central". Thanks to the tireless assistence of Ben Collins in tracking down these problems and testing out these fixes. Signed-off-by: David S. Miller commit 291b58d663862c3d42d2e8092f8b0dd3f15a94f8 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:46 2006 +0200 [PATCH] AVR32: Update defconfig Sync atstk1002_defconfig with latest git, turn off non-existent drivers and enable a few more userspace-visible options like SysV IPC and inotify support. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 452976b29864f9adcdd6d4ea81001aa5483592c2 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:45 2006 +0200 [PATCH] AVR32: Use __raw MMIO access for internal peripherals The read[bwl] and write[bwl] functions are meant for accessing PCI devices. How this is achieved on AVR32 is unknown, as there are no systems with a PCI bridge available yet. On-chip peripheral access, however, should not depend on how we end up implementing PCI access, so using __raw_read[bwl]/__raw_write[bwl] is the right thing to do for on-chip peripherals. This patch converts the drivers for the static memory controller, interrupt controller, PIO controller and system manager to use __raw MMIO access. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit d68041cc9fde550fe6b6a6de1d7a110daff3cb60 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:44 2006 +0200 [PATCH] AVR32: Implement and export __raw_{read,write}s[bwl] Implement __raw_readsb and __raw_writesb. Export __raw_reads[bwl] and __raw_writes[bwl] for use by modules. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 065834ab3988fece5608088e83724891c8190a2f Author: Ben Nizette Date: Tue Oct 24 10:12:43 2006 +0200 [PATCH] AVR32: add io{read,write}{8,16,32}{be,} support A number of new drivers require io{read,write}{8,16,32}{be,} family of io operations. These are provided for the AVR32 by this patch in the form of a series of macros. Access to the (memory mapped) io space through these macros is defined to be little endian only as little endian devices (such as PCI) are the main consumer of IO access. If high speed access is required, io{read,write}{16,32}be macros are supplied to perform native big endian access to this io space. Signed-off-by: Ben Nizette Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit fa3522407f01ead1ec14bdd6b785ea08d17d500d Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:42 2006 +0200 [PATCH] AVR32: Fix oversize immediates in atomic.h When calling e.g. atomic_sub_return with a large constant, the compiler may output an immediate that is too large for the sub instruction in the middle of the loop. Fix this by explicitly specifying the number of bits allowed in the constraint. Also stop atomic_add_return() and friends from falling back to their respective "sub" variants if the constant is too large to fit in an immediate. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit bee8ce809fb1c877388be032b468574a1cfff9ef Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:41 2006 +0200 [PATCH] AVR32: Don't try to iounmap P2 segment addresses While ioremap() will happily map a physical address through the P2 (uncached) segment when appropriate, iounmap() doesn't know how to handle those mappings. This patch makes iounmap() do the right thing, i.e. nothing, for such mappings. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 6ea850b5eb17f6d21ac1b3d99406d213a10c64e9 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:40 2006 +0200 [PATCH] AVR32: Silence some compile warnings Silence a few compile warnings which are basically harmless, but easy to fix. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 0430fb20a2a9f06262cb5ccc98869d54cdaa3963 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:39 2006 +0200 [PATCH] AVR32: Minor Makefile cleanup Don't generate listing by default, remove unused LIBGCC variable and rename generated disassembly and listing files to vmlinux.{s,lst}. Also make sure that files generated during the build are actually removed with make clean. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit f901b8c46fa9748b9d6836e9b158cf7be89447f1 Author: Dominik Brodowski Date: Wed Oct 25 19:56:55 2006 -0400 [PATCH] PCMCIA: fix __must_check warnings Fix the remaining __must_check warnings in the PCMCIA core. Signed-off-by: Dominik Brodowski commit 4deb7c1ed2b622b565c5330b475adc5a6cea30da Author: Jeff Garzik Date: Fri Oct 20 14:44:23 2006 -0700 [PATCH] PCMCIA: handle sysfs, PCI errors Handle sysfs and PCI errors correctly. Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 26aaa3c202fb3bec8d6c6619122442d476f55658 Author: Jonathan McDowell Date: Fri Oct 20 14:44:19 2006 -0700 [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. Allow a modular sa1100_cs. Signed-off-by: Jonathan McDowell Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 3efa9970bd0ac731302224ab9243693e91bc4bea Author: Amol Lad Date: Fri Oct 20 14:44:18 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/pcmcia ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit a230a6785dd5af84b8b043a64d8df8adc81f3724 Author: Om Narasimhan Date: Fri Oct 20 14:44:15 2006 -0700 [PATCH] pcmcia: au1000_generic fix The previous code did something like, if (error) goto out_err; .... do { struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i); del_timer_sync(&skt->poll_timer); pcmcia_unregister_socket(&skt->socket); out_err: flush_scheduled_work(); ops->hw_shutdown(skt); i--; } while (i > 0) ..... - On the error path, skt would not contain a valid value for the first iteration (skt is masked by uninitialized automatic skt) - Does not do hw_shutdown() for 0th element of PCMCIA_SOCKET Signed-off-by: Om Narasimhan Cc: "Yoichi Yuasa" Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit f465ce176fb2f1778a04fc3fcb2b8aa564901419 Author: Alexey Dobriyan Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] i82092: wire up errors from pci_register_driver() debugging goo removed to not leave assymetry in it after possible "leave" removal. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit f237de58b13bf65ba2f7fab896daacb92ae7ddef Author: Alexey Dobriyan Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit ace7d4772cf056d9b13b51bd496a8be968774592 Author: Randy Dunlap Date: Fri Oct 20 14:44:12 2006 -0700 [PATCH] pcmcia/ds: driver layer error checking Check driver layer return values in pcmcia/ds.c Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 4708b5faf7c53bb4128d34267bdfe4b8c74b488a Author: Kaustav Majumdar Date: Fri Oct 20 14:44:09 2006 -0700 [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card Some PCMCIA cards do not mention specific IO addresses in the CIS. In that case, inside the alloc_io_space function, conflicts are detected (the function returns 1) for the second function of a multifunction card unless the length of IO address range required is greater than 0x100. The following patch will remove this conflict checking for a PCMCIA function which had not mentioned any specific IO address to be mapped from. The patch is tested for Linux kernel 2.6.15.4 and works fine in the above case and is as suggested by Dave Hinds. Signed-off-by: Kaustav Majumdar Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 01918d16c837485ceba92d48fb734cf520e61144 Author: Dominik Brodowski Date: Sun Jul 2 21:21:51 2006 +0200 [PATCH] pcmcia: add more IDs to hostap_cs.c As a replacement for the broad manufactor/card ID match we commented out because of conflicts with pcnet_cs, add two product ID matches. Signed-off-by: Dominik Brodowski commit 1fbece150a230d0ab447cfb2fc4df10fb89f0d8c Author: David Brownell Date: Sat Jul 1 13:39:55 2006 -0700 [PATCH] pcmcia: at91_cf update More correct AT91 CF wakeup logic ... only enable/disable the IRQ wakeup capability, not the IRQ itself. That way the we know that the IRQ will be disabled correctly, in suspend/resume logic instead of ARM IRQ code. Most of the pin multiplexing setup has moved to the devices.c setup code. Signed-off-by: David Brownell Signed-off-by: Andrew Victor Signed-off-by: Dominik Brodowski commit 190a24f5605d95b786c92280bf7a51ebef43f29f Author: Olof Johansson Date: Wed Oct 25 17:32:40 2006 -0500 [POWERPC] Make sure __cpu_preinit_ppc970 gets called on 970GX processors Add check for 970GX for __cpu_preinit_ppc970. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit d6b9ccbbeb625674891f797119f06512d27fc905 Author: Hannes Reinecke Date: Mon Oct 23 15:26:37 2006 +0200 [SCSI] aic79xx: Print out signalling This is a cross-port of a similar patch for aic7xxx; only it's a bit simpler here as we don't support HVD and all controller actually implement this register. I hope. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 9080063f523b09af63234a21816c825133d48c44 Author: Hannes Reinecke Date: Mon Oct 23 15:25:36 2006 +0200 [SCSI] aic7xxx: Remove slave_destroy This is a cross-port from aic79xx; we still hit the occasional BUG_ON in slave_destroy. And again we don't really need the slave_destroy callback nor the ahc_linux_target structure at all. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 843822ad631889596d67716e6edbcde608aeba81 Author: Hannes Reinecke Date: Mon Oct 23 15:24:23 2006 +0200 [SCSI] aic79xx: set precompensation aic79xx has a special 'iocell' chip which handles the precompensation. If it's set via DV we should make sure to set the chip correctly, too. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 8883c1f182fa88d2b8e0adb6ae90a42f67e5353e Author: Hannes Reinecke Date: Mon Oct 23 15:22:37 2006 +0200 [SCSI] aic79xx: Fixup external device reset Whenever an external device is resetted we really have to take care to keep the channel in sync. Just notifying SCSI-ML and retry is not enough as we have to make sure the SCSI bus is not getting confused, either. So whenever we detect an external reset we rewrite the command to TUR, disable packetized command and notify the internal engine that an abort has happened. This way we trigger a proper bus reset sequence and all devices will be renegotiated properly. Kudos to Justin Gibbs and Luben Tuikov for this idea. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 4a531e8c79fe459e922347461ccc0f0c13de20d5 Author: FUJITA Tomonori Date: Fri Oct 20 09:08:18 2006 +0900 [SCSI] replace u8 and u32 with __u8 and __u32 in scsi.h for user space Signed-off-by: FUJITA Tomonori Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit afc071e6281e4f2af4748b5ddc594334726a37cf Author: Randy Dunlap Date: Mon Oct 23 21:47:13 2006 -0700 [SCSI] lpfc: fix printk format warning Fix printk format warning: drivers/scsi/lpfc/lpfc_attr.c:597: warning: long long unsigned int format, uint64_t arg (arg 4) Signed-off-by: Randy Dunlap Acked-by: James Smart Signed-off-by: James Bottomley commit ca3c3323931ef925497a9ffcb61c5eebe55f8e2b Author: Adrian Bunk Date: Fri Oct 20 14:48:07 2006 -0700 [SCSI] aic79xx: make ahd_set_tags() static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 289fe5b1f99c5e61ed32796cbed0a1ecc3589041 Author: Adrian Bunk Date: Fri Oct 20 14:47:57 2006 -0700 [SCSI] aic7xxx: cleanups - make needlessly global code static - #if 0 the following unused global functions: - aic79xx_core.c: ahd_print_scb - aic79xx_core.c: ahd_suspend - aic79xx_core.c: ahd_resume - aic79xx_core.c: ahd_dump_scbs - aic79xx_osm.c: ahd_softc_comp Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 6d07cb71fdacc710fd9816cddb5c2df0f7bd96b4 Author: Amol Lad Date: Fri Oct 20 14:48:40 2006 -0700 [SCSI] drivers/scsi: Handcrafted MIN/MAX macro removal Cleanups done to use min/max macros from kernel.h. Handcrafted MIN/MAX macros are changed to use macros in kernel.h [akpm@osdl.org: fix warning] Signed-off-by: Amol Lad Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 5a09e39810ae0465016c380962e12dd115779b87 Author: Hannes Reinecke Date: Fri Oct 20 09:58:47 2006 +0200 [SCSI] scsi_debug: support REPORT TARGET PORT GROUPS This patch adds support for REPORT TARGET PORT GROUPS. This is used eg for the multipathing priority callout to determine the path priority. With this patch multipath-tools can use the existing mpath_prio_alua callout to exercise the path priority grouping. Signed-off-by: Hannes Reinecke Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit cd00b7f5d814ba87b36371f122ce36ba4a88ba69 Author: Jes Sorensen Date: Tue Oct 17 09:32:06 2006 -0400 [SCSI] qla1280 bus reset typo Fix typo in check of return value of qla1280_bus_reset() which would result in an adapter reset in addition to the bus reset. Signed-off-by: Jes Sorensen Signed-off-by: James Bottomley commit b5072ea0910e5c8c79b8313e0ef70ca763983dbf Author: Mike Christie Date: Mon Oct 16 18:09:42 2006 -0400 [SCSI] libiscsi: fix logout pdu processing According to the iscsi RFC, we cannot send other requests if we have sent a logout pdu. This patch enforces this requirement by blocking the session and suspending the send thread. Userspace decides if we restart the connection or if we just free everything. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5831c737f724aa6a655a908d202221f079f30036 Author: Mike Christie Date: Mon Oct 16 18:09:41 2006 -0400 [SCSI] libiscsi: fix aen support We have been dropping the pdu. We should just send it to userspace and let it handle it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit cd529a46e17b43976d05c1e2ece2676ec7941cc8 Author: Mike Christie Date: Mon Oct 16 18:09:40 2006 -0400 [SCSI] libiscsi: fix missed iscsi_task_put in xmit error path from bhalevy@gmail.com: It looks like change 652 to libiscsi.c added some dead code around line 670 if (rc) { spin_unlock_bh(&conn->session->lock); goto again; } since 5 lines above we goto again if (rc). It looks like the previous if (rc) should go away if we want to put the ctask before breaking out of the while loop with "goto again" (see following patch). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 98644047916c24258fb47c3dab2bed8a44f53b83 Author: Mike Christie Date: Mon Oct 16 18:09:39 2006 -0400 [SCSI] libiscsi: fix oops in connection create failure path If connection creation fails we end up calling list_del on a invalid struct. This then causes an oops. We are not acutally using the lists (old MCS code we thought might be useful elsewhere) so this patch just removes that code. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 43a145a3440c5c5f24ff2888801e40e2242187e6 Author: Mike Christie Date: Mon Oct 16 18:09:38 2006 -0400 [SCSI] iscsi class: fix slab corruption during restart The transport class recv mempools are causing slab corruption. We could hack around netlink's lack of mempool support like dm, but it is just too ulgy (dm's hack is ugly enough :) when you need to support broadcast. This patch removes the recv pools. We have not used them even when we were allocting 20 MB per session and the system only had 64 MBs. And we have no pools on the send side and have been ok there. When Peter's work gets merged we can use that since the network guys are in favor of that approach and are not going to add mempools everywhere. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 47bcd3546d5141e54f15e40a20dc01d7c5f5a473 Author: Alan Cox Date: Mon Oct 16 16:55:46 2006 +0100 [SCSI] Switch fdomain to the pci_get API Doesn't make the hardware hot pluggable but does ensure the driver won't crash when another device is hot-unplugged at the wrong moment. Soon I propose to deprecate pci_find_device() and some of its friends. Signed-off-by: Alan Cox Signed-off-by: James Bottomley commit ed632da84c51a39fd9c982991e0f26120a035761 Author: James Bottomley Date: Mon Oct 16 10:06:27 2006 -0500 [SCSI] add can_queue to host parameters Debugging TCQ issues has shown me this is a very useful parameter to be able to view. Add it to he host class parameters. Signed-off-by: James Bottomley commit 031280f6e73d9177c93333c96e37eb05f2522faa Author: Andrey Mirkin <(amirkin@sw.ru)> Date: Mon Oct 16 12:08:43 2006 +0400 [SCSI] megaraid_{mm,mbox}: 64-bit DMA capability fix It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and 150-6) don't support 64-bit DMA. Unfortunately currently this check is wrong and driver sets 64-bit DMA mode for these devices. Signed-off-by: Andrey Mirkin Acked-by: "Ju, Seokmann" Signed-off-by: James Bottomley commit 3fc2aef5227dda464560a3fdafc9f4c7ce10210f Author: Sergey Kononenko Date: Sun Oct 15 03:12:08 2006 +0300 [SCSI] aic94xx: Supermicro motherboards support Add PCI id. Plus correct for possibly missing resistor that can cause FLASHEX to have the wrong value. Signed-off-by: Sergey Kononenko Signed-off-by: James Bottomley commit 9c3121feef7e1fba86f74b2677e6f54e7153d149 Author: Santiago Leon Date: Fri Oct 13 10:22:50 2006 -0500 [SCSI] ibmvscsi: correctly reenable CRQ The "ibmvscsi: treat busy and error conditions separately" patch submitted by Dave Boutcher back in June incorrectly reenables the CRQ. The broken logic causes the adapter to get disabled if the CRQ connection happens to close temporarily. This patch "fixes that obviously wrong logic check" (Dave's words). Signed-off-by: Santiago Leon Signed-off-by: David Boutcher Signed-off-by: James Bottomley commit 7c83a3ceb6d06e7cb908f5102687c9661e7d4d0a Author: Andrew Vasquez Date: Fri Oct 13 09:33:40 2006 -0700 [SCSI] qla2xxx: Update version number to 8.01.07-k3. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit df7baa506c2db1c2d12abd6f05c43f911da55a2e Author: Andrew Vasquez Date: Fri Oct 13 09:33:39 2006 -0700 [SCSI] qla2xxx: Correct QUEUE_FULL handling. - Drop queue-depths across all luns for a given fcport during TASK_SET_FULL statuses. - Ramp-up I/Os after throttling. - Consolidate completion-status handling of CS_QUEUE_FULL with CS_COMPLETE as ISP24xx firmware no longer reports CS_QUEUE_FULL. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 18c6c12759813c988bb05796d1b3352e98ae77de Author: Andrew Vasquez Date: Fri Oct 13 09:33:38 2006 -0700 [SCSI] qla2xxx: Workaround D3 power-management issues. Early ISP2432 parts have a known hardware issue when coming out of a D3 hot state. This issue can result in a hung PCIe link. Recent firmwares contain a workaround whereby the stop-firmware mailbox command prevents the ISP from entering the D3 hot state. In order to ensure that the workaround succeeded the driver must verify that the stop-firmware mailbox command completes successfully. In the event of a failure, the driver attempts a shutdown-retry after resetting the ISP and re-executing firmware. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f1663ad5dbb801e03c4c99c24d698ad5dba9aaff Author: Andrew Vasquez Date: Fri Oct 13 09:33:37 2006 -0700 [SCSI] qla2xxx: Check return value of sysfs_create_bin_file() usage. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8d1a006049ff1c084d57fbea1106ecad3455bd27 Author: Swen Schillig Date: Thu Oct 12 11:43:44 2006 +0200 [SCSI] zfcp: initialize scsi_host_template.max_sectors with appropriate value Define ZFCP_MAX_SECTORS and initialize scsi_host_template.max_sectors with appropriate value. Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit 9531c330f14c02d9f4eff7345071f485dc62dab1 Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:42 2006 -0700 [SCSI] fc4: Conversion to struct scsi_cmnd in fc4 Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in the Fibre Channel driver (fc4). Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 0fc82d5e84825ab43006f40935633120d23c2e15 Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:41 2006 -0700 [SCSI] convert ninja driver to struct scsi_cmnd Changes the obsolete typedefd Scsi_Cmnd to struct scsi_cmnd in the ninja scsi pcmcia driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit c543a3739c2a3034c80d77a189bd187c43a00feb Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:45 2006 -0700 [SCSI] Scsi_Cmnd conversion in psi240i driver Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in psi240i-driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 0b3a82d391563da15df2b3a0d245d41748822489 Author: Eric Sesterhenn Date: Tue Oct 10 14:41:43 2006 -0700 [SCSI] lpfc: check before dereference in lpfc_ct.c If we fail to allocate mp->virt during the first while loop iteration, mlist is still uninitialized, therefore we should check if before dereferencing. Signed-off-by: Eric Sesterhenn Acked-by: James Smart Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 46c43db1eabcdc46ad9a3d711edff1d698ecd21f Author: Alexey Dobriyan Date: Sun Oct 8 15:55:55 2006 +0400 [SCSI] scsi_lib.c: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: James Bottomley commit 8e394aec14f24e3b41a315a2dc53537024190c8a Author: Henne Date: Mon Oct 9 15:38:34 2006 +0200 [SCSI] fix typo in previous Scsi_Cmnd convertion in aic7xxx_old.c Fixes a typo in the aic7xxx_old.c. Signed-off-by: Olaf Hering Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit 35508e46aae4b57bd07d095eb11533e296b254dc Author: Michael Reed Date: Fri Oct 6 15:39:25 2006 -0500 [SCSI] mptfc: stall eh handlers if resetting while rport blocked Thanks to James Smart for the inspiration. Stall error handler if attempting recovery while an rport is blocked. This avoids device offline scenarios due to errors in the error handler. Also verify that VirtDevice is available before issuing scsi command. VirtDevice is removed when fc transport removes a target. See James Smart's patch of 08/17/2006 for greater detail. http://marc.theaimsgroup.com/?l=linux-scsi&m=115583213624803&w=2 Also bump version number per Eric's request. Signed-off-by: Michael Reed Acked-by: Eric Moore Signed-off-by: James Bottomley commit 11010fecd2a1fdae684237b61709367ae6a93289 Author: Andrew Vasquez Date: Fri Oct 6 09:54:59 2006 -0700 [SCSI] Maintain module-parameter name consistency with qla2xxx/qla4xxx. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 80f1443c66de3ec42e28d151bd43a80de398877e Author: Hannes Reinecke Date: Fri Oct 6 09:22:41 2006 +0200 [SCSI] aic7xxx: Adjust .max_sectors According to the adaptec sources aic7xxx / aic79xx really can do 4MB transfers. So we should adjust .max_sectors. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 5ae16db36988e811410494fb5d07c81e14453e7b Author: Doug Maxey Date: Thu Oct 5 23:50:07 2006 -0500 [SCSI] qla4xxx: fix double printk on load There is a dup printk at the tail of qla4xxx_module_init(). Remove the first instance as it's before the complete success of the function. Signed-off-by: James Bottomley commit 75c28851c9eee889ef4347ff6f55b2dd1e1ceb81 Author: Guennadi Liakhovetski Date: Fri Oct 6 00:11:17 2006 +0200 [SCSI] tmscsim: set max_sectors AM53C974A's Start Transfer Counter register has 24 bits, thus maximum transfer length is 16MiB. But the maximum I can test is 8MiB, so use that until somebody tests 16MiB. Signed-off-by: Guennadi Liakhovetski Signed-off-by: James Bottomley commit 413f73272090a69e35a03c938272ec661b1d3d4c Author: Kai Makisara Date: Thu Oct 5 22:59:46 2006 +0300 [SCSI] st: Fixup -ENOMEDIUM Based on the original patch from Hannes Reinecke Fix st_open() to return -ENOMEDIUM instead of -EIO if no medium is found. Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit a24342b90c9c829fc5fea9ee01b127f81bca18ef Author: Henne Date: Tue Oct 3 21:31:14 2006 +0200 [SCSI] Scsi_Cmnd conversion in qlogicfas408 driver Change obsolete Scsi_Cmnd to struct scsi_cmnd in the Qlocic FAS408 driver. Signed-off-by: Henrik Kretzschmar rejections fixed and Signed-off-by: James Bottomley commit 811c93666c3f4a0e99382c24a84480b03c7262f6 Author: Henne Date: Tue Oct 3 19:51:59 2006 +0200 [SCSI] Scsi_Cmnd convertion in sun3-driver Change the obsolete Scsi_Cmnd to struct scsi_cmnd in the sun3-driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit f84fcb06a1f7ab4ac0444ece82b25b0701369641 Author: Eric Sesterhenn Date: Fri Oct 20 14:35:59 2006 -0700 Remove unnecessary check in drivers/video/intelfb/intelfbhw.c All callers and the function itself dereference dinfo, so we can remove the check. (coverity id #1371) Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit a77b8950019289611f836c8fc19f91592822efcd Author: Alan Cox Date: Fri Oct 20 14:36:00 2006 -0700 intel fb: switch to pci_get API Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 85abb3f95010b277a6efbc9b8031a7854af87e10 Author: Amol Lad Date: Wed Oct 25 09:55:34 2006 -0700 drm: ioremap balanced with iounmap for drivers/char/drm ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Tested (compilation only) to make sure the files are compiling without any warning/error due to new changes Signed-off-by: Amol Lad Signed-off-by: Dave Airlie commit 24f73c92a990ecd3d1bb846267780a264d830065 Author: Jeff Garzik Date: Tue Oct 10 14:23:37 2006 -0700 drm: fix error returns, sysfs error handling - callers of drm_sysfs_create() and drm_sysfs_device_add() looked for errors using IS_ERR(), but the functions themselves only ever returned NULL on error. Fixed. - unwind from, and propagate sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 0d960d26c42888cf327df7faa1a8aa62bab53fa4 Author: Dave Jones Date: Wed Oct 18 00:26:39 2006 -0400 fix return code in error case. The other failure returns in this function are negative, so make this one do the same. Signed-off-by: Dave Jones Signed-off-by: Dave Airlie commit bcbaecbb9968750d4bfb2686a97e396f681f88ef Author: Patrick McHardy Date: Wed Oct 25 16:49:36 2006 +1000 [CRYPTO] users: Select ECB/CBC where needed CRYPTO_MANAGER is selected automatically by CONFIG_ECB and CONFIG_CBC. config CRYPTO_ECB tristate "ECB support" select CRYPTO_BLKCIPHER select CRYPTO_MANAGER I've added CONFIG_ECB to the ones you mentioned and CONFIG_CBC to gssapi. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu commit 2099c99e3b24f86b131566aa9854249189ae9ea2 Author: Al Viro Date: Tue Oct 24 11:17:06 2006 +0100 [PATCH] missing includes of io.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 016002312d50004908a79df37174b336e3682e18 Author: Al Viro Date: Tue Oct 24 11:17:37 2006 +0100 [PATCH] missing include of dma-mapping.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aa6c2e62bbe7a20ccc85906f75bc63465d899227 Author: Al Viro Date: Tue Oct 24 11:16:29 2006 +0100 [PATCH] IOC4 should depend on PCI Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3a51237dc11efe283b40ea0248f4e26ab935dbd1 Author: Al Viro Date: Tue Oct 24 11:15:29 2006 +0100 [PATCH] uml: mconsole fixes * when we have stop/sysrq/go, we get pt_regs of whatever executes mc_work_proc(). Would be better to see what we had at the time of interrupt that got us stop. * stop/stop/stop..... will give stack overflow. Shouldn't allow stop from mconsole_stop(). * stop/stop/go leaves us inside mconsole_stop() with os_set_fd_block(req->originating_fd, 0); reactivate_fd(req->originating_fd, MCONSOLE_IRQ); just done by nested mconsole_stop(). Ditto. * once we'd seen stop, there's a period when INTR commands are executed out of order (as they should; we might have the things stuck badly enough to never reach mconsole_stop(), but still not badly enough to block mconsole_interrupt(); in that situation we _want_ things like "cad" to be executed immediately). Once we enter monsole_stop(), all INTR commands will be executed in order, mixed with PROC ones. We'd better let user see that such change of behaviour has happened. (Suggested by lennert). * stack footprint of monsole_interrupt() is an atrocity; AFAICS we can safely make struct mc_request req; static in function there. Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 6c50444723f2e6487b3377450f90d813a88e6c31 Author: Keith Packard Date: Tue Oct 24 13:34:11 2006 -0700 [PATCH] Merge headphone and speaker volume controls for Panasonic R4 laptop Signed-off-by: Keith Packard Signed-off-by: Linus Torvalds commit f4d4c354bca18210296cc0a8f592c0cdb720bf20 Author: Benjamin Herrenschmidt Date: Wed Oct 25 13:22:27 2006 +1000 [POWERPC] Fix CHRP platforms with only 8259 On CHRP platforms with only a 8259 controller, we should set the default IRQ host to the 8259 driver's one for the IRQ probing fallbacks to work in case the IRQ tree is incorrect (like on Pegasos for example). Without this fix, we get a bunch of WARN_ON's during boot. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f49196a5f53aa62a964b08ffa2c59699a0c8eb53 Author: Scott Wood Date: Mon Oct 23 11:35:22 2006 -0500 [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler This causes ipic_set_irq_type to set the handler directly rather than call set_irq_handler, which causes spinlock recursion because the lock is already held when ipic_set_irq_type is called. I'm also not convinced that ipic_set_irq_type should be changing the handler at all. There seem to be several controllers that don't and several that do. Those that do would break what appears to be a common usage of calling set_irq_chip_and_handler followed by set_irq_type, if a non-standard handler were to be used. OTOH, irq_create_of_mapping() doesn't set the handler, but only calls set_irq_type(). This patch gets things working in the spinlock-debugging-enabled case, but I'm curious as to where the handler setting is ideally supposed to be done. I don't see any documentation on set_irq_type() that clarifies what the semantics are supposed to be. Signed-off-by: Scott Wood Signed-off-by: Paul Mackerras commit f84c39da766b4c8f13872282f58286a57ad05b3e Author: Liu Dave-r63238 Date: Wed Oct 18 16:36:56 2006 +0800 [POWERPC] Fix the UCC rx/tx clock of QE MPC8323EMDS board ethernet interface with RMII uses the CLK16 divisor for the rx and tx clock, but the ucc_set_qe_mux_rxtx() function doesn't handle the CLK16 setting of the CMXUCR3 and CMXUCR4 registers. This fixes it. Signed-off-by: Dave Liu Signed-off-by: Paul Mackerras commit b910ecf6bf221bb06f37e44765307c42b20db205 Author: Arnd Bergmann Date: Tue Oct 24 18:01:43 2006 +0200 [POWERPC] cell: update defconfig =================================================================== Signed-off-by: Paul Mackerras commit 274cef5e9d0e494ad84dbc28513b0bb6e3d847ae Author: Arnd Bergmann Date: Tue Oct 24 18:01:42 2006 +0200 [POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read Currently, spufs_mbox_read transfers more bytes than requested on a read. If you ask for four bytes, you get eight. This fixes it to transfer the largest multiple of four bytes that is less than or equal to the number you asked for. Note: one nasty property of this file in spufs is that you can only read multiples of four bytes in the first place, since there is no way to atomically put back a few bytes into the hardware register. Thus, reading less than four bytes returns -EINVAL. Asking for more than four returns the largest possible multiple of four. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit f6b301b89b7bf0bb872da4f37dc28240413cbae7 Author: Dwayne Grant Mcconnell Date: Tue Oct 24 18:27:30 2006 +0200 [POWERPC] spufs: fix signal2 file to report signal2 This fixes the /signal2 file to actually give signal2 data. Signed-off-by: Dwayne Grant Mcconnell Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e2100efb266c9335925191afe79f81f8d0a5807e Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:49:54 2006 +1000 [POWERPC] Fix device_is_compatible() const warning Fix a const'ification related warning with device_is_compatible() and friends related to get_property() not properly having const on it's input device node argument. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 859deea949c382d9ccb6397fe33df3703ecef45d Author: Benjamin Herrenschmidt Date: Fri Oct 20 14:37:05 2006 +1000 [POWERPC] Cell timebase bug workaround The Cell CPU timebase has an erratum. When reading the entire 64 bits of the timebase with one mftb instruction, there is a handful of cycles window during which one might read a value with the low order 32 bits already reset to 0x00000000 but the high order bits not yet incremeted by one. This fixes it by reading the timebase again until the low order 32 bits is no longer 0. That might introduce occasional latencies if hitting mftb just at the wrong time, but no more than 70ns on a cell blade, and that was considered acceptable. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 21c4ff80cba5e24932f3ef79c8482c0491630b2b Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:19 2006 +1000 [POWERPC] Support feature fixups in modules This patch adds support for feature fixups in modules. This involves adding support for R_PPC64_REL64 relocs to the 64 bits module loader. It also modifies modpost.c to ignore the powerpc fixup sections (or it would warn when used in .init.text). Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 0909c8c2d547e45ca50e2492b08ec93a37b35237 Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:18 2006 +1000 [POWERPC] Support feature fixups in vdso's This patch reworks the feature fixup mecanism so vdso's can be fixed up. The main issue was that the construct: .long label (or .llong on 64 bits) will not work in the case of a shared library like the vdso. It will generate an empty placeholder in the fixup table along with a reloc, which is not something we can deal with in the vdso. The idea here (thanks Alan Modra !) is to instead use something like: 1: .long label - 1b That is, the feature fixup tables no longer contain addresses of bits of code to patch, but offsets of such code from the fixup table entry itself. That is properly resolved by ld when building the .so's. I've modified the fixup mecanism generically to use that method for the rest of the kernel as well. Another trick is that the 32 bits vDSO included in the 64 bits kernel need to have a table in the 64 bits format. However, gas does not support 32 bits code with a statement of the form: .llong label - 1b (Or even just .llong label) That is, it cannot emit the right fixup/relocation for the linker to use to assign a 32 bits address to an .llong field. Thus, in the specific case of the 32 bits vdso built as part of the 64 bits kernel, we are using a modified macro that generates: .long 0xffffffff .llong label - 1b Note that is assumes that the value is negative which is enforced by the .lds (those offsets are always negative as the .text is always before the fixup table and gas doesn't support emiting the reloc the other way around). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7aeb732428fc8e2ecae6d432873770c12f04a979 Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:16 2006 +1000 [POWERPC] Support nested cpu feature sections This patch adds some macros that can be used with an explicit label in order to nest cpu features. This should be used very careful but is necessary for the upcoming cell TB fixup. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 42c4aaadb737e0e672b3fb86b2c41ff59f0fb8bc Author: Benjamin Herrenschmidt Date: Tue Oct 24 16:42:40 2006 +1000 [POWERPC] Consolidate feature fixup code There are currently two versions of the functions for applying the feature fixups, one for CPU features and one for firmware features. In addition, they are both in assembly and with separate implementations for 32 and 64 bits. identify_cpu() is also implemented in assembly and separately for 32 and 64 bits. This patch replaces them with a pair of C functions. The call sites are slightly moved on ppc64 as well to be called from C instead of from assembly, though it's a very small change, and thus shouldn't cause any problem. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit fb20f65a01a97bdf4bb746eecfc24a08561e2648 Author: Olaf Hering Date: Fri Oct 20 15:57:15 2006 +0200 [POWERPC] Fix hang in start_ldr if _end or _edata is unaligned Quick fix for lack of memset(__bss_start, 0, _end-__bss_start) in load_kernel(). If edata is unaligned, the loop will overwrite all memory because r3 and r4 will never be equal. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 0e64e94e477f8ed04e9295b11a5898d443c28a47 Author: Gerrit Renker Date: Tue Oct 24 16:17:51 2006 -0700 [DCCP]: Update documentation references. Updates the references to spec documents throughout the code, taking into account that * the DCCP, CCID 2, and CCID 3 drafts all became RFCs in March this year * RFC 1063 was obsoleted by RFC 1191 * draft-ietf-tcpimpl-pmtud-0x.txt was published as an Informational RFC, RFC 2923 on 2000-09-22. All references verified. Signed-off-by: Gerrit Renker Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 977a415f2b70b5693aaa23b1a16ad57ea20a1dce Author: David S. Miller Date: Tue Oct 24 16:16:39 2006 -0700 [ATM] horizon: read_bia() needs to be __devinit Thanks to Randy Dunlap. Signed-off-by: David S. Miller commit 6d381634d213580d40d431e7664dfb45f641b884 Author: Patrick McHardy Date: Tue Oct 24 16:15:10 2006 -0700 [NETFILTER]: Fix ip6_tables extension header bypass bug As reported by Mark Dowd , ip6_tables is susceptible to a fragmentation attack causing false negatives on extension header matches. When extension headers occur in the non-first fragment after the fragment header (possibly with an incorrect nexthdr value in the fragment header) a rule looking for this extension header will never match. Drop fragments that are at offset 0 and don't contain the final protocol header regardless of the ruleset, since this should not happen normally. Since all extension headers are before the protocol header this makes sure an extension header is either not present or in the first fragment, where we can properly parse it. With help from Yasuyuki KOZAKAI . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 51d8b1a65291a6956b79374b6adbbadc2263bcf6 Author: Patrick McHardy Date: Tue Oct 24 16:14:04 2006 -0700 [NETFILTER]: Fix ip6_tables protocol bypass bug As reported by Mark Dowd , ip6_tables is susceptible to a fragmentation attack causing false negatives on protocol matches. When the protocol header doesn't follow the fragment header immediately, the fragment header contains the protocol number of the next extension header. When the extension header and the protocol header are sent in a second fragment a rule like "ip6tables .. -p udp -j DROP" will never match. Drop fragments that are at offset 0 and don't contain the final protocol header regardless of the ruleset, since this should not happen normally. With help from Yasuyuki KOZAKAI . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 70a0a5357db20c291d46c04011d646d5d84c868c Author: Eric W. Biederman Date: Wed Oct 25 01:00:23 2006 +0200 [PATCH] x86-64: Only look at per_cpu data for online cpus. When I generalized __assign_irq_vector I failed to pay attention to what happens when you access a per cpu data structure for a cpu that is not online. It is an undefined case making any code that does it have undefined behavior as well. The code still needs to be able to allocate a vector across cpus that are not online to properly handle combinations like lowest priority interrupt delivery and cpu_hotplug. Not that we can do that today but the infrastructure shouldn't prevent it. So this patch updates the places where we touch per cpu data to only touch online cpus, it makes cpu vector allocation an atomic operation with respect to cpu hotplug, and it updates the cpu start code to properly initialize vector_irq so we don't have inconsistencies. Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen commit d1752aa884ec0ac3027c1a3d456bf69bf765c8b8 Author: Eric W. Biederman Date: Wed Oct 25 01:00:22 2006 +0200 [PATCH] x86-64: Simplify the vector allocator. There is no reason to remember a per cpu position of which vector to try. Keeping a global position is simpler and more likely to result in a global vector allocation even if I don't need or require it. For level triggered interrupts this means we are less likely to acknowledge another cpus irq, and cause the level triggered irq to harmlessly refire. This simplification makes it easier to only access data structures of online cpus, by having fewer special cases to deal with. Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen commit 2fab22f2d3290ff7c602fe62f22e825c48e97a06 Author: Patrick McHardy Date: Tue Oct 24 15:34:00 2006 -0700 [XFRM]: Fix xfrm_state accounting xfrm_state_num needs to be increased for XFRM_STATE_ACQ states created by xfrm_state_find() to prevent the counter from going negative when the state is destroyed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 82571026b9771c4035b0c62abbbe588fe73373ea Author: Al Viro Date: Tue Oct 24 15:18:36 2006 -0700 [IPV4] ipconfig: fix RARP ic_servaddr breakage memcpy 4 bytes to address of auto unsigned long variable followed by comparison with u32 is a bloody bad idea. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 824545e7031541f83245d254caca012bf6bdc6cd Author: Auke Kok Date: Tue Oct 24 14:49:44 2006 -0700 e100: account for closed interface when shutting down Account for the interface being closed before disabling polling on a device, to fix shutdown on some systems that explcitly close the netdevice before calling shutdown. Signed-off-by: Auke Kok commit ff1e55b078676d3c449ace6b99d95c0e22c905d6 Author: Auke Kok Date: Tue Oct 24 14:46:09 2006 -0700 e1000: Increment version to 7.2.9-k4 Significant fixes -> increment driver version. Signed-off-by: Auke Kok commit d2a1e2131aee7b3feb815636dc7917a96e49fd8e Author: Jesse Brandeburg Date: Tue Oct 24 14:46:06 2006 -0700 e1000: FIX: move length adjustment due to crc stripping disabled. Move the length (rx_bytes counter) adjustment of 4 bytes down to after the TBI_ACCEPT workaround. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 032fe6e9e253ebb37a0df0893844674dea9210fd Author: Jesse Brandeburg Date: Tue Oct 24 14:46:04 2006 -0700 e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters 82571 and newer chispets don't need to limit desc. length to 4kb and can handle 8kb sizes. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit e64d7d02090e475cfd7efbc830146d0c6dd579bc Author: Jesse Brandeburg Date: Tue Oct 24 14:46:01 2006 -0700 e1000: FIX: Disable Packet Split for non jumbo frames Allocations using alloc_page are taking too long for normal MTU, so use LPE only for jumbo frames. Signed-off-bu: Jesse Brandeburg Signed-off-by: Auke Kok commit 225a5dbd68f5271b7425f2f783ae64a1f6863b51 Author: Bruce Allan Date: Tue Oct 24 14:45:58 2006 -0700 e1000: FIX: fix wrong txdctl threshold bitmasks Threshold bitmasks for prefetch, host and writeback were clearing bits that they were not supposed to. The leftmost 2 bits in the byte for each threshold are reserved. Signed-off-by: Bruce Allan Signed-off-by: Auke Kok commit dc1f71f6b30c258704885cd488582eb3d68b3e8e Author: Auke Kok Date: Tue Oct 24 14:45:55 2006 -0700 e1000: FIX: 82542 doesn't support WoL Exclude 82542 when setting up WoL. This card does not do WoL at all. Signed-off-by: Auke Kok commit 4ccc12aeece8ab14ad96461c4db269aea080715d Author: Jesse Brandeburg Date: Tue Oct 24 14:45:53 2006 -0700 e1000: FIX: don't poke at manageability registers for incompatible adapters The MANC register should not be read for PCI-E adapters at all, as well as 82543 and older where 82543 would master abort when this register was accessed. Signed-off-by: Auke Kok commit 64271c4d909a15bc588f053a739db2e6df336d7d Author: Craig Hughes Date: Tue Oct 24 00:47:35 2006 +0100 [ARM] 3902/1: Enable GPIO81-84 on PXA255 The PXA255 has 84 GPIO lines available. This patch allows access to 81-84 Signed-off-by: Craig Hughes Signed-off-by: Russell King commit 52f0c67340ca306d5802b52140a186fcfa4b340e Author: Russell King Date: Sun Oct 22 16:04:29 2006 +0100 [ARM] Comment out missing configuration symbols HAS_TOUCHSCREEN_ADS7843_LH7 and HAS_TOUCHSCREEN_ADC_LH7 are referenced but not defined in the LH7A40x configuration. Comment them out to prevent them causing warnings. Marc Singer said: Feel free to remove the Kconfig lines. I'll add it back with the rest of the config entries. Signed-off-by: Russell King commit 62c877b9b7c463aa16ffbc9a322cb094fdb5827a Author: Anton Vorontsov Date: Fri Oct 20 00:58:49 2006 +0100 [ARM] 3898/1: corgi_bl fix module loading Fix module loading: corgi_bl: module license 'GPLv2' taints kernel. corgi_bl: Unknown symbol platform_driver_unregister corgi_bl: Unknown symbol __symbol_get corgi_bl: Unknown symbol platform_driver_register Cc: Richard Purdie Signed-off-by: pHilipp Zabel Signed-off-by: Anton Vorontsov Signed-off-by: Russell King commit f586fbd0ef273a80d88a07f911d9f2f2a8ac1679 Author: Anton Vorontsov Date: Fri Oct 20 00:56:28 2006 +0100 [ARM] 3897/1: corgi_bl fix module compiling Fix module compiling: WARNING: drivers/video/backlight/corgi_bl.o - Section mismatch: reference to .init.text: from .data between '$d' (at offset 0x0) and 'bl_mutex' Cc: Richard Purdie Signed-off-by: Anton Vorontsov Signed-off-by: Russell King commit cf610ca226a484f3182a59f168402cb27dcc1c53 Author: Russell King Date: Fri Oct 20 20:16:24 2006 +0100 [ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648 A couple of missing semicolons. Signed-off-by: Russell King commit 958de71b1ab01c20c1b385035235746c9227b24f Author: Tilman Sauerbeck Date: Tue Oct 24 21:52:23 2006 +1000 drm: mga: set dev_priv_size fd.o bug 1746 Signed-off-by: Dave Airlie commit 10eee0fe9114694401c7ae154e8cfb2ab2f59c10 Author: Michael Karcher Date: Tue Oct 24 21:46:55 2006 +1000 drm: savage: dev->agp_buffer_map is not initialized for AGP DMA on savages fd.o bug 8662 Signed-off-by: Dave Airlie commit a1aa28970316d7fb606321d5ab7fb3873641ab54 Author: Roland Scheidegger Date: Tue Oct 24 21:45:00 2006 +1000 drm: radeon: only allow specific type-3 packetss through verifier only allow specific type-3 packets to pass the verifier instead of all for r100/r200 as others might be unsafe (r300 already does this), and add checking for these we need but aren't safe. Check the RADEON_CP_INDX_BUFFER packet on both r200 and r300 as it isn't safe neither. Signed-off-by: Dave Airlie commit 7059abedd2f04b68bd7e1a79c9c72f7aeee134c0 Author: Linus Torvalds Date: Mon Oct 23 16:02:02 2006 -0700 Linux 2.6.19-rc3 commit 0c0e4668e0e65dd1404e8cf066d147235f95561d Author: Linus Torvalds Date: Mon Oct 23 14:25:30 2006 -0700 Revert unintentional and bogus change to drivers/pci/quirks.c In commit 4e8a5201506423e0241202de1349422af4260296 ("[PKT_SCHED] netem: Orphan SKB when adding to queue.") Davem mistakenly also included a temporary diff in his tree that disabled the pci_fixup_video VGA quirk, which broke sparc64. This reverts that part of the commit. Sayeth Davem: "Greg KH has a patch coming to you soon which will move that VGA code back into x86/x86_64/IA64 specific areas and will fix the sparc64 problem properly." Special thanks to Claudio Martins for noticing the error in the first place. Cc: Claudio Martins Cc: David Miller Signed-off-by: Linus Torvalds commit 04fed361dadb7921507a470947ac23d2f26352cf Author: Russell King Date: Sun Oct 22 15:57:18 2006 +0100 [PATCH] Remove __must_check for device_for_each_child() Eliminate more __must_check madness. The return code from device_for_each_child() depends on the values which the helper function returns. If the helper function always returns zero, it's utterly pointless to check the return code from device_for_each_child(). The only code which knows if the return value should be checked is the caller itself, so forcing the return code to always be checked is silly. Hence, remove the __must_check annotation. Signed-off-by: Russell King Signed-off-by: Linus Torvalds commit 68e7fffc0f3e95063ba5bd94ee6f9b8927247297 Author: Takashi Iwai Date: Mon Oct 23 13:40:59 2006 +0200 [ALSA] hda-intel - Add check of MSI availabity Check the availability of MSI and turn off MSI automatically when it's not available on the hardware. MSI seems broken on some hardwares but the kernel doesn't know exactly, thus we have to turn the MSI feature off on the sound driver manually. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit aa7a32cbdac50bb46a75722faa359993dab07c61 Author: Timur Tabi Date: Wed Oct 18 17:27:32 2006 -0500 [POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c In ucc_fast.c and ucc_slow.c, "illegal" is twice spelled "illagal". Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 3688a0f484e980771c078ab90f74a2656c339106 Author: Mark A. Greer Date: Wed Oct 18 14:38:09 2006 -0700 [POWERPC] Don't require execute perms on wrapper when building zImage.initrd Don't require that the wrapper script be executable when building zImage.initrds. This has already been fixed for zImages. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 362ff7b2ac0234152b4a334dd006b77f4fa2ab23 Author: Jake Moilanen Date: Wed Oct 18 10:47:22 2006 -0500 [POWERPC] Add 970GX cputable entry 970GX cputable entry from Steve Winiecki. Signed-off-by: Jake Moilanen arch/powerpc/kernel/cputable.c | 15 +++++++++++++++ arch/powerpc/oprofile/op_model_power4.c | 2 +- include/asm-powerpc/reg.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) Signed-off-by: Paul Mackerras commit 7f8c4c50bda13d27afc03679d25aa1fcac8df551 Author: Srinivasa Ds Date: Wed Oct 18 17:34:49 2006 +0530 [POWERPC] Fix build breakage with CONFIG_PPC32 low_cpu_die is called from the CPU hotplug code on 32-bit powermacs, but it is only defined if CONFIG_PM || CONFIG_CPU_FREQ_PMAC. This changes the ifdef so it is defined for CONFIG_HOTPLUG_CPU on 32-bit machines. Signed-off-by: Srinivasa DS Signed-off-by: Paul Mackerras commit c3386e40142e9d0c077460c2a548c4653fecaf15 Author: Zang Roy-r61911 Date: Wed Oct 18 11:18:58 2006 +0800 [POWERPC] Fix compiler warning message on get_property call This fixes the warning message from the return value of function get_property(), by making sure that the variable that receives the value is marked as const. Signed-off-by: Roy Zang -- Signed-off-by: Paul Mackerras commit cbcdb93d4443568f17e93610d240043ec5ac067b Author: Stephen Rothwell Date: Tue Oct 17 23:08:35 2006 +1000 [POWERPC] Simplify stolen time calculation In calculating stolen time, we were trying to actually account for time spent in the hypervisor. We don't really have enough information to do that accurately, so don't try. Instead, we now calculate stolen time as time that the current cpu thread is not actually dispatching instructions. On chips without a PURR, we cannot do this, so stolen time will always be zero. On chips with a PURR, this is merely the difference between the elapsed PURR values and the elapsed TB values. This gives us much more sane vaules from tools such as mpstat, even if they are still a bit strange e.g. 2 busy threads on one cpu will both appear to have 50% user time and 50% stolen time while 1 busy thread on a cpu will look like 100% user on one of them and 100% idle on the other. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit a94b1d1fd7ca3129e1d38d38167779fa6ee69780 Author: David S. Miller Date: Sun Oct 22 21:53:30 2006 -0700 [SPARC64]: 8-byte align return value from compat_alloc_user_space() Otherwise we get a ton of unaligned exceptions, for cases such as compat_sys_msgrcv() which go: p = compat_alloc_user_space(second + sizeof(struct msgbuf)); and here 'second' can for example be an arbitrary odd value. Based upon a bug report from Jurij Smakov. Signed-off-by: David S. Miller commit 4e8a5201506423e0241202de1349422af4260296 Author: David S. Miller Date: Sun Oct 22 21:00:33 2006 -0700 [PKT_SCHED] netem: Orphan SKB when adding to queue. The networking emulator can queue SKBs for a very long time, so if you're using netem on the sender side for large bandwidth/delay product testing, the SKB socket send queue sizes become artificially larger. Correct this by calling skb_orphan() in netem_enqueue(). Signed-off-by: David S. Miller commit 6a43487f43fbd4e03c606dcb62b98374a3af88fc Author: Randy Dunlap Date: Sun Oct 22 20:38:00 2006 -0700 [NET]: kernel-doc fix for sock.h Fix kernel-doc warning in include/net/sock.h: Warning(/var/linsrc/linux-2619-rc1-pv//include/net/sock.h:894): No description found for parameter 'rcu' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit a5c81b648476f5b0594daeefb38bb98409da5340 Author: Jaroslav Kysela Date: Sun Oct 22 10:56:24 2006 +0200 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit ef35be7f52669cc00c780fa5a640abf0580d1ecf Author: Takashi Iwai Date: Thu Oct 19 17:38:31 2006 +0200 [ALSA] Fix addition of user-defined boolean controls Fixed the addition of user-defined boolean controls, the private data size is corrected to be handled properly. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit da43deb116c0cea9ca2174f2ac64985c4d53077e Author: Takashi Iwai Date: Thu Oct 19 15:20:08 2006 +0200 [ALSA] Fix AC97 power-saving mode Fix the bug in AC97 power-saving mode that the power isn't turned on when power_save is set to 1 via sysfs during the power off state. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit dbedca39fe30db87b6401e4396f959c63d90082e Author: Takashi Iwai Date: Wed Oct 18 19:09:46 2006 +0200 [ALSA] Fix re-use of va_list The va_list is designed to be used only once. The current code may pass va_list arguments multiple times and may cause Oops. Copy/release the arguments temporarily to avoid this problem. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5b15c95f889c7bc43cb759c27211c597c0ad9f05 Author: Felix Kuehling Date: Mon Oct 16 12:49:47 2006 +0200 [ALSA] hda_intel: add ATI RS690 HDMI audio support This patch adds support for the HDMI codec of the ATI RS690 IGP northbridge. Signed-off-by: Felix Kuehling Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 264e6e3b0c5af44d8975153bf0c88ccf2cb10a2f Author: Takashi Iwai Date: Fri Oct 13 12:40:51 2006 +0200 [ALSA] hda-codec - Add model entry for ASUS U5F laptop Added a model entry for ASUS U5F laptop with AD1986A codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c9949452f221077c22a4765ef380841e169f034b Author: Takashi Iwai Date: Thu Oct 12 21:10:21 2006 +0200 [ALSA] Fix dependency of snd-adlib driver in Kconfig Added the missing dependency on CONFIG_SND for snd-adlib driver. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 30b35399ceb2398d05837863476dcb12f12f3a82 Author: Takashi Iwai Date: Wed Oct 11 18:52:53 2006 +0200 [ALSA] Various fixes for suspend/resume of ALSA PCI drivers - Check the return value of pci_enable_device() and request_irq() in the suspend. If any error occurs there, disable the device using snd_card_disconnect(). - Call pci_set_power_state() properly with pci_choose_state(). - Fix the order to call pci_set_power_state(). - Removed obsolete house-made PM codes in some drivers. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c06134d73cdc02bb8ab1fad180f6da1f28d2e049 Author: Takashi Iwai Date: Wed Oct 11 18:49:13 2006 +0200 [ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs Fixed the assignment of PCM devices for Realtek codecs. The secondary analog capture should be statically asigned to the third device regardless whether SPDIF exists or not. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5019f75ea1a98c36e9139ffb2bf8614a2e9f0a03 Author: Amit Choudhary Date: Mon Oct 9 16:04:34 2006 +0200 [ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value Check the return value of kmalloc() in function snd_card_opti9xx_pnp(), in file sound/isa/opti9xx/opti92x-ad1848.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b1e8a791c77bd35f88b678ce761928583efd8cd0 Author: Amit Choudhary Date: Mon Oct 9 16:03:52 2006 +0200 [ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value Check the return value of kmalloc() in function snd_card_ad1816a_pnp(), in file sound/isa/ad1816a/ad1816a.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fbdbb2205a7ff3c3e19941477cde6f9a693637ef Author: Amit Choudhary Date: Mon Oct 9 16:03:23 2006 +0200 [ALSA] sound/isa/cmi8330.c: check kmalloc() return value Check the return value of kmalloc() in function snd_cmi8330_pnp(), in file sound/isa/cmi8330.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4a81a21b6095997f50ac9ca37e4fdfe48d789ad7 Author: Amit Choudhary Date: Mon Oct 9 16:02:49 2006 +0200 [ALSA] sound/isa/gus/interwave.c: check kmalloc() return value Check the return value of kmalloc() in function snd_interwave_pnp(), in file sound/isa/gus/interwave.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 185b1aa122f87052d9154bb74990bc785372a750 Author: Eric Dumazet Date: Sat Oct 21 20:24:01 2006 -0700 [NET]: Reduce sizeof(struct flowi) by 20 bytes. As suggested by David, just kill off some unused fields in dnports to reduce sizef(struct flowi). If they come back, they should be moved to nl_u.dn_u in order not to enlarge again struct flowi [ Modified to really delete this stuff instead of using #if 0. -DaveM ] Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 375216ad0c303adeed45281ce82e153d41de679a Author: Thomas Graf Date: Sat Oct 21 20:20:54 2006 -0700 [IPv6] fib: initialize tb6_lock in common place to give lockdep a key Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 69c3014763966b0ae2bd190dac3654dd6cebdd45 Author: Alan Cox Date: Fri Oct 20 19:51:46 2006 -0700 [ATM] nicstar: Fix a bogus casting warning Not enough to make Nicstar 64bit friendly but got squashed in passing so might as well be applied Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 663bab6fd097c18ae0c7a7fd1b4a44558b998cdb Author: Jeff Garzik Date: Fri Oct 20 19:50:50 2006 -0700 [ATM] firestream: handle thrown error gcc emits the following warning: drivers/atm/firestream.c: In function ‘fs_open’: drivers/atm/firestream.c:870: warning: ‘tmc0’ may be used uninitialized in this function This indicates a real bug. We should check make_rate() return value for potential errors. Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b45eccdb51c102e3c5ff9eaecc36200ab2eb09c0 Author: Tobias Klauser Date: Fri Oct 20 19:49:45 2006 -0700 [ATM]: No need to return void The module_exit function has return-type void and pci_unregister_driver() returns void anyway. Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 97f80bc66f5c6384e3aab70c67340116b8c4284b Author: Jeff Garzik Date: Fri Oct 20 19:48:42 2006 -0700 [ATM]: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit fd169f15a67b47f23bd1704919c719a8e8409a73 Author: David S. Miller Date: Fri Oct 20 19:44:17 2006 -0700 [DCCP] ipv6: Fix opt_skb leak. Based upon a patch from Jesper Juhl. Try to match the TCP IPv6 code this was copied from as much as possible, so that it's easy to see where to add the ipv6 pktoptions support code. Signed-off-by: David S. Miller commit 82709531a800fcf8de71bb8c5d8e92462fb81f84 Author: Gerrit Renker Date: Wed Oct 11 16:26:54 2006 +0100 [DCCP]: Fix Oops in DCCPv6 I think I got the cause for the Oops observed in http://www.mail-archive.com/dccp@vger.kernel.org/msg00578.html The problem is always with applications listening on PF_INET6 sockets. Apart from the mentioned oops, I observed another one one, triggered at irregular intervals via timer interrupt: run_timer_softirq -> dccp_keepalive_timer -> inet_csk_reqsk_queue_prune -> reqsk_free -> dccp_v6_reqsk_destructor The latter function is the problem and is also the last function to be called in said kernel panic. In any case, there is a real problem with allocating the right request_sock which is what this patch tackles. It fixes the following problem: - application listens on PF_INET6 - DCCPv4 packet comes in, is handed over to dccp_v4_do_rcv, from there to dccp_v4_conn_request Now: socket is PF_INET6, packet is IPv4. The following code then furnishes the connection with IPv6 - request_sock operations: req = reqsk_alloc(sk->sk_prot->rsk_prot); The first problem is that all further incoming packets will get a Reset since the connection can not be looked up. The second problem is worse: --> reqsk_alloc is called instead of inet6_reqsk_alloc --> consequently inet6_rsk_offset is never set (dangling pointer) --> the request_sock_ops are nevertheless still dccp6_request_ops --> destructor is called via reqsk_free --> dccp_v6_reqsk_destructor tries to free random memory location (inet6_rsk_offset not set) --> panic I have tested this for a while, DCCP sockets are now handled correctly in all three scenarios (v4/v6 only/v4-mapped). Commiter note: I've added the dccp_request_sock_ops forward declaration to keep the tree building and to reduce the size of the patch for 2.6.19, later I'll move the functions to the top of the affected source code to match what we have in the TCP counterpart, where this problem hasn't existed in the first place, dumb me not to have done the same thing on DCCP land 8) Signed-off-by: Gerrit Renker Signed-off-by: Arnaldo Carvalho de Melo commit cb01fc720c629261b9c616b2d5fcc3d93cd8bb09 Author: Muli Ben-Yehuda Date: Sun Oct 22 00:41:15 2006 +0200 [PATCH] x86-64: increase PHB1 split transaction timeout This patch increases the timeout for PCI split transactions on PHB1 on the first Calgary to work around an issue with the aic94xx adapter. Fixes kernel.org bugzilla #7180 (http://bugzilla.kernel.org/show_bug.cgi?id=7180) Based on excellent debugging and a patch by Darrick J. Wong Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Acked-by: Darrick J. Wong commit aa026ede513b7d672fa7d9106b2f2a475455dcf2 Author: Andi Kleen Date: Sun Oct 22 00:41:15 2006 +0200 [PATCH] x86-64: Fix C3 timer test There was a typo in the C3 latency test to decide of the TSC should be used or not. It used the C2 latency threshold, not the C3 one. Fix that. This should fix the time on various dual core laptops. Signed-off-by: Andi Kleen commit b3edc9cec07ade41aaf1804f7c9e876afa90c862 Author: Muli Ben-Yehuda Date: Sun Oct 22 00:38:23 2006 +0200 [PATCH] x86-64: increase PHB1 split transaction timeout This patch increases the timeout for PCI split transactions on PHB1 on the first Calgary to work around an issue with the aic94xx adapter. Fixes kernel.org bugzilla #7180 (http://bugzilla.kernel.org/show_bug.cgi?id=7180) Based on excellent debugging and a patch by Darrick J. Wong Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Acked-by: Darrick J. Wong commit 37b1bccfe75691f5f42bf210d8a349f931896887 Author: Andi Kleen Date: Sun Oct 22 00:38:23 2006 +0200 [PATCH] x86-64: Fix C3 timer test There was a typo in the C3 latency test to decide of the TSC should be used or not. It used the C2 latency threshold, not the C3 one. Fix that. This should fix the time on various dual core laptops. Signed-off-by: Andi Kleen commit f8829caee311207afbc882794bdc5aa0db5caf33 Author: Ralf Baechle Date: Sat Oct 21 23:17:35 2006 +0100 [MIPS] Fix aliasing bug in copy_to_user_page / copy_from_user_page The current implementation uses a sequence of a cacheflush and a copy. This is racy in case of a multithreaded debuggee and renders GDB virtually unusable. Aside this fixes a performance hog rendering access to /proc/cmdline very slow and resulting in a enough cache stalls for the 34K AP/SP programming model to make the bare metal code on the non-Linux VPE miss RT deadlines. The main part of this patch was originally written by Ralf Baechle; Atushi Nemoto did the the debugging. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 224dc50ece1b40f8cff5ecadd42a6b2691e231de Author: Ralf Baechle Date: Sat Oct 21 02:05:20 2006 +0100 [MIPS] Cleanup remaining references to mips_counter_frequency. Noticed by Samium Gromoff but his patch got stale in flight ... Signed-off-by: Ralf Baechle commit fc22617e451f23b466d4d63bb016f5f6111b69e4 Author: Trond Myklebust Date: Sat Oct 21 10:24:24 2006 -0700 [PATCH] NFS: Cache invalidation fixup If someone has renamed a directory on the server, triggering the d_move code in d_materialise_unique(), then we need to invalidate the cached directory information in the source parent directory. Signed-off-by: Trond Myklebust Cc: Miklos Szeredi Cc: Maneesh Soni Cc: Dipankar Sarma Cc: Neil Brown Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9eaef27b36a6b716384948da94b8fc5bfba7b712 Author: Trond Myklebust Date: Sat Oct 21 10:24:20 2006 -0700 [PATCH] VFS: Make d_materialise_unique() enforce directory uniqueness If the caller tries to instantiate a directory using an inode that already has a dentry alias, then we attempt to rename the existing dentry instead of instantiating a new one. Fail with an ELOOP error if the rename would affect one of our parent directories. This behaviour is needed in order to avoid issues such as http://bugzilla.kernel.org/show_bug.cgi?id=7178 Signed-off-by: Trond Myklebust Cc: Miklos Szeredi Cc: Maneesh Soni Cc: Dipankar Sarma Cc: Neil Brown Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f7705eab6722ad1a346d748c4aad55755d6c241 Author: Matthew Wilcox Date: Sat Oct 21 10:24:19 2006 -0700 [PATCH] cciss: Fix warnings (and bug on 1TB discs) CCISS was producing warnings about shifts being greater than the size of the type and pointers being of incompatible type. Turns out this is because it's calling do_div on a 32-bit quantity. Upon further investigation, the sector_t total_size is being assigned to an int, and then we're calling do_div on that int. Obviously, sector_div is called for here, and I took the chance to refactor the code a little. Signed-off-by: Matthew Wilcox Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a7822a61ca9c22f464c0b79f455e62cccee747e Author: Alexey Dobriyan Date: Sat Oct 21 10:24:17 2006 -0700 [PATCH] i2o/exec-osm.c: use "unsigned long flags;" Just like everyone else. Signed-off-by: Alexey Dobriyan Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faf6bbcf94caee10ba34adb86db4ecca96bfd3bf Author: Paul Jackson Date: Sat Oct 21 10:24:17 2006 -0700 [PATCH] cpuset: mempolicy migration typo fix Mistyped an ifdef CONFIG_CPUSETS - fixed. I doubt that anyone ever noticed. The impact of this typo was that if someone: 1) was using MPOL_BIND to force off node allocations 2) while using cpusets to constrain memory placement 3) when that cpuset was migrating that jobs memory 4) while the tasks in that job were actively forking then there was a rare chance that future allocations using that MPOL_BIND policy would be node local, not off node. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aedb0eb107961a234f7c38e53da65a8f7ea992a9 Author: Christoph Lameter Date: Sat Oct 21 10:24:16 2006 -0700 [PATCH] Slab: Do not fallback to nodes that have not been bootstrapped yet The zonelist may contain zones of nodes that have not been bootstrapped and we will oops if we try to allocate from those zones. So check if the node information for the slab and the node have been setup before attempting an allocation. If it has not been setup then skip that zone. Usually we will not encounter this situation since the slab bootstrap code avoids falling back before we have setup the respective nodes but we seem to have a special needs for pppc. Signed-off-by: Christoph Lameter Acked-by: Andy Whitcroft Cc: Paul Mackerras Cc: Mike Kravetz Cc: Benjamin Herrenschmidt Acked-by: Mel Gorman Acked-by: Will Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7516795739bd53175629b90fab0ad488d7a6a9f7 Author: Andy Whitcroft Date: Sat Oct 21 10:24:14 2006 -0700 [PATCH] Reintroduce NODES_SPAN_OTHER_NODES for powerpc Reintroduce NODES_SPAN_OTHER_NODES for powerpc Revert "[PATCH] Remove SPAN_OTHER_NODES config definition" This reverts commit f62859bb6871c5e4a8e591c60befc8caaf54db8c. Revert "[PATCH] mm: remove arch independent NODES_SPAN_OTHER_NODES" This reverts commit a94b3ab7eab4edcc9b2cb474b188f774c331adf7. Also update the comments to indicate that this is still required and where its used. Signed-off-by: Andy Whitcroft Cc: Paul Mackerras Cc: Mike Kravetz Cc: Benjamin Herrenschmidt Acked-by: Mel Gorman Acked-by: Will Schmidt Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 047a66d4bb24aaf19f41d620f8f0534c2153cd0b Author: David Gibson Date: Sat Oct 21 10:24:13 2006 -0700 [PATCH] ibmveth: Fix index increment calculation The recent commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 introduced a bug in the producer/consumer index calculation in the ibmveth driver - incautious use of the post-increment ++ operator resulted in an increment being immediately reverted. This patch corrects the logic. Without this patch, the driver oopses almost immediately after activation on at least some machines. Signed-off-by: David Gibson Acked-by: Santiago Leon Cc: Jeff Garzik Cc: Martin Schwidefsky Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d42552c3ace1fa1f16ae02ce642f4c733cec40ca Author: Andrew Morton Date: Sat Oct 21 10:24:12 2006 -0700 [PATCH] pci: declare pci_get_device_reverse() We seem to have lost the declaration of pci_get_device_reverse(), if we ever had one. Add a CONFIG_PCI=0 stub too. Acked-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78f32668e64caea8f638b9133da7b97c5aec20d1 Author: Daniel Walker Date: Sat Oct 21 10:24:10 2006 -0700 [PATCH] clocksource: acpi_pm: add another greylist chipset I have an acpi_pm that goes backwards, but it's not intel. I tested the verified read and my