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 acpi_pm started to function properly. So I added it to the greylist. I'm assuming that's the right spot. I also added an unlikely() to the while, cause it seems appropriate. Signed-off-by: Daniel Walker Acked-by: John Stultz Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f2e639af4bd5e152fc79256e333643d3dd6c10f Author: NeilBrown Date: Sat Oct 21 10:24:09 2006 -0700 [PATCH] md: endian annotations for the bitmap superblock And a couple of bug fixes found by sparse. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c05b4bc22cd640d3a534bd2851a8413d5df3709 Author: NeilBrown Date: Sat Oct 21 10:24:08 2006 -0700 [PATCH] md: endian annotation for v1 superblock access Includes a couple of bugfixes found by sparse. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da3ed32fe568148ede256975d40825ffcdac767b Author: NeilBrown Date: Sat Oct 21 10:24:08 2006 -0700 [PATCH] md: add another COMPAT_IOCTL for md .. so that you can use bitmaps with 32bit userspace on a 64 bit kernel. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e333e89860431d22816c1bdaa2ea72c2753396e Author: NeilBrown Date: Sat Oct 21 10:24:07 2006 -0700 [PATCH] md: fix calculation of ->degraded for multipath and raid10 Two less-used md personalities have bugs in the calculation of ->degraded (the extent to which the array is degraded). Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c5473f80770768ab5712eb5a7492c16e97209fe Author: Adrian Bunk Date: Sat Oct 21 10:24:06 2006 -0700 [PATCH] drivers/ide/pci/generic.c: re-add the __setup("all-generic-ide",...) The change from __setup() to module_param_named() requires users to prefix the option with "generic.". This patch re-adds the __setup() additionally to the module_param_named(). Usually it would make sense getting rid of such an obsolete __setup() at some time, but considering that drivers/ide/ is slowly approaching a RIP status it's already implicitely scheduled for removal. This patch fixes kernel Bugzilla #7353. Signed-off-by: Adrian Bunk Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86fbf1486a44a4bce4fdcbe3665a7d8a62ba958a Author: Jiri Slaby Date: Sat Oct 21 10:24:01 2006 -0700 [PATCH] Char: correct pci_get_device changes Commits 881a8c120acf7ec09c90289e2996b7c70f51e996 and efe1ec27837d6639eae82e1f5876910ba6433c3f corrects pci device matching in only one way; it no longer oopses/crashes, despite hotplug is not solved in these changes. Whenever pci_find_device -> pci_get_device change is performed, also pci_dev_get and pci_dev_put should be in most cases called to properly handle hotplug. This patch does exactly this thing -- increase refcount to let kernel know, that we are using this piece of HW just now. It affects moxa and rio char drivers. Cc: Acked-by: Amit Gud Acked-by: Greg Kroah-Hartman Acked-by: Alan Cox Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8eb166bf805cc1c1d38d57211e8737631376b9ba Author: Alan Cox Date: Mon Oct 16 16:24:50 2006 +0100 [PATCH] libata-sff: Allow for wacky systems There are some Linux supported platforms that simply cannot hit the low I/O addresses used by ATA legacy mode PCI mappings. These platforms have a window for PCI space that is fixed by the board logic and doesn't include the neccessary locations. Provide a config option so that such platforms faced with a controller that they cannot support simply error it and punt Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 12a87d36b3c5cb76a182c35f40d959a615d1c862 Author: Alan Cox Date: Mon Oct 16 16:21:40 2006 +0100 [PATCH] ahci: readability tweak Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 3343571d9f88a0de542d33aea9ab881f00ff866d Author: Tejun Heo Date: Thu Oct 19 14:44:53 2006 +0900 [PATCH] libata: typo fix Typo fix in commment. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bf2d401bca3681f5380f711be65f2026255cc166 Author: Adrian Bunk Date: Fri Oct 20 14:39:35 2006 -0700 [PATCH] ATA must depend on BLOCK Fix the following compile error with CONFIG_ATA=y, CONFIG_BLOCK=n: ... CC drivers/ata/libata-scsi.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c: In function ‘ata_scsi_dev_config’: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:791: warning: implicit declaration of function ‘blk_queue_max_sectors’ /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: ‘request_queue_t’ undeclared (first use in this function) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: (Each undeclared identifier is reported only once /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: for each function it appears in.) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: ‘q’ undeclared (first use in this function) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:800: warning: implicit declaration of function ‘blk_queue_max_hw_segments’ /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c: In function ‘ata_scsi_slave_config’: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:831: warning: implicit declaration of function ‘blk_queue_max_phys_segments’ make[3]: *** [drivers/ata/libata-scsi.o] Error 1 Bug report by Jesper Juhl. Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 158f30c8945fea7cf0d0161cd9463cf2f3d2c19e Author: Kristen Carlson Accardi Date: Thu Oct 19 13:27:39 2006 -0700 [PATCH] libata: use correct map_db values for ICH8 Use valid values for ICH8 map_db. With the old values, when the controller was in Native mode, and SCC was 1 (drives configured for IDE), any drive plugged into a slave port was not recognized. For Combined Mode (and SCC is still 1), 2 is a value value for MAP.map_value, and needs to be recognized. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jeff Garzik commit 5826cade4341a6298eb10d476dccc5f403ca7ad8 Author: David Gibson Date: Fri Oct 13 14:20:59 2006 +1000 [PATCH] ibmveth: Fix index increment calculation On Thu, Oct 12, 2006 at 06:22:14PM +1000, David Gibson wrote: > Your recent ibmveth commit, 751ae21c6cd1493e3d0a4935b08fb298b9d89773 > ("fix int rollover panic"), causes a rapid oops on my test machine > (POWER5 LPAR). > > I've bisected it down to that commit, but am still investigating the > cause of the crash itself. Found the problem, I believe: an object lesson in the need for great caution using ++. [...] @@ -213,6 +213,7 @@ static void ibmveth_replenish_buffer_poo } free_index = pool->consumer_index++ % pool->size; + pool->consumer_index = free_index; index = pool->free_map[free_index]; ibmveth_assert(index != IBM_VETH_INVALID_MAP); Since the ++ is used as post-increment, the increment is not included in free_index, and so the added line effectively reverts the increment. The produced_index side has an analagous bug. The following change corrects this: 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 Signed-off-by: Jeff Garzik commit cfadbd298e8b3e7f2e324696b653bb74094590db Author: Ralf Baechle Date: Wed Oct 18 02:15:37 2006 +0100 [PATCH] Fix timer race When closing the driver or reinitializing the hardware there is the usual del_timer() race condition that exists when timers re-add themselves. Fix by conversion to del_timer_sync(). Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 089fff2aa8cc2a0383ea9fce17afd10bfab9ac7c Author: Dave Jones Date: Wed Oct 18 00:30:27 2006 -0400 [PATCH] Remove useless comment from sb1250 Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 18a8e8649d2687283da51fbcf8218372dc5a8f6f Author: Li Yang Date: Thu Oct 19 21:07:34 2006 -0500 [PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes changes due to qe_lib changes include: o removed inclusion of platform header file o removed platform_device code, replaced with of_device o removed typedefs o uint -> u32 conversions o removed following defines: QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER, BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET because they hid sizeof/in_be32/out_be32 operations from the reader. o removed irrelevant comments, added others to resemble removed BD_ defines o const'd and uncasted all get_property() assignments bugfixes, courtesy of Scott Wood, include: - Read phy_address as a u32, not u8. - Match on type == "network" as well as compatible == "ucc_geth", as device_is_compatible() will only compare up to the length of the test string, allowing "ucc_geth_phy" to match as well. - fixes the MAC setting code in ucc_geth.c. The old code was overwriting and dereferencing random stack contents. Signed-off-by: Li Yang Signed-off-by: Kim Phillips Signed-off-by: Scott Wood Signed-off-by: Jeff Garzik commit 470ea7eba4aaa517533f9b02ac9a104e77264548 Author: Stephen Hemminger Date: Fri Oct 20 17:06:11 2006 -0700 [PATCH] sky2: 88E803X transmit lockup The reason sky2 driver was locking up on transmit on the Yukon-FE chipset is that it was misconfiguring the internal RAM buffer so the transmitter and receiver were sharing the same space. The code assumed there was 16K of RAM on Yukon-FE (taken from vendor driver sk98lin which is even more f*cked up on this). Then it assigned based on that. The giveaway was that the registers would only hold 9bits so both RX/TX had 0..1ff for space. It is a wonder it worked at all! This patch addresses this, and fixes an easily reproducible hang on Transmit. Only the Yukon-FE chip is Marvell 88E803X (10/100 only) are affected. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7347b03d25ad7d7f001373cf64f709457c6af618 Author: Linas Vepstas Date: Fri Oct 20 14:42:14 2006 -0700 [PATCH] e1000: Reset all functions after a PCI error During the handling of the PCI error recovery sequence, the current e1000 driver erroneously blocks a device reset for any but the first PCI function. It shouldn't -- this is a cut-n-paste error from a different driver (which tolerated only one hardware reset per hardware card). Signed-off-by: Linas Vepstas Cc: Jesse Brandeburg Acked-by: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6f0f6d87a2a5fc96fc54e90961d5244d668e5fbb Author: Jeff Garzik Date: Fri Oct 20 14:43:15 2006 -0700 [PATCH] WAN/pc300: handle, propagate minor errors - move definition of 'tmc' and 'br' locals closer to usage - handle clock_rate_calc() error - propagate errors back to upper level open routine Signed-off-by: Jeff Garzik Cc: Krzysztof Halasa Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 718ecac2ed7ae1b3d61388ddbff2938a377b1a11 Author: Deepak Saxena Date: Fri Oct 20 14:42:04 2006 -0700 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e70ea8c09db0e25ab58f84ba7f393e5c9125a8ee Author: Andi Kleen Date: Sat Oct 21 18:37:03 2006 +0200 [PATCH] x86-64: Revert timer routing behaviour back to 2.6.16 state By default route the 8254 over the 8259 and only disable it on ATI boards where this causes double timer interrupts. This should unbreak some Nvidia boards where the timer doesn't seem to tick of it isn't enabled in the 8259. At least one VIA board also seemed to have a little trouble with the disabled 8259. For 2.6.20 we'll try both dynamically without black listing, but I think for .19 this is the safer approach because it has been already well tested in earlier kernels. This also makes the x86-64 behaviour the same as i386. Command line options can change all this of course. Signed-off-by: Andi Kleen commit dbaab49f92ff6ae6255762a948375e4036cbdbd2 Author: Vivek Goyal Date: Sat Oct 21 18:37:03 2006 +0200 [PATCH] x86-64: Overlapping program headers in physical addr space fix o A recent change to vmlinux.ld.S file broke kexec as now resulting vmlinux program headers are overlapping in physical address space. o Now all the vsyscall related sections are placed after data and after that mostly init data sections are placed. To avoid physical overlap among phdrs, there are three possible solutions. - Place vsyscall sections also in data phdrs instead of user - move vsyscal sections after init data in bss. - create another phdrs say data.init and move all the sections after vsyscall into this new phdr. o This patch implements the third solution. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: Magnus Damm Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton commit 84f404f695b16bd142c8dd9910d5a398f54fb044 Author: Eric W. Biederman Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Put more than one cpu in TARGET_CPUS TARGET_CPUS is the default irq routing poicy. It specifies which cpus the kernel should aim an irq at. In physflat delivery mode we can route an irq to a single cpu. But that doesn't mean our default policy should only be a single cpu is allowed. By allowing the irq routing code to select from multiple cpus this enables systems with more irqs then we can service on a single processor to actually work. I just audited and tested the code and irqbalance doesn't care, and the io_apic.c doesn't care if we have extra cpus in the mask. Everything will use or assume we are using the lowest numbered cpu in the mask if we can't use them all. So this should result in no behavior changes except on systems that need it. Thanks for YH Lu for spotting this problem in his testing. Cc: Yinghai Lu Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 8cf2c51927bbeefafc25193d01b91f9ed3806e96 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86: Revert new unwind kernel stack termination Jan convinced me that it was unnecessary because the assembly stubs do this already on the stack. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 6bf2dafad18c119beb534cbb3d882fe7a6c3f529 Author: Eric W. Biederman Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Use irq_domain in ioapic_retrigger_irq Thanks to YH Lu for spotting this. It appears I missed this function when I refactored allocate_irq_vector and introduced irq_domain, with the result that all retriggered irqs would go to cpu 0 even if we were not prepared to receive them there. While reviewing YH's patch I also noticed that this function was missing locking, and since I am now reading two values from two diffrent arrays that looks like a race we might be able to hit in the real world. Cc: Yinghai Lu Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit a1bae67243512ca30ceda48e3e24e25b543f8ab7 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] i386: Disable nmi watchdog on all ThinkPads Even newer Thinkpads have bugs in SMM code that causes hangs with NMI watchdog. Signed-off-by: Andi Kleen commit 581910e2eb952e541b8ca9b5f551d6c124903b61 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Revert interrupt backlink changes They break more than they fix Signed-off-by: Andi Kleen commit cc7d479fe56133e79840beffe9cb4fd193af93aa Author: Jan Beulich Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Fix ENOSYS in system call tracing This patch: - out of range system calls failing to return -ENOSYS under system call tracing [AK: split out from another patch by Jan as separate bugfix] Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen commit 26fd5e084e470dbe8edc6f726fc918e89b9f988c Author: Jeremy Fitzhardinge Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] i386: Fix fake return address The fake return address was being set to __KERNEL_PDA, rather than 0. Push it earlier while %eax still equals 0. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Andrew Morton commit 7a71cef780404e8c90d23b1131142e158d94354b Author: bibo,mao Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: x86_64 add NX mask for PTE entry If function change_page_attr_addr calls revert_page to revert to original pte value, mk_pte_phys does not mask NX bit. If NX bit is set on no NX hardware supported x86_64 machine, there is will be RSVD type page fault and system will crash. This patch adds NX mask bit for PTE entry. Signed-off-by: bibo,mao Signed-off-by: Andi Kleen commit 690a973f48b6ba2954465992c08e65059c8374fe Author: Jan Beulich Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: Speed up dwarf2 unwinder This changes the dwarf2 unwinder to do a binary search for CIEs instead of a linear work. The linker is unfortunately not able to build a proper lookup table at link time, instead it creates one at runtime as soon as the bootmem allocator is usable (so you'll continue using the linear lookup for the first [hopefully] few calls). The code should be ready to utilize a build-time created table once a fixed linker becomes available. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen commit cdfce1f5714fec7b24715f569b2fee1607350a6d Author: Andi Kleen Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86: Use -maccumulate-outgoing-args This avoids some problems with gcc 4.x and earlier generating invalid unwind information. In 4.1 the option is default when unwind information is enabled. And it seems to generate smaller code too, so it's probably a good thing on its own. With gcc 4.0: i386: 4683198 902112 480868 6066178 5c9002 vmlinux (before) 4449895 902112 480868 5832875 5900ab vmlinux (after) x86-64: 4939761 1449584 648216 7037561 6b6279 vmlinux (before) 4854193 1449584 648216 6951993 6a1439 vmlinux (after) On 4.1 it shouldn't make much difference because it is default when unwind is enabled anyways. Suggested by Michael Matz and Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 73bb8919b33d42cf75a0ed89bc9ca6a7128665be Author: Vivek Goyal Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: fix page align in e820 allocator Currently some code pieces assume that address returned by find_e820_area() are page aligned. But looks like find_e820_area() had no such intention and hence one might end up stomping over some of the data. One such case is bootmem allocator initialization code stomped over bss. This patch modified find_e820_area() to return page aligned address. This might be little wasteful of memory but at the same time probably it is easier to handle page aligned memory. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: Andi Kleen Signed-off-by: Andrew Morton commit 469b1d8741a5970ad49f2b5a837811579ba0b6f2 Author: Corey Minyard Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: Fix for arch/x86_64/pci/Makefile CFLAGS The arch/x86_64/pci directory was giving problems in a wierd cross-compile environment. The exact cause is unknown, but the Makefile used CFLAGS instead of EXTRA_CFLAGS. From what I can tell from Documentation/kbuild/makefiles.txt, CFLAGS should not be used for this, it should be EXTRA_CFLAGS. And it solves the cross-compile problem. Signed-off-by: Corey Minyard Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Vojtech Pavlik Cc: Sam Ravnborg Signed-off-by: Andrew Morton commit da8604cc2d6cd4cbde873c7ba308365e402ac7bf Author: Andrew Morton Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] i386: fix .cfi_signal_frame copy-n-paste error This was copied, pasted but not edited. Cc: Andi Kleen Cc: Jan Beulich Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 45edfd1db02f818b3dc7e4743ee8585af6b78f78 Author: Yinghai Lu Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: typo in __assign_irq_vector when updating pos for vector and offset typo with cpu instead of new_cpu Signed-off-by: Yinghai Lu Signed-off-by: Andi Kleen commit 926fafebc48a3218fac675f12974f9a46473bd40 Author: keith mannthey Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: x86_64 hot-add memory srat.c fix This patch corrects the logic used in srat.c to figure out what parsing what action to take when registering hot-add areas. Hot-add areas should only be added to the node information for the MEMORY_HOTPLUG_RESERVE case. When booting MEMORY_HOTPLUG_SPARSE hot-add areas on everything but the last node are getting include in the node data and during kernel boot the pages are setup then the kernel dies when the pages are used. This patch fixes this issue. Signed-off-by: Keith Mannthey Signed-off-by: Andi Kleen commit 13892de19eb9007ea47430c701bdbf69df71d883 Author: Andi Kleen Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit f248b6a34fdd726dd12b549fceba907b6df2771c Author: Andi Kleen Date: Sat Oct 21 18:37:00 2006 +0200 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit c7a3bd177f248d01ee18a01d22048c80e071c331 Author: Nicolas Pitre Date: Fri Oct 20 14:20:17 2006 -0700 [PATCH] fix PXA2xx UDC compilation error This was apparently missed by the move to the generic IRQ code. Signed-off-by: Nicolas Pitre Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17e31e388b2e49ff1c9a2bdb39d7aeb2975c19a Author: Olaf Hering Date: Fri Oct 20 09:23:05 2006 +0200 [PATCH] Fix up rpaphp driver for pci hotplug header move Use grep instead of make during interface changes. Signed-off-by: Olaf Hering Signed-off-by: Linus Torvalds commit 559c9ac391c046710bdeee5581dc5d9dda794881 Author: Chandra Seetharaman Date: Tue Oct 10 15:15:55 2006 -0700 configfs: handle kzalloc() failure in check_perm() check_perm() does not drop the reference to the module when kzalloc() failure occurs. Signed-Off-By: Chandra Seetharaman Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit e2057c5a63821e17c8a54dab6db680c77ce7ee6c Author: Mark Fasheh Date: Tue Oct 3 17:53:05 2006 -0700 ocfs2: cond_resched() in ocfs2_zero_extend() The loop within ocfs2_zero_extend() can execute for a long time, causing spurious soft lockup warnings. Signed-off-by: Mark Fasheh commit 0effef776ff95b7a6d6e48a2ef407ecaa8c21f96 Author: Mark Fasheh Date: Tue Oct 3 17:44:42 2006 -0700 ocfs2: fix page zeroing during simple extends The page zeroing code was missing the region between old i_size and new i_size for those extends that didn't actually require a change in space allocation. Signed-off-by: Mark Fasheh commit 711a40fcaa83bfad87736544b69f6fdd6527482d Author: Sunil Mushran Date: Wed Oct 11 12:23:02 2006 -0700 ocfs2: remove spurious d_count check in ocfs2_rename() This was causing some folks to incorrectly get -EBUSY during rename. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 79cd22d3ac921b9209bf813c7e75e6b69e74896c Author: Akinobu Mita Date: Thu Oct 12 14:29:33 2006 +0900 ocfs2: delete redundant memcmp() This patch deletes redundant memcmp() while looking up in rb tree. Signed-off-by: Akinbou Mita Signed-off-by: Mark Fasheh commit b2ef7858db6394b758818358a43c7dd5f232bbcc Author: Linus Torvalds Date: Fri Oct 20 10:40:48 2006 -0700 Revert "[mv643xx] Add pci device table for auto module loading." This reverts commit 4596c75c23dde2623cbeec69357d5eb13d28387e as requested by Olaf Hering. It causes compile errors, and says Olaf: "This change is also wrong, the autoloading works perfect with 2.6.18, no need to add random PCI ids. See commit a0245f7ad5214cb00131d7cd176446e067c913dc, platform devices have now a modalias entry in sysfs. The network card is not a PCI device." Signed-off-by: Linus Torvalds commit ac4e0aba7daf0a7c6ac20974070428481dc940f5 Author: Adrian Bunk Date: Thu Oct 19 23:29:14 2006 -0700 [PATCH] one more ARM IRQ fix Fix one more compile breakage caused by the post -rc1 IRQ changes. Signed-off-by: Adrian Bunk Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a047060a99f274a7c52cfea8159e4142a14b8a7 Author: NeilBrown Date: Thu Oct 19 23:29:13 2006 -0700 [PATCH] knfsd: fix race that can disable NFS server This patch is suitable for just about any 2.6 kernel. It should go in 2.6.19 and 2.6.18.2 and possible even the .17 and .16 stable series. This is a long standing bug that seems to have only recently become apparent, presumably due to increasing use of NFS over TCP - many distros seem to be making it the default. The SK_CONN bit gets set when a listening socket may be ready for an accept, just as SK_DATA is set when data may be available. It is entirely possible for svc_tcp_accept to be called with neither of these set. It doesn't happen often but there is a small race in svc_sock_enqueue as SK_CONN and SK_DATA are tested outside the spin_lock. They could be cleared immediately after the test and before the lock is gained. This normally shouldn't be a problem. The sockets are non-blocking so trying to read() or accept() when ther is nothing to do is not a problem. However: svc_tcp_recvfrom makes the decision "Should I accept() or should I read()" based on whether SK_CONN is set or not. This usually works but is not safe. The decision should be based on whether it is a TCP_LISTEN socket or a TCP_CONNECTED socket. Signed-off-by: Neil Brown Cc: Adrian Bunk Cc: Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e05d722e4555cd54677b4c8431d9e81fd047ef7a Author: Alexey Dobriyan Date: Thu Oct 19 23:29:12 2006 -0700 [PATCH] kernel/nsproxy.c: use kmemdup() Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e2a532b26b491706bd8b5c7cfc8d767b43b8f36 Author: OGAWA Hirofumi Date: Thu Oct 19 23:29:11 2006 -0700 [PATCH] ext3/4: fix J_ASSERT(transaction->t_updates > 0) in journal_stop() A disk generated some I/O error, after it, I hitted J_ASSERT(transaction->t_updates > 0) in journal_stop(). It seems to happened on ext3_truncate() path from stack trace. Then, maybe the following case may trigger J_ASSERT(transaction->t_updates > 0). ext3_truncate() -> ext3_free_branches() -> ext3_journal_test_restart() -> ext3_journal_restart() -> journal_restart() transaction->t_updates--; /* another process aborted journal */ -> start_this_handle() returns -EROFS without transaction->t_updates++; -> ext3_journal_stop() -> journal_stop() J_ASSERT(transaction->t_updates > 0) If journal was aborted in middle of journal_restart(), ext3_truncate() may trigger J_ASSERT(). Signed-off-by: OGAWA Hirofumi Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82591e6ea234762eeaa8b2337fe060ed438c18dc Author: Nick Piggin Date: Thu Oct 19 23:29:10 2006 -0700 [PATCH] mm: more commenting on lock ordering Clarify lockorder comments now that sys_msync dropps mmap_sem before calling do_fsync. Signed-off-by: Nick Piggin Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b95936cb9267e4c90a0b92361609ef5fd85a0a5f Author: Doug Warzecha Date: Thu Oct 19 23:29:09 2006 -0700 [PATCH] firmware/dcdbas: add size check in smi_data_write Add a size check in smi_data_write to prevent possible wrapping problems with large pos values when calling smi_data_buf_realloc on 32-bit. Signed-off-by: Doug Warzecha Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cd441f99819abdd2d919ff13e8c75af58a0fd9c Author: Dave Jones Date: Thu Oct 19 23:29:09 2006 -0700 [PATCH] ipmi: fix return codes in failure case These returns should be negative, like the others in this function. Signed-off-by: Dave Jones Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ec7b0de4bc18ccb4380de638550984d9a65c25 Author: Dmitriy Monakhov Date: Thu Oct 19 23:29:08 2006 -0700 [PATCH] mm: D-cache aliasing issue in cow_user_page --=-=-= from mm/memory.c: 1434 static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va) 1435 { 1436 /* 1437 * If the source page was a PFN mapping, we don't have 1438 * a "struct page" for it. We do a best-effort copy by 1439 * just copying from the original user address. If that 1440 * fails, we just zero-fill it. Live with it. 1441 */ 1442 if (unlikely(!src)) { 1443 void *kaddr = kmap_atomic(dst, KM_USER0); 1444 void __user *uaddr = (void __user *)(va & PAGE_MASK); 1445 1446 /* 1447 * This really shouldn't fail, because the page is there 1448 * in the page tables. But it might just be unreadable, 1449 * in which case we just give up and fill the result with 1450 * zeroes. 1451 */ 1452 if (__copy_from_user_inatomic(kaddr, uaddr, PAGE_SIZE)) 1453 memset(kaddr, 0, PAGE_SIZE); 1454 kunmap_atomic(kaddr, KM_USER0); #### D-cache have to be flushed here. #### It seems it is just forgotten. 1455 return; 1456 1457 } 1458 copy_user_highpage(dst, src, va); #### Ok here. flush_dcache_page() called from this func if arch need it 1459 } Following is the patch fix this issue: Signed-off-by: Dmitriy Monakhov Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca926e80dcfd18adaf7c4304935da4cc8ded8364 Author: Satoru Takeuchi Date: Thu Oct 19 23:29:06 2006 -0700 [PATCH] doc: fixing cpu-hotplug documentation Fixing cpu-hotplug documentation as follows: - moving confusing asterisk on additional_cpus descrition - fixing some typos - unifying indentation for source code and command line example Signed-off-by: Satoru Takeuchi Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fca4edb48b693d9df7de4c42d91b4158d8b7e347 Author: Amol Lad Date: Thu Oct 19 23:29:06 2006 -0700 [PATCH] drivers/isdn: ioremap balanced with iounmap ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6220ec7844fda2686496013a66b5b9169976b991 Author: Andrew Morton Date: Thu Oct 19 23:29:05 2006 -0700 [PATCH] highest_possible_node_id() linkage fix Qooting Adrian: - net/sunrpc/svc.c uses highest_possible_node_id() - include/linux/nodemask.h says highest_possible_node_id() is out-of-line #if MAX_NUMNODES > 1 - the out-of-line highest_possible_node_id() is in lib/cpumask.c - lib/Makefile: lib-$(CONFIG_SMP) += cpumask.o CONFIG_ARCH_DISCONTIGMEM_ENABLE=y, CONFIG_SMP=n, CONFIG_SUNRPC=y -> highest_possible_node_id() is used in net/sunrpc/svc.c CONFIG_NODES_SHIFT defined and > 0 -> include/linux/numa.h: MAX_NUMNODES > 1 -> compile error The bug is not present on architectures where ARCH_DISCONTIGMEM_ENABLE depends on NUMA (but m32r isn't the only affected architecture). So move the function into page_alloc.c Cc: Adrian Bunk Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e51959faa61278c762389802faf8ba1a40676628 Author: Zachary Amsden Date: Thu Oct 19 23:29:04 2006 -0700 [PATCH] Fix potential interrupts during alternative patching Interrupts must be disabled during alternative instruction patching. On systems with high timer IRQ rates, or when running in an emulator, timing differences can result in random kernel panics because of running partially patched instructions. This doesn't yet fix NMIs, which requires extricating the patch code from the late bug checking and is logically separate (and also less likely to cause problems). Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a90b061c0bf712961cea40d9c916b300073d12e5 Author: Al Viro Date: Thu Oct 19 23:29:03 2006 -0700 [PATCH] nfsd: nfs_replay_me We are using NFS_REPLAY_ME as a special error value that is never leaked to clients. That works fine; the only problem is mixing host- and network- endian values in the same objects. Network-endian equivalent would work just as fine; switch to it. Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7afef1f963bec198b186cc34b9e8c9b9ce2e266 Author: Al Viro Date: Thu Oct 19 23:29:02 2006 -0700 [PATCH] nfsd: misc endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f00f328fda1eeec575cd0f360da81b66bf4133a1 Author: Al Viro Date: Thu Oct 19 23:29:01 2006 -0700 [PATCH] xdr annotations: nfsd callback* Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8dd7b9ab194d9ab322881f49fde42954757efae Author: Al Viro Date: Thu Oct 19 23:29:01 2006 -0700 [PATCH] nfsd: NFSv4 errno endianness annotations don't use the same variable to store NFS and host error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4d987ba841dff4b2fc768e52d1d95af83f9f157 Author: Al Viro Date: Thu Oct 19 23:29:00 2006 -0700 [PATCH] nfsd: NFSv{2,3} trivial endianness annotations for error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b37ad28bcaa7c486a4ff0fb6c3bdaaacd67b86ce Author: Al Viro Date: Thu Oct 19 23:28:59 2006 -0700 [PATCH] nfsd: nfs4 code returns error values in net-endian Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6264d69d7df654ca64f625e9409189a0e50734e9 Author: Al Viro Date: Thu Oct 19 23:28:58 2006 -0700 [PATCH] nfsd: vfs.c endianness annotations don't use the same variable to store NFS and host error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ebbc012a9433a252be7ab4ce54e94bf7b21e506 Author: Al Viro Date: Thu Oct 19 23:28:58 2006 -0700 [PATCH] xdr annotations: NFSv4 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91f07168cef8e99dd16f608fbc703e7a5af0237f Author: Al Viro Date: Thu Oct 19 23:28:57 2006 -0700 [PATCH] xdr annotations: NFSv3 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 131a21c2177c267ab259fcd06947c6f593a7de8e Author: Al Viro Date: Thu Oct 19 23:28:56 2006 -0700 [PATCH] xdr annotations: NFSv2 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad451d389f46f699832da3e9ad95f610cb8c0fd2 Author: Al Viro Date: Thu Oct 19 23:28:55 2006 -0700 [PATCH] xdr annotations: nfsd_dispatch() Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83b11340d683a67a77e35a5ffb5ad4afbf0be4e5 Author: Al Viro Date: Thu Oct 19 23:28:55 2006 -0700 [PATCH] nfsfh simple endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f103111fdfc3cba00e4c94921d32362f375d93 Author: Al Viro Date: Thu Oct 19 23:28:54 2006 -0700 [PATCH] nfsd: nfserrno() endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83bbe2ef63ec4f6a22aaaa0c03bd918b38300127 Author: Al Viro Date: Thu Oct 19 23:28:53 2006 -0700 [PATCH] nfs_common endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d21ec0c33d0a9eb7a6f6c716008863a97797709e Author: Al Viro Date: Thu Oct 19 23:28:52 2006 -0700 [PATCH] xdr annotations: mount_clnt [pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc4785cd475a11ba125df7af674e16c6ea1cfc30 Author: Al Viro Date: Thu Oct 19 23:28:51 2006 -0700 [PATCH] nfs: verifier is network-endian Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5704fdeb41c9fb282ae576516f221ea0b8f64b2b Author: Al Viro Date: Thu Oct 19 23:28:51 2006 -0700 [PATCH] xdr annotations: fs/nfs/callback* on-the-wire data is big-endian [mostly pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6f684f6443dd37384c63d2f27571350e0b5c8aa Author: Al Viro Date: Thu Oct 19 23:28:50 2006 -0700 [PATCH] fs/nfs/callback* passes error values big-endian [pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dbb4c6799cf8fa8c5ba1926153a30960117477d Author: Al Viro Date: Thu Oct 19 23:28:49 2006 -0700 [PATCH] xdr annotations: NFS readdir entries on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8687b63afbe42103730bff4d3f7bfff3463c303e Author: Al Viro Date: Thu Oct 19 23:28:48 2006 -0700 [PATCH] xdr annotations: NFSv4 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d61005a6855160091dca44b718db93fe7aa9876f Author: Al Viro Date: Thu Oct 19 23:28:48 2006 -0700 [PATCH] xdr annotations: NFSv3 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d787a75a00679c3ebcb88236a7af7b38a0b5932 Author: Al Viro Date: Thu Oct 19 23:28:47 2006 -0700 [PATCH] xdr annotations: NFSv2 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52921e02a4f4163a7b1f4b5dde71e1debc71de4a Author: Al Viro Date: Thu Oct 19 23:28:46 2006 -0700 [PATCH] lockd endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7111c66e4e70588c9602035a4996c9cdc2087d2d Author: Al Viro Date: Thu Oct 19 23:28:45 2006 -0700 [PATCH] fix svc_procfunc declaration svc_procfunc instances return __be32, not int Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc45f0175088e000ac7493e5e3f05579b6f7d240 Author: Al Viro Date: Thu Oct 19 23:28:44 2006 -0700 [PATCH] bug: nfsd/nfs4xdr.c misuse of ERR_PTR() a) ERR_PTR(nfserr_something) is a bad idea; IS_ERR() will be false for it. b) mixing nfserr_.... with -EOPNOTSUPP is even worse idea. nfsd4_path() does both; caller expects to get NFS protocol error out it if anything goes wrong, but if it does we either do not notice (see (a)) or get host-endian negative (see (b)). IOW, that's a case when we can't use ERR_PTR() to return error, even though we return a pointer in case of success. Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7766da7f7395b74dec9e52005b7dac0d09391a4 Author: Chuck Lever Date: Thu Oct 19 23:28:44 2006 -0700 [PATCH] SUNRPC: fix a typo Yes, this actually passed tests the way it was. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71bdcf8056f910dc57ea3d0def80a9329e7dc52d Author: Chuck Lever Date: Thu Oct 19 23:28:43 2006 -0700 [PATCH] SUNRPC: fix race in in-kernel RPC portmapper client When submitting a request to a fast portmapper (such as the local rpcbind daemon), the request can complete before the parent task is even queued up on xprt->binding. Fix this by queuing before submitting the rpcbind request. Test plan: Connectathon locking test with UDP. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87c0adfeaaf8d8310c4f790d76072a5961b3518 Author: Chuck Lever Date: Thu Oct 19 23:28:42 2006 -0700 [PATCH] NFS: remove unused check in nfs4_open_revalidate Coverity spotted a superfluous error check in nfs4_open_revalidate(). Remove it. Coverity: #cid 847 Test plan: Code inspection; another pass through Coverity. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85233a7a436a48a0b98e7976a66797e5da79c9d6 Author: Chuck Lever Date: Thu Oct 19 23:28:42 2006 -0700 [PATCH] NFS: __nfs_revalidate_inode() can use "inode" before checking it is non-NULL The "!inode" check in __nfs_revalidate_inode() occurs well after the first time it is dereferenced, so get rid of it. Coverity: #cid 1372, 1373 Test plan: Code review; recheck with Coverity. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39cf8a1374dc51fea169190674d5e4996a7d7ea2 Author: Chuck Lever Date: Thu Oct 19 23:28:41 2006 -0700 [PATCH] NFS: fix minor bug in new NFS symlink code The original code confused a zero return code from pagevec_add() as success. Test plan: None. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd9ae2b6a75bb1fa0d370929c2d7a7da1ed719d9 Author: Trond Myklebust Date: Thu Oct 19 23:28:40 2006 -0700 [PATCH] NFS: Deal with failure of invalidate_inode_pages2() If invalidate_inode_pages2() fails, then it should in principle just be because the current process was signalled. In that case, we just want to ensure that the inode's page cache remains marked as invalid. Also add a helper to allow the O_DIRECT code to simply mark the page cache as invalid once it is finished writing, instead of calling invalidate_inode_pages2() itself. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13bbc06af8a5f65df0f888b442e557c617cadba7 Author: Trond Myklebust Date: Thu Oct 19 23:28:40 2006 -0700 [PATCH] NFS: Fix NFSv4 callback regression The change in semantics for nfs_find_client() introduced by David breaks the NFSv4 callback channel. Also, replace another completely broken BUG_ON() in nfs_find_client(). In initialised clients, clp->cl_cons_state == 0, and callers of that function should in any case never want to see clients that are uninitialised. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d9ac06f26fe8d477c813405f1a8c7c90eecef2d Author: J. Bruce Fields Date: Thu Oct 19 23:28:39 2006 -0700 [PATCH] nfs4: initialize cl_ipaddr David forgot to do this. I'm not sure if this is the right place to put it.... Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eda3cef8dd2b83875affe82595db9d0c278879b2 Author: Trond Myklebust Date: Thu Oct 19 23:28:38 2006 -0700 [PATCH] NFS: Fix error handling in nfs_direct_write_result() If the RPC call tanked, we should not be checking the return value of data->res.verf->committed, since it is unlikely to even be initialised. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6dff26a08189932eeb0fa4261e09e733b0fc540 Author: Trond Myklebust Date: Thu Oct 19 23:28:38 2006 -0700 [PATCH] NFS: Fix oops in nfs_cancel_commit_list Fix two bugs: - nfs_inode_remove_request will call nfs_clear_request, so we cannot reference req->wb_page after it. Move the call to dec_zone_page_state so that it occurs while req->wb_page is still valid. - Calling nfs_clear_page_writeback is unnecessary since the radix tree tags will have been cleared by the call to nfs_inode_remove_request. Replace with a simple call to nfs_unlock_request. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 575b5c7870c940326a11614e0279b74356c1d44f Author: Trond Myklebust Date: Thu Oct 19 23:28:37 2006 -0700 [PATCH] NFSv4: Fix thinko in fs/nfs/super.c Duh. addr.sin_port should be in network byte order. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e7d73824e6b0024100701da246fec769dd8f087 Author: David Howells Date: Thu Oct 19 23:28:36 2006 -0700 [PATCH] autofs3: Make sure all dentries refs are released before calling kill_anon_super() Make sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super(). The call to shrink_dcache_sb() is removed as it is redundant since shrink_dcache_for_umount() will now be called after the cleanup routine. Signed-off-by: David Howells Acked-by: Ian Kent Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2fbc6c2dad7bbcbf226c094749534f1e84d3be2 Author: Randy Dunlap Date: Thu Oct 19 23:28:35 2006 -0700 [PATCH] fs/Kconfig: move GENERIC_ACL, fix acl() call errors GENERIC_ACL shouldn't be under Network File Systems (which made it depend on NET) as far as I can tell. Having it there and having many (FS) config symbols disabled gives this (which the patch fixes): mm/built-in.o: In function `shmem_check_acl': shmem_acl.c:(.text.shmem_check_acl+0x33): undefined reference to `posix_acl_permission' fs/built-in.o: In function `generic_acl_get': (.text.generic_acl_get+0x30): undefined reference to `posix_acl_to_xattr' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0x75): undefined reference to `posix_acl_from_xattr' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0x94): undefined reference to `posix_acl_valid' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0xc1): undefined reference to `posix_acl_equiv_mode' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0x7a): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0xb4): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0xc8): undefined reference to `posix_acl_create_masq' fs/built-in.o: In function `generic_acl_chmod': (.text.generic_acl_chmod+0x49): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_chmod': (.text.generic_acl_chmod+0x76): undefined reference to `posix_acl_chmod_masq' Signed-off-by: Randy Dunlap Acked-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6f8ff7381501887233666b508b9eac70143303d Author: Randy Dunlap Date: Thu Oct 19 23:28:34 2006 -0700 [PATCH] cad_pid sysctl with PROC_FS=n If CONFIG_PROC_FS=n: kernel/sysctl.c:148: warning: 'proc_do_cad_pid' used but never defined kernel/built-in.o:(.data+0x1228): undefined reference to `proc_do_cad_pid' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c7c7c9bf39470c9689ad43cae3142cf948f4cfb Author: Ralf Baechle Date: Thu Oct 19 23:28:34 2006 -0700 [PATCH] Fix warnings for WARN_ON if CONFIG_BUG is disabled In most cases the return value of WARN_ON() is ignored. If the generic definition for the !CONFIG_BUG case is used this will result in a warning: CC kernel/sched.o In file included from include/linux/bio.h:25, from include/linux/blkdev.h:14, from kernel/sched.c:39: include/linux/ioprio.h: In function ‘task_ioprio’: include/linux/ioprio.h:50: warning: statement with no effect kernel/sched.c: In function ‘context_switch’: kernel/sched.c:1834: warning: statement with no effect Signed-off-by: Ralf Baechle Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a31baca58cc16fe0584685f54c6d17494a231c92 Author: Alan Cox Date: Thu Oct 19 23:28:33 2006 -0700 [PATCH] irq updates: make eata_pio compile Signed-off-by: Alan Cox Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ac773b4f73afa6fd66695131103944b975d5d5c Author: Alexey Dobriyan Date: Thu Oct 19 23:28:32 2006 -0700 [PATCH] OOM killer meets userspace headers Despite mm.h is not being exported header, it does contain one thing which is part of userspace ABI -- value disabling OOM killer for given process. So, a) create and export include/linux/oom.h b) move OOM_DISABLE define there. c) turn bounding values of /proc/$PID/oom_adj into defines and export them too. Note: mass __KERNEL__ removal will be done later. Signed-off-by: Alexey Dobriyan Cc: Nick Piggin Cc: David Woodhouse Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887b95931b4072e60e3bf4253ff7bffe372bca46 Author: Yasunori Goto Date: Thu Oct 19 23:28:31 2006 -0700 [PATCH] acpi memory hotplug: remove strange add_memory fail message I wrote a patch to avoid redundant memory hot-add call at boot time. This was cause of strange fail message of memory hotplug like "ACPI: add_memory failed". Memory is recognized by early boot code with EFI/E820. But, if DSDT describes memory devices for them, then hot-add code is called for already recognized memory, and it shows fail messages with -EEXIST. So, sys admin will misunderstand this message as something wrong by it. This patch avoids them by preventing redundant hot-add call until completion of driver initialization. [akpm@osdl.org: cleanups] Signed-off-by: Yasunori Goto Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cbe44cd8d48a92856295f445183f52bf42a544d Author: Yasunori Goto Date: Thu Oct 19 23:28:30 2006 -0700 [PATCH] Change log level of a message of acpi_memhotplug to KERN_DEBUG I suppose this message seems quite useless except debugging. It just shows "Hotplug Mem Device". System admin can't know anything by this message. So, I would like to change it to KERN_DEBUG. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91fcdd4e0314145d7d4fa52dba2f9c2da25346fd Author: Borislav Petkov Date: Thu Oct 19 23:28:29 2006 -0700 [PATCH] readjust comments of task_timeslice for kernel doc Signed-off-by: Borislav Petkov Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 145fc655a1ceabda76cf2ad74f7cf96863c65b65 Author: Ingo Molnar Date: Thu Oct 19 23:28:28 2006 -0700 [PATCH] genirq: clean up irq-flow-type naming, fix Re-add the set_irq_chip_and_handler() prototype, it's still widely used. Signed-off-by: Ingo Molnar Cc: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5a114f1fb2d3c54be62779a705e088471063b47 Author: Darrick J. Wong Date: Thu Oct 19 23:28:28 2006 -0700 [PATCH] fix "ACPI: Processor native C-states using MWAIT" This patch breaks C-state discovery on my IBM IntelliStation Z30 because the return value of acpi_processor_get_power_info_fadt is not assigned to "result" in the case that acpi_processor_get_power_info_cst returns -ENODEV. Thus, if ACPI provides C-state data via the FADT and not _CST (as is the case on this machine), we incorrectly exit the function with -ENODEV after reading the FADT. The attached patch sets the value of result so that we don't exit early. Signed-off-by: Darrick J. Wong Acked-by: "Pallipadi, Venkatesh" Acked-by: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74e8b51d254865b8abe4a94b5eb82b1940ec820c Author: Randy Dunlap Date: Thu Oct 19 23:28:26 2006 -0700 [PATCH] Kconfig serial typos Fix typo (repeated) in serial Kconfig. Signed-off-by: Randy Dunlap Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ba0ce6f9c19a8573832e14b418dc835dc6f3bbd Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:26 2006 -0700 [PATCH] uml: mmapper - remove just added but wrong "const" attribute When enabling the mmapper driver I got warnings because this "const" miscdevice structure is passed to function as non-const pointer; unlike struct tty_operations, however, I verified that misc_{de,}register _do_ modify their parameter, so this const attribute must be removed. Since the purpose of the change was to guarantee that no lock was needed, add a comment to prove this differently. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f43e6a5a72566675da3581dc0d7076042e6701f7 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:25 2006 -0700 [PATCH] uml: kconfig - silence warning Silence useless warning about undefined symbol in Kconfig. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9d645f06a8f50659bbae2be64ed8367ba068fc0 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:24 2006 -0700 [PATCH] uml: cleanup run_helper() API to fix a leak Freeing the stack is left uselessly to the caller of run_helper in some cases - this is taken from run_helper_thread, but here it is useless, so no caller needs it and the only place where this happens has a potential leak - in case of error neither run_helper() nor xterm_open() call free_stack(). At this point passing a pointer is not needed - the stack pointer should be passed directly, but this change is not done here. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2670eacfb013169b8bf151a5078a9ef8ef86466 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:23 2006 -0700 [PATCH] uml: use DEFCONFIG_LIST to avoid reading host's config This should make sure that, for UML, host's configuration files are not considered, which avoids various pains to the user. Our dependency are such that the obtained Kconfig will be valid and will lead to successful compilation - however they cannot prevent an user from disabling any boot device, and if an option is not set in the read .config (say /boot/config-XXX), with make menuconfig ARCH=um, it is not set. This always disables UBD and all console I/O channels, which leads to non-working UML kernels, so this bothers users - especially now, since it will happen on almost every machine (/boot/config-`uname -r` exists almost on every machine). It can be workarounded with make defconfig ARCH=um, but it is non-obvious and can be avoided, so please _do_ merge this patch. Given the existence of options, it could be interesting to implement (additionally) "option required" - with it, Kconfig will refuse reading a .config file (from wherever it comes) if the given option is not set. With this, one could mark with it the option characteristic of the given architecture (it was an old proposal of Roman Zippel, when I pointed out our problem): config UML option required default y However this should be further discussed: *) for x86, it must support constructs like: ==arch/i386/Kconfig== config 64BIT option required default n where Kconfig must require that CONFIG_64BIT is disabled or not present in the read .config. *) do we want to do such checks only for the starting defconfig or also for .config? Which leads to: *) I may want to port a x86_64 .config to x86 and viceversa, or even among more different archs. Should that be allowed, and in which measure (the user may force skipping the check for a .config or it is only given a warning by default)? Cc: Roman Zippel Cc: Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 493e3758be1d5628b4d799fe21d68969edbe32aa Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:22 2006 -0700 [PATCH] uml: reenable compilation of enable_timer, disabled by mistake CONFIG_MODE_TT does not work there, the UML_ prefixed version must be used - this causes a link-time failure when CONFIG_MODE_TT is enabled (i.e. always here, never by Jeff). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b028bcd0e746ae0f2f218b911032232a32dedd5 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:21 2006 -0700 [PATCH] uml: code convention cleanup of a file Fix coding conventions violations is arch/um/os-Linux/helper.c. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c13e569073b89eb75216a2551e89ae93ad1f9951 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:20 2006 -0700 [PATCH] uml: split memory allocation prototypes out of user.h user.h is too generic a header name. I've split out allocation routines from it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02a5323d8060d7259277e9e2936fd02129dc0984 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:20 2006 -0700 [PATCH] uml: remove some leftover PPC code I happened to notice that this code is a leftover and it should be removed - since there are sporadical efforts to revive the PPC port doing such cleanups is not useless. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fda982c501c6a8baa3fa79aaea1bfa7bb2a5def Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:19 2006 -0700 [PATCH] fix typo in memory barrier docs Fix cut'n'paste typo - &a and &b are used in other examples, in this one the doc uses &u and &v. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a3e9ad163b77a3c7504f58f2780b5a62238c0ac Author: Jeff Dike Date: Thu Oct 19 23:28:18 2006 -0700 [PATCH] uml: MODE_TT is bust arch/um/sys-x86_64/ptrace.c:20:1: warning: "SC_SS" redefined In file included from arch/um/include/sysdep/ptrace.h:18, from include/asm/ptrace-generic.h:12, from include/asm/ptrace.h:15, from arch/um/sys-x86_64/ptrace.c:8: arch/um/include/sysdep/sc.h:38:1: warning: this is the location of the previous definition arch/um/sys-x86_64/ptrace.c: In function 'putreg': arch/um/sys-x86_64/ptrace.c:63: warning: implicit declaration of function 'SC_FS_BASE' arch/um/sys-x86_64/ptrace.c:63: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c:63: warning: implicit declaration of function 'SC_GS_BASE' arch/um/sys-x86_64/ptrace.c:63: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c: In function 'getreg': arch/um/sys-x86_64/ptrace.c:101: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c:101: error: invalid lvalue in unary '&' I'd have to say that the fix for this, for now, is this: Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e856e6a522a8fc0feba7497f5b05aeaa13d473 Author: Ralf Baechle Date: Thu Oct 19 23:28:17 2006 -0700 [PATCH] Make userspace proof contains the constants for personality(2) but also some defintions that are useless or even harmful in userspace such as the personality() macro. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fcfab16c5b86eaa3db3a9a31adba550c5b67141 Author: Andrew Morton Date: Thu Oct 19 23:28:16 2006 -0700 [PATCH] separate bdi congestion functions from queue congestion functions Separate out the concept of "queue congestion" from "backing-dev congestion". Congestion is a backing-dev concept, not a queue concept. The blk_* congestion functions are retained, as wrappers around the core backing-dev congestion functions. This proper layering is needed so that NFS can cleanly use the congestion functions, and so that CONFIG_BLOCK=n actually links. Cc: "Thomas Maier" Cc: "Jens Axboe" Cc: Trond Myklebust Cc: David Howells Cc: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79e2de4bc53d7ca2a8eedee49e4a92479b4b530e Author: Thomas Maier Date: Thu Oct 19 23:28:15 2006 -0700 [PATCH] export clear_queue_congested and set_queue_congested Export the clear_queue_congested() and set_queue_congested() functions located in ll_rw_blk.c The functions are renamed to blk_clear_queue_congested() and blk_set_queue_congested(). (needed in the pktcdvd driver's bio write congestion control) Signed-off-by: Thomas Maier Cc: Peter Osterlund Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26da82058e62ea173559a26881b16d10089645ba Author: Pekka Enberg Date: Thu Oct 19 23:28:14 2006 -0700 [PATCH] ecryptfs: use special_file() Use the special_file() macro to check whether an inode is special instead of open-coding it. Acked-by: Mike Halcrow Cc: Phillip Hellewell Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb5527e68d495650a7658fec9a7246bf922db212 Author: Jeff Moyer Date: Thu Oct 19 23:28:13 2006 -0700 [PATCH] direct-io: sync and invalidate file region when falling back to buffered write When direct-io falls back to buffered write, it will just leave the dirty data floating about in pagecache, pending regular writeback. But normal direct-io semantics are that IO is synchronous, and that it leaves no pagecache behind. So change the fallback-to-buffered-write code to sync the file region and to then strip away the pagecache, just as a regular direct-io write would do. Acked-by: Jeff Moyer Cc: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8e82b76e0312827f5ae04b573a05b02854a447e Author: Auke Kok Date: Thu Oct 19 23:28:12 2006 -0700 [PATCH] e100: fix reboot -f with netconsole enabled When rebooting with netconsole over e100, the driver shutdown code would deadlock with netpoll. Reduce shutdown code to a bare minimum while retaining WoL and suspend functionality. Signed-off-by: Auke Kok Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7d8ac3e1779c30ddef0a8f38042076c5007a23d Author: Adrian Bunk Date: Thu Oct 19 16:02:07 2006 +0200 [GFS2] gfs2_dir_read_data(): fix uninitialized variable usage In the "if (extlen)" case, "bh" was used uninitialized. This patch changes the code to what seems to have been intended. Spotted by the Coverity checker. This patch also removes a pointless "bh = NULL" asignment (the variable is never accessed again after this point). Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit bbbe4512735eb0f15f09ffd14876091a8e91bc69 Author: Adrian Bunk Date: Thu Oct 19 15:27:00 2006 +0200 [GFS2] fs/gfs2/ops_fstype.c:fill_super_meta(): fix NULL dereference Don't dereference new->s_root when we do know it's NULL. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit 348acd48f050f5ba7fa917b1421ae34443be97dd Author: Adrian Bunk Date: Thu Oct 19 15:20:04 2006 +0200 [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): don't use an uninitialized variable In the "if (extlen)" case, "new" might be used uninitialized. Looking at the code, it should be initialized to 0. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit b0cb66955f4bf7a72b544096ceef48a829361a3c Author: Adrian Bunk Date: Thu Oct 19 15:13:26 2006 +0200 [GFS2] fs/gfs2/ops_fstype.c:gfs2_get_sb_meta(): remove unused variable The Coverity checker spotted this unused variable. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit abbdbd2065e74411dc2c401501c2c85a82f60e06 Author: Adrian Bunk Date: Thu Oct 19 15:12:24 2006 +0200 [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): remove dead code The Coverity checker spotted this obviously dead code. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit a2d7d021d78dbc00d24d9c809c64a7f3e61fa773 Author: Al Viro Date: Sat Oct 14 16:49:30 2006 +0100 [GFS2] gfs2 endianness bug: be16 assigned to be32 field Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse commit 23591256d61354e20f12e98d7a496ad5c23de74c Author: Steven Whitehouse Date: Fri Oct 13 17:25:45 2006 -0400 [GFS2] Fix bmap to map extents properly This fix means that bmap will map extents of the length requested by the VFS rather than guessing at it, or just mapping one block at a time. The other callers of gfs2_block_map are audited to ensure they send the correct max extent lengths (i.e. set bh->b_size correctly). Signed-off-by: Steven Whitehouse commit 42fb00838a644d03f9a2a5fbbe0b668a5ff5df4d Author: Patrick Caulfield Date: Fri Oct 13 17:12:05 2006 +0100 [DLM] fix iovec length in recvmsg I didn't spot that the msg_iovlen was set to 2 if there were two elements in the iovec but left at zero if not :( I think this might be why bob was still seeing trouble. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 7b19ffc40b0247fcfe083644fdb621fdb3c05ef6 Author: Marcel Holtmann Date: Fri Oct 20 08:55:48 2006 +0200 [Bluetooth] Fix HID disconnect NULL pointer dereference The latest HID disconnect sequence change introduced a NULL pointer dereference. For the quirk to handle buggy remote HID implementations, it is enough to wait for a potential control channel disconnect from the remote side and it is also enough to wait only 500 msecs. Signed-off-by: Marcel Holtmann commit 8602b4fe6e82d5eeb479efd3bca19bc3dd722f5a Author: Marcel Holtmann Date: Fri Oct 20 08:55:34 2006 +0200 [Bluetooth] Add missing entry for Nokia DTL-4 PCMCIA card The device id for the Nokia DTL-4 PCMCIA card was missing. This patch adds it back to the list of supported devices. Signed-off-by: Marcel Holtmann commit 0eab934f4b9668669cffebfa8a9542fedf9082af Author: Marcel Holtmann Date: Fri Oct 20 08:55:29 2006 +0200 [Bluetooth] Add support for newer ANYCOM USB dongles This patch adds the vendor and product id of the ANYCOM Bluetooth USB-200 and USB-250 dongles and sets a flag to send HCI_Reset as the first command. Signed-off-by: Marcel Holtmann Date: Fri Oct 20 00:32:41 2006 -0700 [NET]: Can use __get_cpu_var() instead of per_cpu() in loopback driver. As BHs are off in loopback_xmit(), preemption cannot occurs, so we can use __get_cpu_var() instead of per_cpu() (and avoid a preempt_enable()/preempt_disable() pair) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6cf431d77c3e917399a847e3a7ec239d5163056b Author: David Woodhouse Date: Fri Oct 20 00:29:33 2006 -0700 [SPARC]: Clean up asm-sparc/elf.h pollution in userspace. We don't need to export sparc_elf_hwcap() to userspace, and it doesn't build there. Remove it by moving it inside #ifdef __KERNEL__, along with some other things which don't need to be exported. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 78d79423179c0efc7ec34b55d287e7be4ca07da6 Author: Eric Dumazet Date: Fri Oct 20 00:28:35 2006 -0700 [IPV4] inet_peer: Group together avl_left, avl_right, v4daddr to speedup lookups on some CPUS Lot of routers/embedded devices still use CPUS with 16/32 bytes cache lines. (486, Pentium, ... PIII) It makes sense to group together fields used at lookup time so they fit in one cache line. This reduce cache footprint and speedup lookups. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 06ca719faddaf5ea46c6356b12847663c3ed8806 Author: Eric Dumazet Date: Fri Oct 20 00:22:25 2006 -0700 [TCP]: One NET_INC_STATS() could be NET_INC_STATS_BH in tcp_v4_err() I believe this NET_INC_STATS() call can be replaced by NET_INC_STATS_BH(), a little bit cheaper. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 82fac0542e11c0d3316cc8fdafd2a990d2aab692 Author: Björn Steinbrink Date: Fri Oct 20 00:21:10 2006 -0700 [NETFILTER]: Missing check for CAP_NET_ADMIN in iptables compat layer The 32bit compatibility layer has no CAP_NET_ADMIN check in compat_do_ipt_get_ctl, which for example allows to list the current iptables rules even without having that capability (the non-compat version requires it). Other capabilities might be required to exploit the bug (eg. CAP_NET_RAW to get the nfnetlink socket?), so a plain user can't exploit it, but a setup actually using the posix capability system might very well hit such a constellation of granted capabilities. Signed-off-by: Björn Steinbrink Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 206daaf77f68ce0f103164e6406336068c87a4a5 Author: Stephen Hemminger Date: Thu Oct 19 23:58:23 2006 -0700 [NETPOLL]: initialize skb for UDP Need to fully initialize skb to keep lower layers and queueing happy. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 66a740572d7bcb18469e71cb014bfed3ff75a773 Author: Paul Mundt Date: Fri Oct 20 15:30:55 2006 +0900 sh: Convert INTC2 to IRQ table registration. Currently the INTC2 code contains a fixed IRQ table that it iterates through to set the handler type, we move this in to the CPU subtype setup code instead and allow for submitting the table that way. This drops the ST40 tables, as nothing has been happening with those processors, while converting the only existing users to use the new table directly (SH7760 and SH7780). Signed-off-by: Paul Mundt commit 6bda57365a5fda4743d83a5987c6aab66e90771c Author: David S. Miller Date: Wed Oct 18 23:00:35 2006 -0700 [SPARC64]: Fix of_ioremap(). Use request_mem_region() if IORESOURCE_MEM. Signed-off-by: David S. Miller commit e83f214e45a80459d2931ae1259ab5fae82c8a8e Author: David S. Miller Date: Wed Oct 18 12:48:35 2006 -0700 [SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly. virtual-dma property layout is [start, size] not [start, end]. Signed-off-by: David S. Miller commit 98978edb6278f0fb30c8d636c6a79a28f9164cb9 Author: John W. Linville Date: Tue Oct 17 10:54:36 2006 -0400 [PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls WE-21 changed the ABI for the SIOC[SG]IW{ESSID,NICKN} ioctls by dropping NULL termination. This patch adds compatibility code so that WE-21 can work properly with WE-20 (and older) tools. Signed-off-by: John W. Linville commit 8c34e2d63231d4bf4852bac8521883944d770fe3 Author: Jens Axboe Date: Tue Oct 17 19:43:22 2006 +0200 [PATCH] Remove SUID when splicing into an inode Originally from Mark Fasheh generic_file_splice_write() does not remove S_ISUID or S_ISGID. This is inconsistent with the way we generally write to files. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit 01de85e057328ecbef36e108673b1e81059d54c1 Author: Jens Axboe Date: Tue Oct 17 19:50:36 2006 +0200 [PATCH] Add lockless helpers for remove_suid() Right now users have to grab i_mutex before calling remove_suid(), in the unlikely event that a call to ->setattr() may be needed. Split up the function in two parts: - One to check if we need to remove suid - One to actually remove it The first we can call lockless. Signed-off-by: Jens Axboe commit 6da61809822c22634a3de2dcb3c60283b836a88a Author: Mark Fasheh Date: Tue Oct 17 18:43:07 2006 +0200 [PATCH] Introduce generic_file_splice_write_nolock() This allows file systems to manage their own i_mutex locking while still re-using the generic_file_splice_write() logic. OCFS2 in particular wants this so that it can order cluster locks within i_mutex. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit 62752ee198dca9209b7dee504763e51b11e9e0ca Author: Mark Fasheh Date: Tue Oct 17 10:31:38 2006 +0200 [PATCH] Take i_mutex in splice_from_pipe() The splice_actor may be calling ->prepare_write() and ->commit_write(). We want i_mutex on the inode being written to before calling those so that we don't race i_size changes. The double locking behavior is done elsewhere in splice.c, and if we eventually want _nolock variants of generic_file_splice_write(), fs modules might have to replicate the nasty locking code. We introduce inode_double_lock() and inode_double_unlock() to consolidate the locking rules into one set of functions. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit d89e36d8df547fde2beaea82211954868da2282d Author: Ralf Baechle Date: Thu Oct 19 14:21:47 2006 +0100 [MIPS] Fix iounmap argument to const volatile. With the existing prototype the following code: const void __iomem *io = ioremap(); x = readb(io); iounmap(io); did result in a warning. Signed-off-by: Ralf Baechle commit d2bcf87d0fcdc10d1be65b03fd032bec05efe49f Author: Ralf Baechle Date: Wed Oct 18 23:52:17 2006 +0100 [MIPS] Reserve syscall numbers for kexec_load. Signed-off-by: Ralf Baechle commit e7a6f9c1f4e46f7fd776c6ee38bdb8f8ae131a82 Author: Yoichi Yuasa Date: Wed Oct 18 23:48:31 2006 +0900 [MIPS] Update tb0287_defconfig Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0895b19ebdbb44d6d2eee0d7a138f07b2ddb04ec Author: Yoichi Yuasa Date: Wed Oct 18 23:38:12 2006 +0900 [MIPS] Update pnx8550-v2pci_defconfig In the current pnx8550-v2pci_defconfig CONFIG_SGI_IP22 has been selected. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 00ddf2be159e3b96ba8872b407240e1bb449b75e Author: Yoichi Yuasa Date: Wed Oct 18 23:36:15 2006 +0900 [MIPS] Update pnx8500-jbs_defconfig In the current pnx8550-jbs_defconfig CONFIG_SGI_IP22 has been selected. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 94399ea62fc1047eded76b45b972e7850a800a1b Author: Yoichi Yuasa Date: Wed Oct 18 23:27:29 2006 +0900 [MIPS] More vr41xx pt_regs fixups Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit eea32d4c6e272b6c324c8c22df4c28274fcb5a21 Author: Atsushi Nemoto Date: Mon Oct 16 22:48:49 2006 +0900 [MIPS] save_context_stack fix CONFIG_KALLSYMS=n case is obviously wrong, though it is harmless since CONFIG_KALLSYMS is always enabled with CONFIG_STACKTRACE for now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 089c7e7f2da7c3245de47377252683bd9edae738 Author: Ralf Baechle Date: Mon Oct 16 16:49:37 2006 +0100 [MIPS] Use compat_sys_mount. This fixes mount problems with smbfs, ncpfs and NFSv4. Signed-off-by: Ralf Baechle commit 53571ce47010562f5e67782ea00206f379a5cd65 Author: Thiemo Seufer Date: Sun Aug 13 00:53:29 2006 +0100 [MIPS] Fix O32 personality(2) call with 0xffffffff argument. A sign extension bug did result in sys_personality being invoked with a 0xffffffffffffffffUL argument, so querying the current personality didn't work. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 36d98e79b798fb27e38b9be4f36c5a96025f9281 Author: Ralf Baechle Date: Sun Oct 15 09:19:58 2006 +0100 [MIPS] A few more pt_regs fixups. Signed-off-by: Ralf Baechle commit ba38cdf94285a1fc6a01fd493bdc5304bc83f61e Author: Ralf Baechle Date: Sun Oct 15 09:17:43 2006 +0100 [MIPS] Malta: Fix uninitialized regs pointer. Signed-off-by: Ralf Baechle commit 22c56c3a03b377d21d8363f737aa2a855d892458 Author: Ralf Baechle Date: Sun Oct 15 09:15:19 2006 +0100 [MIPS] Delete unneeded pt_regs forward declaration. Signed-off-by: Ralf Baechle commit 55b7428303d390c53d3a1bc587de8592ce65900e Author: Franck Bui-Huu Date: Fri Oct 13 13:37:35 2006 +0200 [MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup() This new routine doesn't lookup for symbol names. So we needn't to pass any char buffers or pointer since we don't care about names. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 709bc44c31db4eeeec7dcf7d3f3fefd057adf7fb Author: Paul Mundt Date: Thu Oct 19 17:32:56 2006 +0900 sh: Updates for irq-flow-type naming changes. handle_irq_name() and set_irq_chip_and_handler() disappeared, update for desc->name and set_irq_chip_and_handler_name() use. Signed-off-by: Paul Mundt commit c2a560f5334c55da1e8bfa17586cc1d4e7f8ed85 Author: Paul Mundt Date: Thu Oct 19 17:31:22 2006 +0900 sh: Add some missing board headers. Some of these were dropped in the header directory rework, add the few missing ones back in. Signed-off-by: Paul Mundt commit 1f666587dbf6bc660b23d8dd8abb6c572ce3eae5 Author: Paul Mundt Date: Thu Oct 19 16:20:25 2006 +0900 sh: Fix exception_handling_table alignment. With the recent change ripping out interrupt_table, explicit padding of the table was missing, causing bad things to happen when manually inserting handlers in to the table. This problem particularly showed up in relation to do_fpu_state_restore() which was inserted quite deeply in to the table and ended up scribbling over a slab object. Signed-off-by: Paul Mundt commit 082c44d20eb4c6c4aa60ae7429ea184854cb0610 Author: Paul Mundt Date: Thu Oct 19 16:16:18 2006 +0900 sh: Cleanup board header directories. Now with the ide.h mess sorted out, most of these boards don't need their own directory. Move the headers out, and update the driver paths. Signed-off-by: Paul Mundt commit 4a58eaca7ca68abea37d6d2a4ea7deb394906183 Author: Paul Mundt Date: Thu Oct 19 16:15:13 2006 +0900 sh: Remove board-specific ide.h headers. The driver that these were using never made it in to drivers/ide, so kill off the rest of the cruft. These will have to be reworked for board-specific platform devices through libata when they're added back through the setup code. Signed-off-by: Paul Mundt commit 6b0022305f80cf249de69e746f6f5ccf7ffc5b7c Author: Paul Mundt Date: Thu Oct 12 17:07:45 2006 +0900 sh: Proper show_stack/show_trace() implementation. This splits out some of the previous show_stack() implementation which was mostly doing the show_trace() work without actually dumping any of the stack contents. This now gets split in to two sections, where we do the fetching of the stack pointer and subsequent stack dumping in show_stack(), while moving the call trace in to show_trace(). Signed-off-by: Paul Mundt commit 6723ab549df777742801716d7aeea397e6e97f2c Author: David S. Miller Date: Wed Oct 18 21:20:57 2006 -0700 [IPV6]: Fix route.c warnings when multiple tables are disabled. Signed-off-by: David S. Miller commit 6ba7511b7c8b71d5148f7516584d0b677acc384a Author: David S. Miller Date: Wed Oct 18 20:56:06 2006 -0700 [TG3]: Bump driver version and release date. Signed-off-by: David S. Miller commit bc3a9254a7925b6278f6d882746fe6a0bdf6f610 Author: Michael Chan Date: Wed Oct 18 20:55:18 2006 -0700 [TG3]: Add lower bound checks for tx ring size. The minimum tx ring size must be greater than MAX_SKB_FRAGS or 3 times that on some chips with TSO bugs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 42952231c6a8623117ee3cc89c82d382dc69ca30 Author: Ranjit Manomohan Date: Wed Oct 18 20:54:26 2006 -0700 [TG3]: Fix set ring params tx ring size implementation Fixes the implementation of the ethtool set ring parameters for the tg3 transmit ring. The size of tx_pending is taken into account before doing a netif_wake_queue. This prevents the interface from locking up when smaller transmit ring sizes are used. Signed-off-by: Ranjit Manomohan Acked-by: Michael Chan Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5175c3786c244f8b689854db24c9e79b1c6a084f Author: Eric Dumazet Date: Wed Oct 18 20:51:57 2006 -0700 [NET]: reduce per cpu ram used for loopback stats We dont need a full struct net_device_stats (currently 23 long : 184 bytes on x86_64) per possible CPU, but only two counters : bytes and packets We save few CPU cycles too in loopback_xmit() not updating 4 fields, but 2. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9ce8ade015a3f82dbdf856df7a685878dd1cc0e1 Author: Thomas Graf Date: Wed Oct 18 20:46:54 2006 -0700 [IPv6] route: Fix prohibit and blackhole routing decision Lookups resolving to ip6_blk_hole_entry must result in silently discarding the packets whereas an ip6_pkt_prohibit_entry is supposed to cause an ICMPV6_ADM_PROHIBITED message to be sent. Thanks to Kim Nordlund for noticing this bug. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 3a31b9d2f2d98667832e87fa1853754ff062d6ef Author: Steven Whitehouse Date: Wed Oct 18 20:45:22 2006 -0700 [DECNET]: Fix input routing bug This patch fixes a silly bug that has been in the input routing code for some time. It results in trying to send to a node directly when the origin of the packet is via the default router. Its been tested by Alan Kemmerer who reported the bug and its a fairly obvious fix for a typo. Signed-off-by: Steven Whitehouse Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit ae8064ac32d07f609114d73928cdef803be87134 Author: John Heffner Date: Wed Oct 18 20:36:48 2006 -0700 [TCP]: Bound TSO defer time This patch limits the amount of time you will defer sending a TSO segment to less than two clock ticks, or the time between two acks, whichever is longer. On slow links, deferring causes significant bursts. See attached plots, which show RTT through a 1 Mbps link with a 100 ms RTT and ~100 ms queue for (a) non-TSO, (b) currnet TSO, and (c) patched TSO. This burstiness causes significant jitter, tends to overflow queues early (bad for short queues), and makes delay-based congestion control more difficult. Deferring by a couple clock ticks I believe will have a relatively small impact on performance. Signed-off-by: John Heffner Signed-off-by: David S. Miller commit b52f070c9c3c09ed3b7f699280193aae7e25d816 Author: Thomas Graf Date: Wed Oct 18 20:26:36 2006 -0700 [IPv4] fib: Remove unused fib_config members Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 22e1e4d8dcb71762fcbe0c73d720aea8bb2013af Author: Ville Nuorvala Date: Mon Oct 16 22:14:26 2006 -0700 [IPV6]: Always copy rt->u.dst.error when copying a rt6_info. Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit 264e91b68aff1e39b558123498f28bf5aa68b4ee Author: Ville Nuorvala Date: Mon Oct 16 22:12:21 2006 -0700 [IPV6]: Make IPV6_SUBTREES depend on IPV6_MULTIPLE_TABLES. As IPV6_SUBTREES can't work without IPV6_MULTIPLE_TABLES have IPV6_SUBTREES depend on it. Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit e0eda7bbaae48ea56f1f1943ea90df72d459b9b0 Author: Ville Nuorvala Date: Mon Oct 16 22:11:11 2006 -0700 [IPV6]: Clean up BACKTRACK(). The fn check is unnecessary as fn can never be NULL in BACKTRACK(). Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit 4251320fa2ef93207fbefeb2eda2d265b84fc116 Author: Ville Nuorvala Date: Mon Oct 16 22:10:05 2006 -0700 [IPV6]: Make sure error handling is done when calling ip6_route_output(). As ip6_route_output() never returns NULL, error checking must be done by looking at dst->error in stead of comparing dst against NULL. Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit 23c435f7ff884caded4a1391ba2b308d465423c0 Author: Ville Nuorvala Date: Mon Oct 16 22:08:28 2006 -0700 [SCTP]: Fix minor typo Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit e320af1df4c47305e829e8e1a40e5fad0e5e9fba Author: Ville Nuorvala Date: Mon Oct 16 22:05:55 2006 -0700 [IPV6]: Remove struct pol_chain. Struct pol_chain has existed since at least the 2.2 kernel, but isn't used anymore. As the IPv6 policy routing is implemented in a totally different way in the current kernel, just get rid of it. Signed-off-by: Ville Nuorvala Signed-off-by: David S. Miller commit 665d8669583e28c397d4333385d8f46ca5864048 Author: Allan Stephens Date: Mon Oct 16 22:01:32 2006 -0700 [TIPC]: Updated TIPC version number to 1.6.2 Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 53cfd1e102c759c958f907ee40a58bec3fc5911a Author: Allan Stephens Date: Mon Oct 16 22:00:56 2006 -0700 [TIPC]: Unrecognized configuration command now returns error message This patch causes TIPC to return an error message when it receives an unrecognized configuration command. (Previously, the sender received no feedback.) Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit eb409460b1abec0e2a1f9c9d07019f4157a6d6bc Author: Lijun Chen Date: Mon Oct 16 21:59:42 2006 -0700 [TIPC]: Added subscription cancellation capability This patch allows a TIPC application to cancel an existing topology service subscription by re-requesting the subscription with the TIPC_SUB_CANCEL filter bit set. (All other bits of the cancel request must match the original subscription request.) Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit fc144deec6403c17e6d3f6a6574f701420f166ed Author: Allan Stephens Date: Mon Oct 16 21:57:56 2006 -0700 [TIPC]: Can now list multicast link on an isolated network node This patch fixes a minor bug that prevents "tipc-config -l" from displaying the multicast link if a TIPC node has never successfully established at least one unicast link. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 2de07f6156fe664063207c010b3bd2500348884a Author: Allan Stephens Date: Mon Oct 16 21:57:13 2006 -0700 [TIPC]: Fixed slow link reactivation when link tolerance is large This patch corrects an issue wherein a previouly failed node could not reestablish a links to a non-failing node in the TIPC network until the latter node detected the link failure itself (which might be configured to take up to 30 seconds). The non-failing node now responds to link setup requests from a previously failed node in at most 1 second, allowing it to detect the link failure more quickly. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 08c31f7167b1bdc30cd0960b45d6f3076eb1f179 Author: Allan Stephens Date: Mon Oct 16 21:56:04 2006 -0700 [TIPC]: Name publication events now delivered in chronological order This patch tivially re-orders the entries in TIPC's list of local publications so that applications will receive publication events in the order they were published. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 3a8d12142eab420ffcbbf3d1d2e637158e85aab8 Author: Allan Stephens Date: Mon Oct 16 21:50:20 2006 -0700 [TIPC]: Add support for Ethernet VLANs This patch enhances TIPC's Ethernet support to include VLAN interfaces. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a3df92c73b92970dc4211189b87eb4cf874f5685 Author: Allan Stephens Date: Mon Oct 16 21:49:03 2006 -0700 [TIPC]: Remove code bloat introduced by print buffer rework This patch allows the compiler to optimize out any code that tries to send debugging output to the null print buffer (TIPC_NULL), a capability that was unintentionally broken during the recent print buffer rework. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit cfb0c0890b200364c0886c0d9f0dc615f8114c43 Author: Allan Stephens Date: Mon Oct 16 21:47:18 2006 -0700 [TIPC]: Optimize wakeup logic when socket has no waiting processes This patch adds a simple test so TIPC doesn't try waking up processes waiting on a socket if there are none waiting. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit e91ed0bcdfc4812c0342d64281ee985213df07c3 Author: Allan Stephens Date: Mon Oct 16 21:44:59 2006 -0700 [TIPC]: Added duplicate node address detection capability TIPC now rejects and logs link setup requests from node if the receiving node already has a functional link to that node on the associated interface, or if the requestor is using the same as the receiver. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit eb5959c2bd290bf6c24ddf6d1f5ebcb496c54adb Author: Allan Stephens Date: Mon Oct 16 21:43:54 2006 -0700 [TIPC]: Stream socket can now send > 66000 bytes at a time The stream socket send code was not initializing some required fields of the temporary msghdr structure it was utilizing; this is now fixed. A check has also been added to detect if a user illegally specifies a destination address when sending on an established stream connection. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 29ede244cc4cfb11432a0bffd158ba09e7b2c167 Author: Allan Stephens Date: Mon Oct 16 21:42:04 2006 -0700 [TIPC]: Debug print buffer enhancements and fixes This change modifies TIPC's print buffer code as follows: 1) Now supports small print buffers (min. size reduced from 512 bytes to 64) 2) Now uses TIPC_NULL print buffer structure to indicate null device instead of NULL pointer (this simplified error handling) 3) Fixed misuse of console buffer structure by tipc_dump() 4) Added and corrected comments in various places Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 065fd1772af2032bebdce006071df007c039734d Author: Allan Stephens Date: Mon Oct 16 21:38:05 2006 -0700 [TIPC]: Add missing unlock in port timeout code. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit bd452e6f178a559408c54c2b4ca29191b812d47f Author: Jean Delvare Date: Fri Oct 13 17:03:42 2006 +0200 hwmon: Fix debug messages in w83781d Fix debug messages in w83781d at detection time. We can't use dev_dbg() on an i2c client's device before calling i2c_attach_client() on that client. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e693810ce8495ce3e227dacaa83f501b3b8ab204 Author: Jean Delvare Date: Fri Oct 13 16:56:28 2006 +0200 hwmon: Let w83781d and lm78 load again Let the w83781d and lm78 hardware monitoring drivers load even when no chip was detected at the ISA address. There can still be supported chips connected to an I2C bus or SMBus. This fixes bug #7293. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 14992c7eff937bb12c8ebf2d91dbaa8c2f0cfc87 Author: Rudolf Marek Date: Sun Oct 8 22:02:09 2006 +0200 w83627ehf: Fix the detection of fan5 Fix the detection of fan5 and preserve the bit between the register writes, because the bit is write only. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4660cb354a1dacbbc9c96f94eceedc38fe542fe2 Author: Rudolf Marek Date: Sun Oct 8 22:01:26 2006 +0200 k8temp: Documentation update Update the documentation for the k8temp driver. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6091780eba5d195213747b515a62211ac97641f1 Author: Jean Delvare Date: Sun Oct 8 22:00:44 2006 +0200 smsc47m1: List the SMSC LPC47M112 as supported The SMSC LPC47M112 Super-I/O chip appears to be compatible with the LPC47M10x and LPC47M13x as far as hardware monitoring is concerned. The device ID is even the same, so it's really only a documentation update. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 15fe25ca67234514d7cf41af28096c1330f44950 Author: Jean Delvare Date: Sun Oct 8 21:59:54 2006 +0200 hwmon: Fix documentation typos Fix typos in hardware monitoring documentation. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2ca7b961c3c9f072d307293aad0f9705522e916a Author: Grant Coady Date: Sun Oct 8 21:57:41 2006 +0200 adm9240: Update Grant Coady's email address Replace a bouncing email that I cannot recover from Mr Google. Signed-off-by: Grant Coady Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 34fc921a253f3ddfc4ad9de1dbc88683f84fbaaa Author: Jim Cromie Date: Sun Oct 8 21:56:29 2006 +0200 w83791d: Fix unchecked return status Replace all unchecked calls to device_create_file with a single group declaration, and one call to sysfs_create_group, and check that one return status. Also remove the files on device detach. Signed-off-by: Jim Cromie Signed-off by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4ca5224f3ea4779054d96e885ca9b3980801ce13 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 aoe: fix sysfs_create_file warnings Moved the attributes into a group, making the compiler be quiet about ignoring the return value of the file create calls. This also also fixed a bug when removing the files, which were not symlinks. Cc: "Ed L. Cashin" Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit a12c93f08b8fc83b7fcdabaf92b1adcea7489f5e Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: revert printk macros This patch addresses the concern that the aoe driver should not introduce unecessary conventions that must be learned by the reader. It reverts patch 6. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 086216db1435f44a58c18454acfa59f013510c95 Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: update driver version Update aoe driver version number to 32. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b849086d8f77f8a1269a01d5552fbf355311f7ac Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: remove sysfs comment Remove unecessary comment. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 392e4845f9728114f7ffa8d7612683397fd4d441 Author: Ed L. Cashin Date: Wed Sep 20 14:36:50 2006 -0400 aoe: use bio->bi_idx Instead of starting with bio->bi_io_vec, use the offset in bio->bi_idx. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b751e8b6590efdb76e1682c85bfcd5f3531ccae4 Author: Ed L. Cashin Date: Wed Sep 20 14:36:50 2006 -0400 aoe: module parameter for device timeout The aoe_deadsecs module parameter sets the number of seconds that elapse before a nonresponsive AoE device is marked as dead. This is runtime settable in sysfs or settable with a module load or kernel boot parameter. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4f51dc5e9ae195d2e8c22e5f574e004c2f6518a4 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: zero copy write 2 of 2 Avoid memory copy on writes. (This patch follows patch 4.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dced3a053dd5415a7321e1ae153c96dea644da4e Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: improve retransmission heuristics Add a dynamic minimum timer for better retransmission behavior. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ddec63e86752b89776547e93aa68af01f1cbb10c Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: jumbo frame support 2 of 2 Add support for jumbo ethernet frames. (This patch follows patch 5.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6bb6285fdb948cedee586c6bebc9ebc5e32a5c35 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: clean up printks via macros Use simple macros to clean up the printks. (This patch is reverted by the 14th patch to follow.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 19bf26353c50bc2be375109ec73f2f0bbd616ed1 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: jumbo frame support 1 of 2 Add support for jumbo ethernet frames. (This patch depends on patch 7 to follow.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e407a7f6cd143b3ab4eb3d7e1cf882e96b710eb5 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: zero copy write 1 of 2 Avoid memory copy on writes. (This patch depends on fixes in patch 9 to follow.) Although skb->len should not be set when working with linear skbuffs, the skb->tail pointer maintained by skb_put/skb_trim is not relevant to what happens when the skb_fill_page_desc function is called. This issue was raised without comment in linux-kernel and netdev earlier this month: http://thread.gmane.org/gmane.linux.kernel/446474/ http://thread.gmane.org/gmane.linux.network/45444/ So until there is something analogous to skb_put that works for zero-copy write skbuffs, we will do what the other callers of skb_fill_page_desc are doing. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2fdc0ea75b26e3009cfdf72e79901e4e16bb99bd Author: Ed L. Cashin Date: Wed Sep 20 14:36:48 2006 -0400 aoe: remove unused NARGS enum The NARGS enum is left over from older code versions. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2611464d7f36685fb1990275d3de1e72e6aff9d9 Author: Ed L. Cashin Date: Wed Sep 20 14:36:48 2006 -0400 aoe: update copyright date Update the copyright year to 2006. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 463c2c12dce78dd0cb77b65beba93f029a164ba3 Author: Ed L. Cashin Date: Wed Sep 20 14:34:41 2006 -0400 aoe: eliminate isbusy message This message doesn't help users because the circumstance isn't problematic. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4d664238207a82c4018757e2d87cf2a780462dcd Author: Akinobu Mita Date: Mon Oct 9 18:04:30 2006 +0900 driver core: kmalloc() failure check in driver_probe_device driver_probe_device() is missing kmalloc() failure check. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit d9fd4d3b317a231e47f31d64d66c8cc7765d458f Author: Jeff Garzik Date: Wed Oct 4 07:48:03 2006 -0400 Driver core: bus: remove indentation level Before potentially fixing up these functions, this cosmetic change reduces the indentation level to make the code easier to read and maintain. No functional changes at all. Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit f70fa6296c2ec8f541f0a9b406ccc2d9d127d639 Author: Alan Stern Date: Thu Oct 5 17:03:24 2006 -0400 Driver core: Don't ignore error returns from probing This patch (as797) fixes device_add() in the driver core. It needs to pay attention when the driver for a new device reports an error. At the same time, since bus_remove_device() undoes the effects of both bus_add_device() and bus_attach_device(), it needs to check whether the bus_attach_device step failed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 952ab431cd36c7ab573f685af8679c3677cbdc29 Author: Jesper Juhl Date: Thu Sep 28 23:56:01 2006 +0200 Driver core: Don't leak 'old_class_name' in drivers/base/core.c::device_rename() If kmalloc() fails to allocate space for 'old_symlink_name' in drivers/base/core.c::device_rename(), then we'll leak 'old_class_name'. Spotted by the Coverity checker. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 221c324a336770a911b16bda02b9f4adad506a35 Author: Cornelia Huck Date: Fri Sep 22 11:37:32 2006 +0200 driver core fixes: sysfs_create_group() retval in topology.c Return the return value of sysfs_create_group() in topology_add_dev(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 141ecc5320147d363d060cfc8042d197a3cdd496 Author: Cornelia Huck Date: Fri Sep 22 11:37:27 2006 +0200 driver core fixes: device_create_file() retval check in dmapool.c Check for device_create_file() return value in dma_pool_create(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit a306eea40952e6365301e8a2f7d5ffa9c6a1921b Author: Cornelia Huck Date: Fri Sep 22 11:37:13 2006 +0200 driver core fixes: device_add() cleanup on error Check for return code of device_create_file() and correct cleanup in the error case in device_add(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 513e7337adc32cdfbffecb99953e45a44e812c2d Author: Cornelia Huck Date: Fri Sep 22 11:37:08 2006 +0200 driver core fixes: bus_add_device() cleanup on error Correct cleanup in the error path of bus_add_device(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 1bb6881acae1c4f11a6e86f04df32ba45e95031d Author: Cornelia Huck Date: Fri Sep 22 11:37:04 2006 +0200 driver core fixes: bus_add_attrs() retval check Check return value of bus_add_attrs() in bus_register(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit f0e1761ac528e9d28f3ba06bd268ec41fe872ac8 Author: Cornelia Huck Date: Fri Sep 22 11:37:00 2006 +0200 driver core fixes: sysfs_create_link() retval check in class.c Check for return value of sysfs_create_link() in class_device_add(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 97a501849d60f3dbb8bfcd2300cf65dd5ebc0355 Author: Hidetoshi Seto Date: Wed Sep 20 16:49:02 2006 +0900 sysfs: update obsolete comment in sysfs_update_file And the obsolete comment should be updated (or totally removed). Signed-off-by: Hidetoshi Seto Signed-off-by: Greg Kroah-Hartman commit e42344514c6e8ca7f5427da9b1407b56550dfa01 Author: Hidetoshi Seto Date: Wed Sep 20 16:38:00 2006 +0900 sysfs: remove duplicated dput in sysfs_update_file Following function can drops d_count twice against one reference by lookup_one_len. /** * sysfs_update_file - update the modified timestamp on an object attribute. * @kobj: object we're acting for. * @attr: attribute descriptor. */ int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) { struct dentry * dir = kobj->dentry; struct dentry * victim; int res = -ENOENT; mutex_lock(&dir->d_inode->i_mutex); victim = lookup_one_len(attr->name, dir, strlen(attr->name)); if (!IS_ERR(victim)) { /* make sure dentry is really there */ if (victim->d_inode && (victim->d_parent->d_inode == dir->d_inode)) { victim->d_inode->i_mtime = CURRENT_TIME; fsnotify_modify(victim); /** * Drop reference from initial sysfs_get_dentry(). */ dput(victim); res = 0; } else d_drop(victim); /** * Drop the reference acquired from sysfs_get_dentry() above. */ dput(victim); } mutex_unlock(&dir->d_inode->i_mutex); return res; } PCI-hotplug (drivers/pci/hotplug/pci_hotplug_core.c) is only user of this function. I confirmed that dentry of /sys/bus/pci/slots/XXX/* have negative d_count value. This patch removes unnecessary dput(). Signed-off-by: Hidetoshi Seto Acked-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman commit 722385f75efd82d9f480f0765a1e97a4d83cac0d Author: Diego Calleja Date: Thu Sep 21 22:37:10 2006 +0200 HOWTO: bug report addition I suspect that not many people is subscribed to the bugzilla mailing list, not surprising since the URLs doesn't seem to be in the tree :) After fixing my english, I wonder if the following patch could be applied... Signed-off-by: Diego Calleja Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 310a922d4307ed38b37982a6f93b11fdf3b8dcb1 Author: Matthew Wilcox Date: Sat Sep 23 23:35:04 2006 -0600 Fix dev_printk() is now GPL-only Make dev_printk usable from non-GPL modules again dev_printk now calls dev_driver_string. We want even proprietary modules to be calling dev_printk, so the export of dev_driver_string needs to be non-GPL-only. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 0fbf116d120a2dc5d808204c7d86ad35f7d7846f Author: Duncan Sands Date: Wed Sep 27 23:38:08 2006 +0200 Driver core: plug device probe memory leak Make sure data is freed if the kthread fails to start. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit acbd39fbc5d8757aa920c6045399374df7a6dd68 Author: Dominik Brodowski Date: Sat Sep 30 22:41:43 2006 -0400 Documentation: feature-removal-schedule typo Fix typo in newly added feature remove schedule item. Signed-off-by: Dominik Brodowski Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7a54f25cef6c763f16c9fd49ae382de162147873 Author: Greg Kroah-Hartman Date: Fri Oct 13 20:05:19 2006 -0700 PCI Hotplug: move pci_hotplug.h to include/linux/ This makes it possible to build pci hotplug drivers outside of the main kernel tree, and Sam keeps telling me to move local header files to their proper places... Signed-off-by: Greg Kroah-Hartman commit fb5f4d7a74a140f8e033d1e6854989e88c36c6b8 Author: Kristen Carlson Accardi Date: Fri Sep 29 10:30:27 2006 -0700 change pci hotplug subsystem maintainer to Kristen Here's a patch adding me to the maintainers file for the pci hotplug subsystem, as we discussed. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 6b4b78fed47e7380dfe9280b154e8b9bfcd4c86c Author: Matt Domsch Date: Fri Sep 29 15:23:23 2006 -0500 PCI: optionally sort device lists breadth-first Problem: New Dell PowerEdge servers have 2 embedded ethernet ports, which are labeled NIC1 and NIC2 on the chassis, in the BIOS setup screens, and in the printed documentation. Assuming no other add-in ethernet ports in the system, Linux 2.4 kernels name these eth0 and eth1 respectively. Many people have come to expect this naming. Linux 2.6 kernels name these eth1 and eth0 respectively (backwards from expectations). I also have reports that various Sun and HP servers have similar behavior. Root cause: Linux 2.4 kernels walk the pci_devices list, which happens to be sorted in breadth-first order (or pcbios_find_device order on i386, which most often is breadth-first also). 2.6 kernels have both the pci_devices list and the pci_bus_type.klist_devices list, the latter is what is walked at driver load time to match the pci_id tables; this klist happens to be in depth-first order. On systems where, for physical routing reasons, NIC1 appears on a lower bus number than NIC2, but NIC2's bridge is discovered first in the depth-first ordering, NIC2 will be discovered before NIC1. If the list were sorted breadth-first, NIC1 would be discovered before NIC2. A PowerEdge 1955 system has the following topology which easily exhibits the difference between depth-first and breadth-first device lists. -[0000:00]-+-00.0 Intel Corporation 5000P Chipset Memory Controller Hub +-02.0-[0000:03-08]--+-00.0-[0000:04-07]--+-00.0-[0000:05-06]----00.0-[0000:06]----00.0 Broadcom Corporation NetXtreme II BCM5708S Gigabit Ethernet (labeled NIC2, 2.4 kernel name eth1, 2.6 kernel name eth0) +-1c.0-[0000:01-02]----00.0-[0000:02]----00.0 Broadcom Corporation NetXtreme II BCM5708S Gigabit Ethernet (labeled NIC1, 2.4 kernel name eth0, 2.6 kernel name eth1) Other factors, such as device driver load order and the presence of PCI slots at various points in the bus hierarchy further complicate this problem; I'm not trying to solve those here, just restore the device order, and thus basic behavior, that 2.4 kernels had. Solution: The solution can come in multiple steps. Suggested fix #1: kernel Patch below optionally sorts the two device lists into breadth-first ordering to maintain compatibility with 2.4 kernels. It adds two new command line options: pci=bfsort pci=nobfsort to force the sort order, or not, as you wish. It also adds DMI checks for the specific Dell systems which exhibit "backwards" ordering, to make them "right". Suggested fix #2: udev rules from userland Many people also have the expectation that embedded NICs are always discovered before add-in NICs (which this patch does not try to do). Using the PCI IRQ Routing Table provided by system BIOS, it's easy to determine which PCI devices are embedded, or if add-in, which PCI slot they're in. I'm working on a tool that would allow udev to name ethernet devices in ascending embedded, slot 1 .. slot N order, subsort by PCI bus/dev/fn breadth-first. It'll be possible to use it independent of udev as well for those distributions that don't use udev in their installers. Suggested fix #3: system board routing rules One can constrain the system board layout to put NIC1 ahead of NIC2 regardless of breadth-first or depth-first discovery order. This adds a significant level of complexity to board routing, and may not be possible in all instances (witness the above systems from several major manufacturers). I don't want to encourage this particular train of thought too far, at the expense of not doing #1 or #2 above. Feedback appreciated. Patch tested on a Dell PowerEdge 1955 blade with 2.6.18. You'll also note I took some liberty and temporarily break the klist abstraction to simplify and speed up the sort algorithm. I think that's both safe and appropriate in this instance. Signed-off-by: Matt Domsch Signed-off-by: Greg Kroah-Hartman commit 49c61cca2b6591a28ffa4abb73c718091f569746 Author: Akinobu Mita Date: Sat Oct 14 03:07:30 2006 +0900 cpcihp_generic: prevent loading without "bridge" parameter cpcihp_generic module requires configured "bridge" module parameter. But it can be loaded successfully without that parameter. Because module init call ends up returning positive value. This patch prevents from loading without setting "bridge" module parameter. Signed-off-by: Akinbou Mita Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 29f3eb64634cf96903a3cdb56b1f9a80bebad17d Author: Alan Cox Date: Mon Oct 16 16:20:21 2006 -0700 pci: Additional search functions In order to finish converting to pci_get_* interfaces we need to add a couple of bits of missing functionaility pci_get_bus_and_slot() provides the equivalent to pci_find_slot() (pci_get_slot is already taken as a name for something similar but not the same) pci_get_device_reverse() is the equivalent of pci_find_device_reverse but refcounting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 11f242f04c6d886494cc83097cb6def044eabebb Author: Alan Cox Date: Tue Oct 10 14:39:00 2006 -0700 PCI: quirks: switch quirks code offender to use pci_get API Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0cc2b3763e06e84ae5a90b63e03cc1d585a109d0 Author: Brice Goglin Date: Thu Oct 5 10:24:42 2006 +0200 PCI: Update MSI-HOWTO.txt according to pci_msi_supported() Update MSI-HOWTO.txt according to pci_msi_supported(). Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman commit 0306ebfa3b45386401f80aa87cb4f7570bf3aadb Author: Brice Goglin Date: Thu Oct 5 10:24:31 2006 +0200 PCI: Improve pci_msi_supported() comments Improve pci_msi_supported() comments. Signed-off-by: Brice Goglin Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit 662a98fb8de5af4adb56e58f78753cdaa27b6459 Author: Amol Lad Date: Thu Oct 5 12:07:32 2006 +0530 PCI hotplug: ioremap balanced with iounmap 1. ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. 2. Handle return value correctly Tested (compilation only) with: - allmodconfig Signed-off-by: Amol Lad Cc: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 6aa562c248e05db993e4a5f405f899c0cfabb7f2 Author: Kenji Kaneshige Date: Thu Sep 28 15:51:36 2006 -0700 shpchp: remove unnecessary cmd_busy member from struct controller This patch removes unnecessary cmd_busy member from struct controller. Read command status register instead of using cmd_busy. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit d1729ccecd7ba9ceb6dca1c973dbfd87041d0637 Author: Kenji Kaneshige Date: Thu Sep 28 15:51:21 2006 -0700 shpchp: fix command completion check This patch fixes the problem that shpchp driver could mis-detect command failures if the system was under heavy load. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 094ed76e8988d46158b036ab150e0c22aff6db3a Author: Alan Cox Date: Fri Sep 29 18:36:15 2006 +0100 pci: Stamp out pci_find_* usage in fakephp pci_find is not hotplug safe, so it really doesn't want to be in an actual hotplug driver either. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 0bed208efcb25bed4dc2026488a4417aa68e7c92 Author: Zhang, Yanmin Date: Thu Sep 28 14:35:59 2006 +0800 PCI: fix pcie_portdrv_restore_config undefined without CONFIG_PM error On Thu, 2006-09-28 at 03:42, Olaf Hering wrote: > PCI-Express AER implemetation: pcie_portdrv error handler > > This patch breaks if CONFIG_PM is not enabled, > pcie_portdrv_restore_config() will be undefined. I move the definition of pcie_portdrv_restore_config out of CONFIG_PM. Below patch is against 2.6.18-mm1. Could you try it? Signed-off-by: Zhang Yanmin Signed-off-by: Greg Kroah-Hartman commit ccc4c7bbd6a2d47bf5899c2c8cf2e0d176a4dc0f Author: Vojtech Pavlik Date: Fri Apr 7 20:00:27 2006 +0200 Fix DMA resource allocation in ACPIPnP The ACPIPnP implementation had the understanding of Linux resource flags very wrong, resulting in a nonfunctional implementation of DMA resource allocation. This was usually not a problem, since almost no on-board PnP devices use ISA DMA, with the exception of ECP parallel ports. Even with that, parallel port DMA is preconfigured by the BIOS, so this routine isn't normally called. Except in the case where somebody does 'rmmod parport_pc; modprobe parport_pc', where the rmmod case disables the ECP parallel port resources, and they need to be enabled again to initialize the module. This didn't work, resulting in a non-printing printer. The application doing exactly the above to force reprobing of printers is the YaST printer module. Thus without this fix YaST wedged the printer when configuring it, and was not able to print a test page. Reported-by: Ralf Flaxa Reproduced-by: Jiri Dluhos Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit b5e4efe7e061ff52ac97b9fa45acca529d8daeea Author: eiichiro.oiwa.nm@hitachi.com Date: Thu Sep 28 13:55:47 2006 +0900 PCI: Turn pci_fixup_video into generic for embedded VGA pci_fixup_video turns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address. fixup_video suits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore, pci_fixup_video should turn into generic code. Signed-off-by: Eiichiro Oiwa Acked-by: Alan Cox Acked-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman commit bacedce32b171cd461a7da3160ad794e2240c67a Author: Daniel Ritz Date: Mon Sep 25 16:52:21 2006 -0700 PCI: add ICH7/8 ACPI/GPIO io resource quirks Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ec6a8d02efd54a66640bd85afa8c162647b56c3 Author: Andrew Morton Date: Mon Sep 25 16:52:20 2006 -0700 PCI: pcie-check-and-return-bus_register-errors fix __must_check goes on the declaration, not the definition. Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 09d6029f43ebbe7307854abdae204c25d711ff94 Author: Daniel Drake Date: Mon Sep 25 16:52:19 2006 -0700 PCI: VIA IRQ quirk behaviour change The most recent VIA IRQ quirk changes have broken various VIA devices for some users. We are not able to add these devices to the blacklist as they are also available in PCI-card form, and running the quirk on these devices brings us back to square one (running the VIA quirk on non-VIA boards where the quirk is not needed). This patch, based on suggestions from Sergey Vlasov, implements a scheme similar to but more restrictive than the scheme we had in 2.6.16 and earlier. It runs the quirk on all VIA hardware, but *only* if a VIA southbridge was detected on the system. To further reduce the amount of quirked devices, this patch includes a change suggested by Linus at http://lkml.org/lkml/2005/9/27/113 This ensures that devices bound to non-legacy IO-APIC interrupt lines are not quirked. We have made one change to Linus' suggestion: we do a comparison of ">15" rather than ">=15", as 15 is still in the legacy interrupt range. There is still a downside to this patch: if the user inserts a VIA PCI card into a VIA-based motherboard, in some circumstances the quirk will also run on the VIA PCI card. This corner case is hard to avoid. Signed-off-by: Daniel Drake Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9ef9977cabc1b2c1718ef6eb883caec8dcb80b4c Author: Eric Sesterhenn Date: Mon Sep 25 00:56:53 2006 +0200 pciehp: Remove unnecessary check in pciehp_ctrl.c this was spotted by coverity (cid #819). We dereference p_slot earlier in the function, and i found no way it could become NULL anywhere. Signed-off-by: Eric Sesterhenn Signed-off-by: Greg Kroah-Hartman commit dd5619cb4407e830a8921a93c949be37c81105b5 Author: Kenji Kaneshige Date: Fri Sep 22 10:17:29 2006 -0700 pciehp - add missing locking This patch fixes the problem that system will panic if multiple power on/off operations are issued to the same slot in parallel. This problem can be easily reproduced by commands below. # while true; do echo 1 > power; echo 0 > power; done & # while true; do echo 1 > power; echo 0 > power; done & The cause is lack of locking for enable/disable operations. This patch fixes this problem. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 49ed2b4963cd00993eab518b820a6700f94f222d Author: Kenji Kaneshige Date: Fri Sep 22 10:17:10 2006 -0700 pciehp: fix improper info messages The slot number displayed in info messages would cause a confusion because those are displayed in several ways (decimal and hex). Furthermore, those slot number is not same as slot name (directory name). This patch fixes those improper info messages. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit b4a1efffcf8070dbc7734f27da10ce49fb9f2a34 Author: Kenji Kaneshige Date: Fri Sep 22 12:52:37 2006 -0700 shpchp: fix shpchp_wait_cmd in poll This patch fixes the problem that issuing SHPC command in poll mode always fails with the following message. shpchp: Command not completed in 2000 msec Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit ce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa Author: Martin Schwidefsky Date: Wed Oct 18 18:30:59 2006 +0200 [S390] update default configuration Signed-off-by: Martin Schwidefsky commit 9b10fe5b70878fb4b7e3e1b300f1bff0c73d4e2e Author: Cornelia Huck Date: Wed Oct 18 18:30:55 2006 +0200 [S390] cio: update documentation. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 867dcd0f32b125f45a663f9374a36fb21193ab21 Author: Stefan Weinhuber Date: Wed Oct 18 18:30:53 2006 +0200 [S390] dasd: clean up timer. Clean up dasd timer when when a dasd device is set offline. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 833774849d50a59f58e9bdfc3d9c88e682b3596d Author: Martin Schwidefsky Date: Wed Oct 18 18:30:51 2006 +0200 [S390] Fix pte type checking. handle_pte_fault uses pte_present, pte_none and pte_file to find out the type of a pte. That is done without holding the page table lock. This clashes with the way how ptep_clear_flush removes active page table entries from the system. First the ipte instruction is used to invalidate the pte and remove all plt entries for the page. The ipte sets the hardware invalid bit without changing any other bit. After the ipte finished the pte is cleared. A concurrent fault can observe the the previously valid pte with the invalid bit set. With the current encoding of the different pte types an invalidated read-only pte can be misinterpreted as a swap-pte. Signed-off-by: Martin Schwidefsky commit 2c91971f84be168a35f937dd6c61e56e492b2185 Author: Melissa Howland Date: Wed Oct 18 18:30:49 2006 +0200 [S390] monwriter find header logic. Fix logic for finding matching buffers. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 85a4aa64a85a8bd19b86887f70b13a27a363030d Author: Cornelia Huck Date: Wed Oct 18 18:30:47 2006 +0200 [S390] cio: sch_no -> schid.sch_no conversion. Overlooked one sch_no -> schid.sch_no conversion. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f5956f84072804712cb7b663c5c64e9800180833 Author: Heiko Carstens Date: Wed Oct 18 18:30:45 2006 +0200 [S390] Wire up epoll_pwait syscall. Signed-off-by: Heiko Carstens commit 8b42f5c20251060cb1ab875459fe66ad7bb92cbd Author: Peter Oberparleiter Date: Wed Oct 18 18:30:43 2006 +0200 [S390] cio: invalid device operational notification Reset device operational notification flag when channel paths become unavailable during path verification. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 1df23957ba2da6eb8c7a5c2ad7bb1d4732132873 Author: Cedric Le Goater Date: Wed Oct 18 18:30:41 2006 +0200 [S390] fix vmlinux link when CONFIG_SYSIPC=n Fix the following compile error: CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 arch/s390/kernel/built-in.o(.text+0xdba4): In function `sys32_ipc': : undefined reference to `compat_sys_semtimedop' arch/s390/kernel/built-in.o(.text+0xdbee): In function `sys32_ipc': : undefined reference to `compat_sys_semctl' arch/s390/kernel/built-in.o(.text+0xdc08): In function `sys32_ipc': : undefined reference to `compat_sys_msgsnd' arch/s390/kernel/built-in.o(.text+0xdc30): In function `sys32_ipc': : undefined reference to `compat_sys_msgrcv' arch/s390/kernel/built-in.o(.text+0xdc58): In function `sys32_ipc': : undefined reference to `compat_sys_msgctl' arch/s390/kernel/built-in.o(.text+0xdc76): In function `sys32_ipc': : undefined reference to `compat_sys_shmat' arch/s390/kernel/built-in.o(.text+0xdcb0): In function `sys32_ipc': : undefined reference to `compat_sys_shmctl' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Cedric Le Goater Signed-off-by: Martin Schwidefsky commit 74d919465a93b6c2b928b29a8ed3e5e41adbfa93 Author: Ben Collins Date: Wed Oct 18 08:55:54 2006 -0400 [pci_ids] Add Quicknet XJ vendor/device ID's. Signed-off-by: Ben Collins commit 996f324767fd24b7cc682801277add2a4f276635 Author: Ben Collins Date: Wed Oct 18 08:53:37 2006 -0400 [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit f3f6f9aaced9c8453ef45956a23295e5c2328124 Author: Ben Collins Date: Wed Oct 18 08:52:48 2006 -0400 [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit b023429ca30fc18b17a7b3e279b55bd652e9a989 Author: Ben Collins Date: Wed Oct 18 08:50:49 2006 -0400 [igafb] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 4938d3f4f8f1ffd744fa3626df8085118aeb1d79 Author: Ben Collins Date: Wed Oct 18 08:49:31 2006 -0400 [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit d57cdcffe1180cf9b8d1fce048f80d8c6b159827 Author: Ben Collins Date: Wed Oct 18 08:47:37 2006 -0400 [hid-core] TurboX Keyboard needs NOGET quirk. Signed-off-by: Ben Collins commit d77f09e51f5793583ede9733a93bd31a324d051c Author: Ben Collins Date: Wed Oct 18 08:45:30 2006 -0400 [ixj] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 012887327875915f76a6208e81fe0d67a682ec15 Author: Ben Collins Date: Wed Oct 18 08:40:57 2006 -0400 [initio] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 3985b977441f857404bb604a4b15911bbb0b9c5b Author: Ben Collins Date: Wed Oct 18 08:38:41 2006 -0400 [fdomain] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 745b5715fafccc8f0f992a7cccdd1eb2b1f5d23f Author: Ben Collins Date: Wed Oct 18 08:36:57 2006 -0400 [BusLogic] Add pci dev table for auto module loading. Signed-off-by: Ben Collins commit 4596c75c23dde2623cbeec69357d5eb13d28387e Author: Ben Collins Date: Wed Oct 18 08:33:03 2006 -0400 [mv643xx] Add pci device table for auto module loading. Signed-off-by: Ben Collins commit 5cacb9f8bca1ac67cc1f933a4e89b5130ffd1460 Author: Ben Collins Date: Wed Oct 18 08:24:30 2006 -0400 [alim7101] Add pci dev table for auto module loading. Also fixes comment for nowayout module param. Signed-off-by: Ben Collins commit 73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 Author: David S. Miller Date: Tue Oct 17 19:29:41 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit f6d7b8a7c9e21a58890a8532143e241409b78664 Author: Krzysztof Helt Date: Tue Oct 17 19:23:23 2006 -0700 [SPARC]: Sparc compilation fix with floppy enabled This patch fixes a typo to make kernel compilable when floppy driver for Sparc is build. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 9550e59c4587f637d9aa34689e32eea460e6f50c Author: Martin Habets Date: Tue Oct 17 19:21:48 2006 -0700 [SPARC]: Add sparc profiling support This patch adds profiling support to the sparc architecture. It is a copy of the sparc64 implementation. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 872ec6484720e7ddfebb8e15c232fa7ca158ef2e Author: David S. Miller Date: Tue Oct 17 19:19:08 2006 -0700 [SPARC] {bbc_,}envctrl: Use call_usermodehelper(). We should not be calling kernel_execve() directly and this causes module build failures because kernel_execve() is not exported to modules. Signed-off-by: David S. Miller commit b48194bf0dc0f8e2b617fab10df885513fbb3bad Author: Ben Collins Date: Tue Oct 17 19:11:31 2006 -0700 [SPARC]: Fix some section mismatch warnings in sparc drivers. Signed-off-by: Ben Collins Signed-off-by: David S. Miller commit 5aee87c43e3a71a4aa4e72b0dc2180e4952c0848 Author: David S. Miller Date: Tue Oct 17 19:04:44 2006 -0700 [SPARC64]: Fix PCI memory space root resource on Hummingbird. For Hummingbird PCI controllers, we should create the root PCI memory space resource as the full 4GB area, and then allocate the IOMMU DMA translation window out of there. The old code just assumed that the IOMMU DMA translation base to the top of the 4GB area was unusable. This is not true on many systems such as SB100 and SB150, where the IOMMU DMA translation window sits at 0xc0000000->0xdfffffff. So what would happen is that any device mapped by the firmware at the top section 0xe0000000->0xffffffff would get remapped by Linux somewhere else leading to all kinds of problems and boot failures. While we're here, report more cases of OBP resource assignment conflicts. The only truly valid ones are ROM resource conflicts. Signed-off-by: David S. Miller commit 7341df16a1f228be833e918cb42534a34381a37e Author: David S. Miller Date: Tue Oct 17 00:24:14 2006 -0700 [SPARC]: Kill BOOTME_SINGLE. Unused, but still allow the '-s' boot option to be passed down to init. Based upon patches by Martin Habets. Signed-off-by: David S. Miller commit 9950421c1e90d08d52ef47df1fcebe6078b04af3 Author: Linus Torvalds Date: Tue Oct 17 18:03:33 2006 -0700 Fix USB gadget net2280.c compile It would fail the compile due to the newly added error checking testing a bad macro for a "return value" unless USB_GADGET_DEBUG_FILES was enabled. Pointed out by Stephen Hemminger. Acked-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit 9b3377f9921766b6193861d0e3194854b1d765fe Author: Jack Steiner Date: Mon Oct 16 16:17:43 2006 -0500 [IA64] Count resched interrupts Count the number of "resched" interrupts that each cpu receives. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 219902677351665bf0513115592a6dd665cf06e8 Author: Bjorn Helgaas Date: Fri Sep 29 12:58:31 2006 -0600 [IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices Nobody uses either one anymore. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 8611342f3dda0e13970e724129a8e2066de1362e Author: Jes Sorensen Date: Mon Oct 9 05:24:57 2006 -0400 [IA64] update sn2_defconfig The current sn2_defconfig is obsolete, in particular the recent ATA changes are a pain, so here's a patch to get things in sync ... at least for a day or two :) Update sn_defconfig to match current community kernel tree. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 4d5a31977cc69be8786e0033d5c148e5c62ae949 Author: Bjorn Helgaas Date: Thu Oct 12 16:21:17 2006 -0600 [IA64] reformat pal.S to fit in 80 columns, fix typos Reformat to fit in 80 columns. Fix a couple typos. Remove a couple unused labels. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit c12fb1885787dcc2e20c4b88149e1e607e1293b2 Author: Bjorn Helgaas Date: Thu Oct 12 16:20:59 2006 -0600 [IA64] remove unused PAL_CALL_IC_OFF Linux maps PAL instructions with an ITR, but uses a DTC for PAL data. Section 11.10.2.1.3, "Making PAL Procedures Calls in Physical or Virtual Mode," of the SDM (rev 2.2), says we must therefore make all PAL calls with PSR.ic = 1 so that Linux can handle any TLB faults. PAL_CALL_IC_OFF is currently unused, and as long as we use the ITR + DTC strategy, we can't use it. So remove it. I also removed the code in ia64_pal_call_static() that conditionally cleared PSR.ic. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit accaddb27a2d544e38e10ff2a2782b33bbbad913 Author: Jack Steiner Date: Mon Oct 16 12:56:54 2006 -0500 [IA64] - Allow IPIs in timer loop Allow pending IPIs to interrupt a timer interrupt that is looping in the do_timer() "while" loop in timer_interrupt(). (Interrupts are allowed at only 1 spot in the code). Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit ffc45571dfb4b70e7eda8d97f64a05f5e5a992ac Author: Aron Griffis Date: Tue Oct 17 00:28:15 2006 -0400 [IA64] move ioremap/ioremap_nocache under __KERNEL__ I noticed these are declared extern outside of __KERNEL__, but surely they wouldn't be available to userland since they're defined in ioremap.c. Am I missing something here? If I'm right about this, then there's probably a good deal of other stuff in io.h that could move inside __KERNEL__, but at least this is a start. Signed-off-by: Aron Griffis Signed-off-by: Tony Luck commit ab352c2687a4361aec06a184ddb20deb1e5091eb Author: Jan Luebbe Date: Tue Oct 17 00:09:00 2006 +0200 USB: Add device id for Sierra Wireless MC8755 Adds the device id used by the UMTS cards in Lenovo X60s notebooks sold in Europe. Signed-off-by: Jan Luebbe Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 964ee1deb3eac802902cd758ddb94b6a95c77987 Author: Greg Kroah-Hartman Date: Tue Oct 17 10:17:58 2006 -0700 USB: cleanup sierra wireless driver a bit This saves over 30 lines and fixes a warning from sparse and allows debugging to work dynamically like all other usb-serial drivers. Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 033a3fb980b041c5b1c865d3e9dce9217d1dc94b Author: Kevin Lloyd Date: Fri Oct 13 23:53:21 2006 -0700 USB: Sierra Wireless driver update The largest feature in this patch is that it adds significant throughput increase to the Sierra driver and adds support for modem status line control (e.g. the DTR line). This patch also updates the current sierra.c driver so that it supports both 3-port Sierra devices and 1-port legacy devices and removes Sierra's references in other related files (Kconfig and airprime.c). Signed-off-by: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 5c09d144ff94706c2a5df292329ad83a27380173 Author: David Brownell Date: Fri Oct 13 15:57:58 2006 -0700 USB: ftdi_sio whitespace fixes Whitespace fixups for drivers/usb/serial/ftdi_sio.c ... removing end-of-line whitespace, and space-before-tab. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 61926b975d83aa6c0124b5b0ce40c08579e6cc98 Author: Craig Shelley Date: Thu Oct 12 22:09:56 2006 +0100 USB-SERIAL:cp2101 Add new device ID This patch adds device ID 0xEA61. This is another factory default ID used by SILabs. Signed-off-by: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit b3899dacafb10347b1b7a9f589b6c70cf8f08a3e Author: Jeff Garzik Date: Wed Oct 11 21:50:24 2006 -0400 USB/gadget/net2280: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 5dfb5f1d060a6f7dfddb78dc59f9e4d299088cc1 Author: Daniel Ritz Date: Wed Oct 11 23:40:22 2006 +0200 usbtouchscreen: fix data reading for ITM touchscreens ITM devices seem to report only garbage when not touched. update usbtouchscreen to do data reading like itmtouch. also fix wrong mask on pressure bits. Signed-off-by: Daniel Ritz Signed-off-by: Greg Kroah-Hartman commit 9ab99c8c513313c1c5931bdbd27dcc4bc7a3b7cd Author: matthieu castet Date: Wed Oct 11 14:20:56 2006 -0700 UEAGLE: fix ueagle-atm Oops The array of attribute passed to sysfs_create_group() must be NULL-terminated. The sysfs entries are created before the start of the modem state machine to avoid to stop it in case of errors in sysfs creation. Also {destroy,create}_fs_entries are removed as they do nothing. Signed-off-by: Laurent Riffard Signed-off-by: Matthieu CASTET Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit deb8ee43a23d48116cb23eb8dd1de2348efb1e80 Author: Dominic Cerquetti Date: Tue Oct 10 14:42:48 2006 -0700 USB: xpad: dance pad support Adds support for dance pads to the xpad driver. Dance pads require the d-pad to be mapped to four buttons instead of two axes, so that combinations of up/down and left/right can be hit simultaneously. Known dance pads are detected, and there is a module parameter added to default unknown xpad devices to map the d-pad to buttons if this is desired. (dpad_to_buttons). Minor modifications were made to port the changes in the original patch to a newer kernel version. This patch was originally from Dominic Cerquetti originally written for kernel 2.6.11.4, with minor modifications (API changes for USB, spelling fixes to the documentation added in the original patch) made to apply to the current kernel. I have modified Dominic's original patch per some suggestions from Dmitry Torokhov. (There was nothing in the patch format description about multiple From: lines, so I haven't added myself.) [akpm@osdl.org: cleanups] Signed-off-by: Adam Buchbinder Acked-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4550718f6c75c9abe8b987fa4c625fd041aa95a2 Author: Grant Grundler Date: Tue Oct 10 14:42:51 2006 -0700 USB: input: extract() and implement() are bit field manipulation routines extract() and implement() have brain damaged attempts to handle 32-bit wide "fields". The problem is the index math in the original code didn't clear all the relevant bits. (offset >> 5) only compensated for 32-bit index. We need (offset >> 6) if we want to use 64-bit loads. But it was also wrong in that it tried to use quasi-aligned loads. Ie "report" was only incremented in multiples of 4 bytes and then the offset was masked off for values greater than 4 bytes. The right way is to pretend "report" points at a byte array. And offset is then only minor adjustment for < 8 bits of offset. "n" (field width) can then be as big as 24 (assuming 32-bit loads) since "offset" will never be bigger than 7. If someone needs either function to handle more than 24-bits, please document why - point at a specification or specific USB hid device - in comments in the code. extract/implement() are also an eyesore to read. Please banish whoever wrote it to read CodingStyle 3 times in a row to a classroom full of 1st graders armed with rubberbands. Or just flame them. Whatever. Globbing all the code together on two lines does NOT make it faster and is Just Wrong. I've tested this patch on j6000 (dual 750Mhz PA-RISC, 32-bit 2.6.12-rc5). Kyle McMartin tested on c3000 (up 400Mhz PA-RISC, same kernel). "p2-mate" (Peter De Schrijver?) tested on sb1250 (dual core Mips, broadcom "swarm" eval board). Signed-off-by: Grant Grundler Signed-off-by: Matthew Wilcox Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0e185b7922ac81516c5c4653dcf6aacbf6341e73 Author: Eric Sesterhenn Date: Tue Oct 10 14:42:50 2006 -0700 USB: Memory leak in drivers/usb/serial/airprime.c the commit http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=5dda171202f94127e49c12daf780cdae1b4e668b added a memory leak. In case we cant allocate an urb, we dont free the buffer and leak it. Coverity id #1438 Signed-off-by: Eric Sesterhenn Acked-by: Andy Gay Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c0fc0ee06f6c9ab37f53afc62b0d94a700fa7a97 Author: Jan Mate Date: Tue Oct 10 14:42:47 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 521b600b58376b7c85a7c615ee32fae185c20b16 Author: Andrew Morton Date: Tue Oct 10 14:42:46 2006 -0700 USB: fix usbatm tiny race ia64: drivers/usb/atm/usbatm.c: In function `usbatm_do_heavy_init': drivers/usb/atm/usbatm.c:1004: warning: implicit declaration of function `get_current' drivers/usb/atm/usbatm.c:1004: error: invalid type argument of `->' Signed-off-by: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ccf25ce185d4798e66a91812a7622f7fe6987df Author: Alan Stern Date: Fri Oct 13 09:59:17 2006 -0400 USB: unusual_devs entry for Nokia 6234 This patch (as803) adds an unusual_devs entry for the Nokia 6234 mobile phone. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ad18027f4909c8fc107056460c97dbedb6635128 Author: Adrian Bunk Date: Mon Oct 9 01:16:32 2006 +0200 USB: mos7840.c: fix a check-after-dereference This patch fixes an obvious check-after-dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit c19ecd654209725444d1f47a4422e6f48846b53c Author: Adrian Bunk Date: Mon Oct 9 01:16:24 2006 +0200 USB: ftdi-elan.c: remove dead code The Coverity checker spotted this obviously dead code. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 1ff15e8efc1703eaae1eeec6fc09db6af1e4049f Author: Tobias Lorenz Date: Sun Oct 8 22:56:40 2006 -0700 USB: Mitsumi USB FDD 061M: UNUSUAL_DEV multilun fix From: Tobias Lorenz Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit a65dc301c7448a9a8d24bf1cbfe292541d1fa390 Author: Eric Sesterhenn Date: Fri Oct 6 00:09:29 2006 +0200 USB: fix dereference in drivers/usb/misc/adutux.c in two of the error cases, dev is still NULL, and we dereference it. Spotted by coverity (cid#1428, 1429) Signed-off-by: Eric Sesterhenn Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 0f64478cbc7a008fe7b7e9ae79a73d8a6904ead8 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 USB: add USB serial mos7720 driver Add support for Moschip 7720 USB dual port usb to serial device. This driver is originally based on the drivers/usb/io_edgeport.c driver. Cleaned up and forward ported by me. Cc: VijayaKumar Cc: AjayKumar Cc: Gurudeva Signed-off-by: Greg Kroah-Hartman commit 9fcde235270e6783600d1aee5bcda78c8282bcdd Author: Greg Kroah-Hartman Date: Tue Oct 10 13:47:35 2006 -0700 USB: move trancevibrator.c to the proper usb directory It's not a input driver, so it doesn't belong in the input directory. Cc: Sam Hocevar Cc: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit a9fc6338bd51a3d5735839e756fe7b741c2e6fad Author: Arnd Bergmann Date: Mon Oct 9 00:08:02 2006 +0200 usbnet: add a mutex around phy register access When working on the mcs7830, I noticed the need for a mutex in its mdio_read/mdio_write functions. A related problem seems to be present in the asix driver in the respective functions. This introduces a mutex in the common usbnet driver and uses it from the two hardware specific drivers. Acked-by: David Hollis Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman commit c41286fd42f3545513f8de9f61028120b6d38e89 Author: Arnd Bergmann Date: Mon Oct 9 00:08:01 2006 +0200 usbnet: improve generic ethtool support This adds generic support for the ethtool commands get_settings, set_settings, get_link and nway_reset to usbnet. These are now implemented using mii functions when a low-level driver supports mdio_read/mdio_write and does not override the usbnet ethtool commands with its own. Currently, this applies to the asix and the mcs7830 drivers. I have tested it on mcs7830. Signed-off-by: Arnd Bergmann Acked-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit 2a36d7083438ccb607055abae633f39495a99947 Author: Arnd Bergmann Date: Mon Oct 9 00:08:00 2006 +0200 USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter This driver adds support for the DeLOCK USB ethernet adapter and potentially others based on the MosChip MCS7830 chip. It is based on the usbnet and asix drivers as well as the original device driver provided by MosChip, which in turn was based on the usbnet driver. It has been tested successfully on an OHCI, but interestingly there seems to be a problem with the mcs7830 when connected to the ICH6/EHCI in my thinkpad: it keeps receiving lots of broken packets in the RX interrupt. The problem goes away when I'm using an active USB hub, so I assume it's not related to the device driver, but rather to the hardware. Signed-off-by: David Brownell Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman commit 27d39e2627dc7493f554bc0549d8c63953762478 Author: Akinobu Mita Date: Mon Oct 9 18:09:33 2006 +0900 usb devio: handle class_device_create() error This patch adds missing class_device_create() error check, and makes notifier return NOTIFY_BAD. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit f8ac232ad7388bfff680b26e84b3ac63889d1cea Author: Alexey Dobriyan Date: Sun Oct 8 16:02:00 2006 +0400 USB: drivers/usb/net/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman commit d5477c11111467e19787f00d3cab20fb48c2699e Author: Alan Stern Date: Tue Oct 10 11:56:26 2006 -0400 usbcore: fix endpoint device creation This patch (as800) straightens out the USB endpoint class device creation routine, fixing a refcount bug in the process. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c40fd5ea565587c05b0e2c49c02cad2c35fd85c6 Author: Alan Stern Date: Tue Oct 10 11:55:47 2006 -0400 usbcore: fix refcount bug in endpoint removal This patch (as799) fixes a nasty refcount error in the USB endpoint class. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b62df4516981745d4b5de01ceec1d65a9174a524 Author: Alan Stern Date: Tue Oct 10 10:54:00 2006 -0400 UHCI: workaround for Asus motherboard This patch (as798) adds a workaround to uhci-hcd. At least one Asus motherboard is wired in such a way that any device attached to a suspended UHCI controller will prevent the system from entering suspend-to-RAM by immediately waking it up. The only way around the problem is to turn the controller off instead of suspending it. This fixes Bugzilla #6193. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 96a518928e1fd00a6d0eb344f420ea82aeec8ab9 Author: Greg Kroah-Hartman Date: Mon Oct 9 12:24:49 2006 -0700 USB: ftdi-elan: fix sparse warnings Deleted some unused code that could do bad things on non-x86 platforms. Also fixed some minor formatting errors. Thanks to Al Viro for pointing out the sparse errors. Cc: Tony Olech Cc: Al Viro Signed-off-by: Greg Kroah-Hartman commit 516077c1ee8a4a47cc41634a29954b636f3975ea Author: Oliver Neukum Date: Thu Oct 5 09:04:11 2006 +0200 USB: fix suspend support for usblp this implements suspend support for usblp. According to the CUPS people ENODEV will make CUPS retry the job. Thus it is returned in the runtime case. My printer survives suspend/resume cycles with it. Signed-off-by: Oliver Neukum Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 44960af1b6ab3e8fd23dc134fcf7862caf42936b Author: Duncan Sands Date: Thu Oct 5 11:05:50 2006 +0200 cxacru: add the ZTE ZXDSL 852 From http://doc.ubuntu-fr.org/materiel/zxdsl852. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 6a4f1b41357d2bd65d39f7a5d44e92f69daaf04b Author: Duncan Sands Date: Thu Oct 5 10:40:55 2006 +0200 speedtch: "extended reach" The speedtouch modem setup code was reverse engineered many years ago from a prehistoric windows driver. Less ancient windows drivers, even those from a few years ago, perform extra initialization steps which this patch adds to the linux driver. David Woodhouse observed that this initialization along with the firmware bin/sachu3/zzzlp2.eni from the driver at http://www.speedtouch.co.uk/downloads/330/301/UK3012%20Extended.zip improves line sync speeds by about 20%. He provided the original patch, which I've modified to use symbolic names (BMaxDSL, ModemMode, ModemOption) rather than magic numbers. These names may not seem like much of an improvement (after all, what is "ModemOption" exactly?), but they do have one big advantage: they are the names used in the windows registry. I've made them available as module parameters. Thanks are due to Aurelio Arroyo, who noticed the relationship between these magic numbers and the entries in Phonebook.ini. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit ccf40d62c70128990cf2e8775853cc3287cd7ce3 Author: Duncan Sands Date: Thu Oct 5 09:56:44 2006 +0200 usbatm: fix tiny race If usbatm_do_heavy_init finishes before usbatm_heavy_init writes the pid, the disconnect method could shoot down the wrong process if the pid has been recycled. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit e4a20daa7b44ab9805979eb716f6bb7532bc67b9 Author: Alan Stern Date: Wed Oct 4 16:31:15 2006 -0400 USB: unusual_devs entry for Nokia 6131 This patch (as796) adds an unusual_devs entry for the Nokia 6131, which doesn't like large transfer sizes. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 762f007b05446f5c63268fb2c28646f28959ee4b Author: Jarek Poplawski Date: Fri Oct 6 07:23:11 2006 +0200 USB: fix cdc-acm problems with hard irq? (inconsistent lock state) Signed-off-by: Jarek Poplawski Signed-off-by: Greg Kroah-Hartman commit a7a0c9cd1f45c2cae38ebe0951246bf94399818a Author: matthieu castet Date: Tue Oct 3 21:44:11 2006 +0200 UEAGLE : comestic changes Hi, this patch does some cosmetic changes : - dump firwmare version as soon as possible and export it on sysfs - hint about wrong cmv/dsp - Display a message to warn user when the modem is ready : it can help people to detect problems on the line without debug trace - Fix wrong indent - display modem type (pots/isdn) - increase version number Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 531a39bbab213209a9914e68809bcf8b60a54f47 Author: matthieu castet Date: Tue Oct 3 21:49:29 2006 +0200 UEAGLE : use interruptible sleep this patch use wait_event_interruptible_timeout and msleep_interruptible beacause uninterruptible sleep (task state 'D') is counted as 1 towards load average, like running processes. Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 9ca5346483ea2c2e8932268246d1d8746fe3bcaa Author: matthieu castet Date: Tue Oct 3 21:46:33 2006 +0200 UEAGLE : be suspend friendly this patch avoid that the kernel thread block the suspend process. Some work is still need to recover after a resume. Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 8442ae00d47dad690ac1105b426274433dc672f8 Author: David Brownell Date: Mon Oct 2 07:20:10 2006 -0700 USB: ohci-pnx4008 build fixes The OHCI bus glue for the Philips PNX chips is missing a few calls. - Bus suspend/resume were wrongly omitted in the original submission. - Two new calls were added since that glue was submitted: * Root hub irq enable call * Shutdown hook for usbcore Plus usb_bus.hcpriv has now been removed from usbcore. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1a2ea1dfc4ee078841cd6406ebf6bf0c5a3d25e9 Author: Oliver Neukum Date: Tue Oct 3 10:30:52 2006 +0200 USB: suspend/resume support for kaweth this adds support for suspend and resume to the kaweth driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit fbe2bafcb00b25265c2c869ba4615d6a5324b7f1 Author: Oliver Neukum Date: Thu Sep 28 23:36:04 2006 +0200 USB: remove private debug macros from kaweth this kills the private debug macros from the kaweth driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 91a9c9214e34c364bf15406aadb922787ae7129b Author: Chris Malley Date: Tue Oct 3 10:08:28 2006 +0100 USB: Support for BT On-Air USB modem in cdc-acm.c The patch below is a necessary workaround to support the BT On-Air USB modem, which fails to initialise properly during normal probing thus: Sep 30 17:34:57 sled kernel: drivers/usb/class/cdc-acm.c: Zero length descriptor references Sep 30 17:34:57 sled kernel: cdc_acm: probe of 1-1.2:1.0 failed with error -22 Adding the patch below causes the probing section to be skipped, and the modem then initialises correctly. Signed-off-by: Chris Malley Signed-off-by: Greg Kroah-Hartman commit 931b0411ac296591643662b7a790d15d6e23d57e Author: Luiz Fernando N. Capitulino Date: Tue Oct 3 10:31:36 2006 -0300 airprime: New device ID. Adds support for the verizon wireless Broadband Access, National Access V640 ExpressCard34 Qualcomm 3G CDMA. Reported by Maciej A. __enczykowski Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 2daa48729dfafd349c2a52520734de2edb9dc805 Author: Eric Sesterhenn Date: Wed Oct 4 09:56:44 2006 -0700 USB: fix use after free in wacom_sys.c the following commit added a use after free http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3D3bea733ab21247290bd552dd6a2cd3049af9adef Found by coverity (cid #1441) Signed-off-by: Eric Sesterhenn Signed-off-by: "Ping Cheng" Signed-off-by: Greg Kroah-Hartman commit 2920349d438ec08d2b1f6761c8b78b8d13fd1dee Author: Eric Sesterhenn <[mailto:snakebyte@gmx.de]> Date: Tue Oct 17 14:46:30 2006 -0700 USB: BUG_ON conversion for wacom.c this patch converts two if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn Acked-by: "Ping Cheng" Signed-off-by: Greg Kroah-Hartman commit 8d32e3ae5972641ee9eb813e7a5c44a2b85d3694 Author: Ping Cheng Date: Tue Sep 26 13:34:47 2006 -0700 USB: Wacom driver updates This fixes some issues with the current wacom driver due to the split of the driver into different pieces and adds support for the Intuos3 4x6 Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman commit 3bbe486b361b317ac7103378ed3d1aab4779715e Author: Tony Luck Date: Tue Oct 17 14:28:16 2006 -0700 [IA64] perfmon fix for global IRQ fix Missed one piece of ia64 fallout from the global IRQ patch 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Perfmon interrupt handler needs to use get_irq_regs() too. Acked-by: stephane eranian Signed-off-by: Tony Luck commit 64f89798da35f43c6ef6afda0541e25034513458 Author: Greg Kroah-Hartman Date: Tue Oct 17 13:57:18 2006 -0700 USB: revert EHCI VIA workaround patch This reverts 26f953fd884ea4879585287917f855c63c6b2666 which caused resume problems on the mac mini. Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 41072a1be57f63bf83afc31c44d72de018d800fa Author: John W. Linville Date: Tue Oct 17 13:47:40 2006 -0400 [PATCH] zd1211rw: fix build-break caused by association race fix The break was caused by 7c28ad2d83ecc637237fe684659a6afbce0bb2a8. Signed-off-by: John W. Linville commit 4e4bc305e16440ab38060d61fbcb7d774881d2f1 Author: Stephen Hemminger Date: Tue Oct 17 10:24:25 2006 -0700 sky2: GMAC pause frame This reverts earlier change that attempted to fix flow control. Device needs to discard pause frames, otherwise it hangs after a while. Signed-off-by: Stephen Hemminger commit a052b52f4b6b77503af2647dc0c7415939d8232a Author: Stephen Hemminger Date: Tue Oct 17 10:24:23 2006 -0700 sky2: accept multicast pause frames When using flow control, the PHY needs to accept multicast pause frames. Without this fix, these frames were getting discarded by the PHY before doing any flow control. Signed-off-by: Stephen Hemminger commit 52c89cac6781dea0ee2426821cd3effae1a925d3 Author: Stephen Hemminger Date: Tue Oct 17 10:24:18 2006 -0700 sky2: version 1.9 Mark version, this has been a lot of patches. Signed-off-by: Stephen Hemminger commit b6d7773462df13c105c19ab89706687ded839844 Author: Stephen Hemminger Date: Tue Oct 17 10:24:16 2006 -0700 sky2: no message on rx fifo overflow Under high load it is possible to make the receiver FIFO get overloaded. The driver/hardware recover properly, so there is no reason to fill the log with lots of extra messages, just update counter. Signed-off-by: Stephen Hemminger commit 16ad91e1c686734aaa5664cd08af0b5e9bf3af61 Author: Stephen Hemminger Date: Tue Oct 17 10:24:13 2006 -0700 sky2: flow control setting fixes The result of flow control negotiation should not limit the next negotiatition. If board is plugged into an old half duplex 10Mbit port, without pause, then replugged into a gigabit port, it should negotiate what is desired, not inherit that last negotiation. Signed-off-by: Stephen Hemminger commit 7800fddcd05a7dc89276389b96664af4f7890ea7 Author: Stephen Hemminger Date: Tue Oct 17 10:24:10 2006 -0700 sky2: don't reset PHY twice Don't need to reset PHY twice on startup. Signed-off-by: Stephen Hemminger commit 7c74ac1c236457e454804774e832046c1a7cc0bf Author: Stephen Hemminger Date: Tue Oct 17 10:24:08 2006 -0700 sky2: use duplex result bits The result of duplex negotiation is avaliable in the phy status register, so use that to simplify code and avoid rereading the PHY. Signed-off-by: Stephen Hemminger commit 0edea0f54e1e28bdc1ce6b02d5ca3c4c878cf959 Author: Stephen Hemminger Date: Tue Oct 17 10:24:07 2006 -0700 sky2: advertising register 16 bits The advertising bits (from ethtool.h) fit in 16 bits. commit 709c6e7bb07411176ef9ef660242b1e59fc87a6f Author: Stephen Hemminger Date: Tue Oct 17 10:24:04 2006 -0700 sky2: fiber pause bits The advertisement bits for flow control are located in different location on fiber (1000baseX) Signed-off-by: Stephen Hemminger commit ebc646f681a6ad5a81989a6906832e82155df283 Author: Stephen Hemminger Date: Tue Oct 17 10:23:56 2006 -0700 sky2: phy irq on shutdown When PHY is turned off on shutdown, it causes the IRQ to get stuck on. Make sure and disable the IRQ first, and if IRQ occurs when device is not running, don't access PHY because that will hang. Signed-off-by: Stephen Hemminger commit e561a83be5c9cada5fa3733efdff67a2098a0c8e Author: Stephen Hemminger Date: Tue Oct 17 10:20:51 2006 -0700 sky2: turn of workaround timer The workaround timer is not needed in most systems with proper IRQ routing and by perodically waking up it adds to laptop power consumption. Signed-off-by: Stephen Hemminger commit 2bffc23a01a489ad46ba7d61a1a657cecec87cc8 Author: Stephen Hemminger Date: Tue Oct 17 10:17:18 2006 -0700 sky2: MSI test is only a warning Some motherboards don't implement MSI correctly. The driver handles this but the warning is too verbose and overly cautious. Signed-off-by: Stephen Hemminger commit 7281c248f797723f66244b7ecef204620f664648 Author: Alan Cox Date: Mon Oct 16 16:49:50 2006 +0100 [ARM] switch to new pci_get_bus_and_slot API Signed-off-by: Alan Cox Signed-off-by: Russell King commit 7786ce192fc4917fb9b789dd823476ff8fd6cf66 Author: Jeff Garzik Date: Tue Oct 17 00:10:40 2006 -0700 [PATCH] ISDN: check for userspace copy faults Most of the ISDN ->readstat() implementations needed to check copy_to_user() and put_user() return values. Signed-off-by: Jeff Garzik Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04518bfe8eac2e82b476fb2b0093527adc2bc791 Author: Jeff Garzik Date: Tue Oct 17 00:10:39 2006 -0700 [PATCH] ISDN: fix drivers, by handling errors thrown by ->readstat() This is a particularly ugly on-failure bug, possibly security, since the lack of error handling here is covering up another class of bug: failure to handle copy_to_user() return values. The I4L API function ->readstat() returns an integer, and by looking at several existing driver implementations, it is clear that a negative return value was meant to indicate an error. Given that several drivers already return a negative value indicating an errno-style error, the current code would blindly accept that [negative] value as a valid amount of bytes read. Obvious damage ensues. Correcting ->readstat() handling to properly notice errors fixes the existing code to work correctly on error, and enables future patches to more easily indicate errors during operation. Signed-off-by: Jeff Garzik Cc: Karsten Keil Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 078d396598401dbaa88d5f95ec45579f9d3dce0e Author: Amol Lad Date: Tue Oct 17 00:10:37 2006 -0700 [PATCH] drivers/isdn/isdnloop: save_flags()/cli(), restore_flags() replaced appropriately Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d9ba869e103d91d471146378ad85bf1fb8e74b4 Author: Amol Lad Date: Tue Oct 17 00:10:36 2006 -0700 [PATCH] drivers/isdn/hysdn: save_flags()/cli(), restore_flags() replaced appropriately With Karsten Keil save_flags()/cli() pair is replaced with spin_lock_irqsave() and restore_flags() replaced with spin_unlock_irqrestore() Tested compile only using allmodconfig Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd5349cfd2b9bbb10a3dbcd3fe5cbaabe0b2ab9e Author: Neil Brown Date: Tue Oct 17 00:10:35 2006 -0700 [PATCH] Convert cpu hotplug notifiers to use raw_notifier instead of blocking_notifier The use of blocking notifier by _cpu_up and _cpu_down in cpu.c has two problem. 1/ An interaction with the workqueue notifier causes lockdep to spit a warning. 2/ A notifier could conceivable be added or removed while _cpu_up or _cpu_down are in process. As each notifier is called twice (prepare then commit/abort) this could be unhealthy. To fix to we simply take cpu_add_remove_lock while adding or removing notifiers to/from the list. This makes the 'blocking' usage unnecessary as all accesses to cpu_chain are now protected by cpu_add_remove_lock. So change "blocking" to "raw" in all relevant places. This fixes 1. Credit: Andrew Morton Cc: Rusty Russell Cc: Michal Piotrowski (reporter) Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bea493a031fe3337f4fe5479e8e865513828ea76 Author: Peter Zijlstra Date: Tue Oct 17 00:10:33 2006 -0700 [PATCH] rt-mutex: fixup rt-mutex debug code BUG: warning at kernel/rtmutex-debug.c:125/rt_mutex_debug_task_free() (Not tainted) [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] rt_mutex_debug_task_free+0x35/0x6a [] free_task+0x15/0x24 [] copy_process+0x12bd/0x1324 [] do_fork+0x42/0x113 [] sys_fork+0x19/0x1b [] syscall_call+0x7/0xb In copy_process(), dup_task_struct() also duplicates the ->pi_lock, ->pi_waiters and ->pi_blocked_on members. rt_mutex_debug_task_free() called from free_task() validates these members. However free_task() can be invoked before these members are reset for the new task. Move the initialization code before the first bail that can hit free_task(). Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91b943ee4afa2037678dc1db30b89baef0e17090 Author: Aneesh Kumar K.V Date: Tue Oct 17 00:10:32 2006 -0700 [PATCH] Add entry.S labels to tag file Add functions defined using ENTRY macro to the tags file. Signed-off-by: Aneesh Kumar K.V Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f3fd3c055853d11295a1ec6cdc81e37e2182d16 Author: Greg Banks Date: Tue Oct 17 00:10:30 2006 -0700 [PATCH] kbuild: allow multi-word $M in Makefile.modpost Some people want to do crazy things like pass multiple directories as the value of $(SUBDIRS) or $M. Mostly this kinda works, except that Makefile.modpost constructs a modpost commandline which fails modpost's argument parsing. This patch fixes that little wrinkle. Signed-off-by: Greg Banks Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dabad0568a5935e9f4903f5fd1d8f22b1c7c88c7 Author: Akinobu Mita Date: Tue Oct 17 00:10:28 2006 -0700 [PATCH] epca: prevent panic on tty_register_driver() failure Make epca fail on initialization failure instead of panic. Cc: "Digi International, Inc" Signed-off-by: Akinobu Mita Acked-by: Alan Cox Acked-by: Scott Kilau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea6f94dfe9db4d19a39e774cfafa5c9428a9fdbc Author: Akinobu Mita Date: Tue Oct 17 00:10:27 2006 -0700 [PATCH] rd: memory leak on rd_init() failure If RAM disk driver initialization fails due to blk_alloc_queue() faulure, the gendisk structs stored in rd_disks[] will not be freed completely. This patch resolves that memory leak case by doing alloc_disk() and blk_alloc_queue() at the same time. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3864c4894a7f4c03d69a90082a5bb0ab10e437ab Author: Peter Zijlstra Date: Tue Oct 17 00:10:26 2006 -0700 [PATCH] lockdep: annotate i386 apm Lockdep doesn't like to enable interrupts when they are enabled already. BUG: warning at kernel/lockdep.c:1814/trace_hardirqs_on() (Not tainted) [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb Leftover inexact backtrace: [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb Signed-off-by: Peter Zijlstra Cc: Stephen Rothwell Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a15f46c1272afd3010259067451bf0df04f6511 Author: Jeff Garzik Date: Tue Oct 17 00:10:25 2006 -0700 [PATCH] rtc: fix printk of 64-bit res on 32-bit platform With 64-bit resources on 32-bit platforms, the resource address might be larger than a void*. Fix printk to work regardless of resource size. Signed-off-by: Jeff Garzik Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eee44cca665aa1a5663e6a00c2bdfc275739dac5 Author: Jeff Garzik Date: Tue Oct 17 00:10:23 2006 -0700 [PATCH] fs/partitions/check: add sysfs error handling Handle errors thrown in disk_sysfs_symlinks(), and propagate back to caller. The callers and associated functions don't do a real good job of handling kobject errors anyway (add_partition, register_disk, rescan_partitions), so this should do until something better comes along. Signed-off-by: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b5f29675c6a1041aefc147271508bd56cf2b761 Author: Jeff Garzik Date: Tue Oct 17 00:10:22 2006 -0700 [PATCH] I2O: handle a few sysfs errors Signed-off-by: Jeff Garzik Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12fda16814bba05a84a49a1da25a069d6c249758 Author: Jeff Garzik Date: Tue Oct 17 00:10:20 2006 -0700 [PATCH] drivers/led: handle sysfs errors Signed-off-by: Jeff Garzik Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ff407bee5a55f9c1188a3f9d70ffc79485183c Author: Jan Kara Date: Tue Oct 17 00:10:19 2006 -0700 [PATCH] Fix IO error reporting on fsync() When IO error happens on metadata buffer, buffer is freed from memory and later fsync() is called, filesystems like ext2 fail to report EIO. We solve the problem by introducing a pointer to associated address space into the buffer_head. When a buffer is removed from a list of metadata buffers associated with an address space, IO error is transferred from the buffer to the address space, so that fsync can later report it. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d343fce148a4eee24a907a05c4101d3268045aae Author: NeilBrown Date: Tue Oct 17 00:10:18 2006 -0700 [PATCH] knfsd: Allow lockd to drop replies as appropriate It is possible for the ->fopen callback from lockd into nfsd to find that an answer cannot be given straight away (an upcall is needed) and so the request has to be 'dropped', to be retried later. That error status is not currently propagated back. So: Change nlm_fopen to return nlm error codes (rather than a private protocol) and define a new nlm_drop_reply code. Cause nlm_drop_reply to cause the rpc request to get rpc_drop_reply when this error comes back. Cause svc_process to drop a request which returns a status of rpc_drop_reply. [akpm@osdl.org: fix warning storm] Cc: Marc Eshel Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4481d1038f4116f3f5c307d919e6dc815a3acbb9 Author: NeilBrown Date: Tue Oct 17 00:10:17 2006 -0700 [PATCH] knfsd: Fix bug in recent lockd patches that can cause reclaim to fail When an nfs server shuts down, lockd needs to release all the locks even though the client still holds them. It should therefore not 'unmonitor' the clients, so that the files in nfs/sm will still be there when the nfs server restarts, so that those clients will be told to reclaim their locks. However the hosts are fully unmonitored, so statd may well remove the files. lockd has a test for 'sm_sticky' and avoid the unmonitor call if it is set, but it is currently not set. So set it when tearing down lockd. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0942176f4353ffebcd6e3f95abce9fd8e24f2cb1 Author: J. Bruce Fields Date: Tue Oct 17 00:10:16 2006 -0700 [PATCH] knfsd: nfsd4: Fix error handling in nfsd's callback client Coverity noticed that the error handling code in the NFSv4 callback client sets cb->cb_client to NULL, then calls rpc_shutdown_client with the NULL pointer. Coverity: #cid 1397 Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9801d8a39cfe6c34f39f9552a246a6bd002e735e Author: J. Bruce Fields Date: Tue Oct 17 00:10:14 2006 -0700 [PATCH] knfsd: nfsd4: fix open permission checking We weren't actually checking for SHARE_ACCESS_WRITE, with the result that the owner could open a non-writeable file for write! Continue to allow DENY_WRITE only with write access. Thanks to Jim Rees for reporting the bug. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc730e173785e29b297aa605786c94adaffe2544 Author: J. Bruce Fields Date: Tue Oct 17 00:10:13 2006 -0700 [PATCH] knfsd: nfsd4: fix owner-override on open If a client creates a file using an open which sets the mode to 000, or if a chmod changes permissions after a file is opened, then situations may arise where an NFS client knows that some IO is permitted (because a process holds the file open), but the NFS server does not (because it doesn't know about the open, and only sees that the IO conflicts with the current mode of the file). As a hack to solve this problem, NFS servers normally allow the owner to override permissions on IO. The client can still enforce correct permissions-checking on open by performing an explicit access check. In NFSv4 the client can rely on the explicit on-the-wire open instead of an access check. Therefore we should not be allowing the owner to override permissions on an over-the-wire open! However, we should still allow the owner to override permissions in the case where the client is claiming an open that it already made either before a reboot, or while it was holding a delegation. Thanks to Jim Rees for reporting the bug. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e956edd0523b6b48ed367c63b0c82d8f4c447a58 Author: Miklos Szeredi Date: Tue Oct 17 00:10:12 2006 -0700 [PATCH] fuse: fix dereferencing dentry parent There's no locking for ->d_revalidate, so fuse_dentry_revalidate() should use dget_parent() instead of simply dereferencing ->d_parent. Due to topology changes in the directory tree the parent could become negative or be destroyed while being used. There hasn't been any reports about this yet. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2a85164aaa8d514ef5efbf5d05746e85dd13ddd Author: Miklos Szeredi Date: Tue Oct 17 00:10:11 2006 -0700 [PATCH] fuse: fix handling of moved directory Fuse considered it an error (EIO) if lookup returned a directory inode, to which a dentry already refered. This is because directory aliases are not allowed. But in a network filesystem this could happen legitimately, if a directory is moved on a remote client. This patch attempts to relax the restriction by trying to first evict the offending alias from the cache. If this fails, it still returns an error (EBUSY). A rarer situation is if an mkdir races with an indenpendent lookup, which finds the newly created directory already moved. In this situation the mkdir should return success, but that would be incorrect, since the dentry cannot be instantiated, so return EBUSY. Previously checking for a directory alias and instantiation of the dentry weren't done atomically in lookup/mkdir, hence two such calls racing with each other could create aliased directories. To prevent this introduce a new per-connection mutex: fuse_conn->inst_mutex, which is taken for instantiations with a directory inode. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 265126ba9e1f8e217e61d1017c6609f76828aa7a Author: Miklos Szeredi Date: Tue Oct 17 00:10:09 2006 -0700 [PATCH] fuse: fix spurious BUG Fix a spurious BUG in an unlikely race, where at least three parallel lookups return the same inode, but with different file type. This has not yet been observed in real life. Allowing unlimited retries could delay fuse_iget() indefinitely, but this is really for the broken userspace filesystem to worry about. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8da5ff23ce0a84d9845b01e6fe5047e17836bf5a Author: Miklos Szeredi Date: Tue Oct 17 00:10:08 2006 -0700 [PATCH] fuse: locking fix for nlookup An inode could be returned by independent parallel lookups, in this case an update of the lookup counter could be lost resulting in a memory leak in userspace. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7762f5a0b709b415fda132258ad37b9f2a1db994 Author: Miklos Szeredi Date: Tue Oct 17 00:10:07 2006 -0700 [PATCH] document i_size_write locking rules Unless someone reads the documentation for write_seqcount_{begin,end} it is not obvious, that i_size_write() needs locking. Especially, that lack of such locking can result in a system hang. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ffbb9162312fd8113037cb3d94f787f06bbfa9a Author: Miklos Szeredi Date: Tue Oct 17 00:10:06 2006 -0700 [PATCH] fuse: fix hang on SMP Fuse didn't always call i_size_write() with i_mutex held which caused rare hangs on SMP/32bit. This bug has been present since fuse-2.2, well before being merged into mainline. The simplest solution is to protect i_size_write() with the per-connection spinlock. Using i_mutex for this purpose would require some restructuring of the code and I'm not even sure it's always safe to acquire i_mutex in all places i_size needs to be set. Since most of vmtruncate is already duplicated for other reasons, duplicate the remaining part as well, making all i_size_write() calls internal to fuse. Using i_size_write() was unnecessary in fuse_init_inode(), since this function is only called on a newly created locked inode. Reported by a few people over the years, but special thanks to Dana Henriksen who was persistent enough in helping me debug it. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48d1a7ea6373337985f27dc1c707649469df5827 Author: Alexey Dobriyan Date: Tue Oct 17 00:10:05 2006 -0700 [PATCH] sx: fix user-visible typo (devic) Signed-off-by: Alexey Dobriyan Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a460e745e8f9c75a0525ff94154a0629f9d3e05d Author: Ingo Molnar Date: Tue Oct 17 00:10:03 2006 -0700 [PATCH] genirq: clean up irq-flow-type naming Introduce desc->name and eliminate the handle_irq_name() hack. Add set_irq_chip_and_handler_name() to set the flow type and name at once. Signed-off-by: Ingo Molnar Acked-by: Thomas Gleixner Cc: "Eric W. Biederman" Cc: Matthew Wilcox Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 308ba5fcf89b6e328f9290067181c1e4d772fdc9 Author: David Woodhouse Date: Tue Oct 17 00:10:02 2006 -0700 [PATCH] fix `make headers_install' Fix this: make[3]: *** No rule to make target `/mnt/md0/devel/linux-git/include/linux/version.h', needed by `/mnt/md0/devel/linux-git-obj/usr/include/linux/version.h'. Stop. make[2]: *** [linux] Error 2 make[1]: *** [headers_install] Error 2 Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4bb2cf1c3d30e7498e5561b22246b5bcbfe2e15 Author: Adrian Bunk Date: Tue Oct 17 00:10:00 2006 -0700 [PATCH] drivers/char/specialix.c: fix the baud conversion Correct the following bugs introduced by commit 67cc0161ecc9ebee6eba4af6cbfdba028090b1b9: - remove one remaining and now incorrect baud_table[] usage - "baud +=" is no longer correct The former bug was spotted by the Coverity checker. Rolf Eike Beer spotted a bug in the initial version of my patch. Signed-off-by: Adrian Bunk Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c60099bfe3a5e6fa22a930627689b3769c52153f Author: Andrew Morton Date: Tue Oct 17 00:09:59 2006 -0700 [PATCH] swsusp: fix memory leaks My fancy new swsusp IO code had a big memory leak. It's somewhat invisible because the whole mem_map[] gets overwritten after resume, but it can cause us to get low on memory during the actual suspend process. Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fec74a9cda95772887c82ede5c0ac60f5be857e Author: Andrew Morton Date: Tue Oct 17 00:09:58 2006 -0700 [PATCH] acpi_processor_latency_notifier(): UP warning fix drivers/acpi/processor_idle.c:1112: warning: 'smp_callback' defined but not used Cc: Len Brown Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 286e1ea3ac1ca4f503ebbb3020bdb0cbe6adffac Author: Andrew Morton Date: Tue Oct 17 00:09:57 2006 -0700 [PATCH] vmalloc(): don't pass __GFP_ZERO to slab A recent change to the vmalloc() code accidentally resulted in us passing __GFP_ZERO into the slab allocator. But we only wanted __GFP_ZERO for the actual pages whcih are being vmalloc()ed, and passing __GFP_ZERO into slab is not a rational thing to ask for. Cc: Jonathan Corbet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c430169e0c9f42f2cd27e0a6161e7ff4dc7e608d Author: Francisco Larramendi Date: Tue Oct 17 00:09:53 2006 -0700 [PATCH] rtc-max6902: month conversion fix Fix October-only BCD-to-binary conversion bug: 0x08 -> 7 0x09 -> 8 0x10 -> 15 (!) 0x11 -> 19 Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7361 Cc: Raphael Assenat Cc: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b2e97bea228739b74b541033b1119c5707200b Author: Evgeniy Polyakov Date: Tue Oct 17 00:09:47 2006 -0700 [PATCH] w1 kconfig fix Remove dependency of w1 subsytem from connector, only w1_con must depend on it. With attached patch applied to vanilla 2.6.19-git things works fine. Signed-off-by: Evgeniy Polyakov Cc: Cc: Greg KH Cc: Roman Zippel Cc: "Randy.Dunlap" Cc: Adrian Bunk Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91828a405ae454a9503c41a7744f6ff877a80714 Author: David M. Grimes Date: Tue Oct 17 00:09:45 2006 -0700 [PATCH] knfsd: add nfs-export support to tmpfs We need to encode a decode the 'file' part of a handle. We simply use the inode number and generation number to construct the filehandle. The generation number is the time when the file was created. As inode numbers cycle through the full 32 bits before being reused, there is no real chance of the same inum being allocated to different files in the same second so this is suitably unique. Using time-of-day rather than e.g. jiffies makes it less likely that the same filehandle can be created after a reboot. In order to be able to decode a filehandle we need to be able to lookup by inum, which means that the inode needs to be added to the inode hash table (tmpfs doesn't currently hash inodes as there is never a need to lookup by inum). To avoid overhead when not exporting, we only hash an inode when it is first exported. This requires a lock to ensure it isn't hashed twice. This code is separate from the patch posted in June06 from Atal Shargorodsky which provided the same functionality, but does borrow slightly from it. Locking comment: Most filesystems that hash their inodes do so at the point where the 'struct inode' is initialised, and that has suitable locking (I_NEW). Here in shmem, we are hashing the inode later, the first time we need an NFS file handle for it. We no longer have I_NEW to ensure only one thread tries to add it to the hash table. Cc: Atal Shargorodsky Cc: Gilad Ben-Yossef Signed-off-by: David M. Grimes Signed-off-by: Neil Brown Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c496374a72320279ddb86291ef709e090a5d531 Author: Andrew Morton Date: Tue Oct 17 00:09:44 2006 -0700 [PATCH] remove carta_random32 This library function should be in obj-y and not in lib-y. But when we do that it clashes unpleasantly with the assembly-language implementation in the ia64 architecture. Instead of trying to fix it all up, just remove the generic carta_random32 in the expectation that the recently-made-generic random32() will suffice. If/when perfmon is migrated to random32, ia64's private carta_random32 implementation can also be removed. Cc: Stephane Eranian Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa248f6c9c81b2683db7dbb0689cd5ed1c86d88 Author: Stephen Hemminger Date: Tue Oct 17 00:09:42 2006 -0700 [PATCH] rename net_random to random32 Make net_random() more widely available by calling it random32 akpm: hopefully this will permit the removal of carta_random32. That needs confirmation from Stephane - this code looks somewhat more computationally expensive, and has a different (ie: callee-stateful) interface. [akpm@osdl.org: lots of build fixes, cleanups] Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller Cc: Stephane Eranian Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0187f879ee8d4b914e74ffa3cc5df268311fc2d2 Author: Andrew Morton Date: Tue Oct 17 00:09:41 2006 -0700 [PATCH] PROC_NUMBUF is wrong Actually, the decimal representation of a 32-bit signed number can take 12 bytes, including the \0. And then some code adds a \n as well, so let's give it 13 bytes. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac08c26492a0ad4d94a25bd47d5630cd38337069 Author: Thomas Gleixner Date: Tue Oct 17 00:09:39 2006 -0700 [PATCH] posix-cpu-timers: prevent signal delivery starvation The integer divisions in the timer accounting code can round the result down to 0. Adding 0 is without effect and the signal delivery stops. Clamp the division result to minimum 1 to avoid this. Problem was reported by Seongbae Park , who provided also an inital patch. Roland sayeth: I have had some more time to think about the problem, and to reproduce it using Toyo's test case. For the record, if my understanding of the problem is correct, this happens only in one very particular case. First, the expiry time has to be so soon that in cputime_t units (usually 1s/HZ ticks) it's < nthreads so the division yields zero. Second, it only affects each thread that is so new that its CPU time accumulation is zero so now+0 is still zero and ->it_*_expires winds up staying zero. For the VIRT and PROF clocks when cputime_t is tick granularity (or the SCHED clock on configurations where sched_clock's value only advances on clock ticks), this is not hard to arrange with new threads starting up and blocking before they accumulate a whole tick of CPU time. That's what happens in Toyo's test case. Note that in general it is fine for that division to round down to zero, and set each thread's expiry time to its "now" time. The problem only arises with thread's whose "now" value is still zero, so that now+0 winds up 0 and is interpreted as "not set" instead of ">= now". So it would be a sufficient and more precise fix to just use max(ticks, 1) inside the loop when setting each it_*_expires value. But, it does no harm to round the division up to one and always advance every thread's expiry time. If the thread didn't already fire timers for the expiry time of "now", there is no expectation that it will do so before the next tick anyway. So I followed Thomas's patch in lifting the max out of the loops. This patch also covers the reload cases, which are harder to write a test for (and I didn't try). I've tested it with Toyo's case and it fixes that. [toyoa@mvista.com: fix: min_t -> max_t] Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Roland McGrath Cc: Daniel Walker Cc: Toyo Abe Cc: john stultz Cc: Roman Zippel Cc: Seongbae Park Cc: Peter Mattis Cc: Rohit Seth Cc: Martin Bligh Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e24650c2e744f99541125a5b023f0d02cad19d14 Author: Akinobu Mita Date: Tue Oct 17 00:09:38 2006 -0700 [PATCH] md: fix /proc/mdstat refcounting I have seen mdadm oops after successfully unloading md module. This patch privents from unloading md module while mdadm is polling /proc/mdstat. Cc: Neil Brown Signed-off-by: Akinbou Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a649fd9271773dd0f78e2b9f347bcceecb8827f9 Author: Andrew Morton Date: Tue Oct 17 00:09:36 2006 -0700 [PATCH] invalidate: remove_mapping() fix If remove_mapping() failed to remove the page from its mapping, don't go and mark it not uptodate! Makes kernel go dead. (Actually, I don't think the ClearPageUptodate is needed there at all). Says Nick Piggin: "Right, it isn't needed because at this point the page is guaranteed by remove_mapping to have no references (except us) and cannot pick up any new ones because it is removed from pagecache. We can delete it." Signed-off-by: Andrew Morton Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit 5eb30790d4ccd3409240a80eaf9ab76b4fb75fd8 Author: Dave Kleikamp Date: Tue Oct 17 00:09:35 2006 -0700 [PATCH] null dereference in fs/jbd2/journal.c This is Eric Sesterhenn's jbd patch applied to jbd2. Commit: 41716c7c21b15e7ecf14f0caf1eef3980707fb74 His words: Since commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 we dereference a NULL pointer. Coverity id #1432. We set journal to NULL, and use it directly afterwards. Signed-off-by: Dave Kleikamp Cc: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4a0b917ce72ef47e438d354c433eb645218e87 Author: john stultz Date: Tue Oct 17 00:09:32 2006 -0700 [PATCH] i386 Time: Avoid PIT SMP lockups Avoid possible PIT livelock issues seen on SMP systems (and reported by Andi), by not allowing it as a clocksource on SMP boxes. However, since the PIT may no longer be present, we have to properly handle the cases where SMP systems have TSC skew and fall back from the TSC. Since the PIT isn't there, it would "fall back" to the TSC again. So this changes the jiffies rating to 1, and the TSC-bad rating value to 0. Thus you will get the following behavior priority on i386 systems: tsc [if present & stable] hpet [if present] cyclone [if present] acpi_pm [if present] pit [if UP] jiffies Rather then the current more complicated: tsc [if present & stable] hpet [if present] cyclone [if present] acpi_pm [if present] pit [if cpus < 4] tsc [if present & unstable] jiffies Signed-off-by: John Stultz Cc: Andi Kleen Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9f5d8040b470e4f74e3266ece2969ef06d0f8aa Author: Pierre Ossman Date: Tue Oct 17 00:09:30 2006 -0700 [PATCH] New MMC maintainer I will be taking over after Russell King as the new maintainer of the MMC layer. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca268c691de95612981b93e58899c1d73fdb6b47 Author: Ingo Molnar Date: Tue Oct 17 00:09:28 2006 -0700 [PATCH] lockdep: increase max allowed recursion depth In general, lockdep warnings are intended to be non-fatal, so I have put in various practical limits on internal data structure failure modes. We haven't had a /single/ lockdep-internal crash ever since lockdep went upstream [the unwinder crashes are outside of lockdep], and that's largely due to the good internal checks it does. Recursion within the dependency graph is currently limited to 20, that's probably not enough on some many-CPU boxes - this patch doubles it to 40. I have written the lockdep functions to have as small stackframes as possible, so 40 should be OK too. (The practical recursion limit should be somewhere between 100 and 200 entries. If we hit that then I'll change the algorithm to be iteration-based. Graph walking logic is so easy to program via recursion, so i'd like to keep recursion as long as possible.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 623a43952abfad2d48f287d1fab07b2089d07554 Author: Paul Fulghum Date: Tue Oct 17 00:09:27 2006 -0700 [PATCH] synclink: remove PAGE_SIZE reference Remove reference to PAGE_SIZE that causes errors if PAGE_SIZE != 4096 Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59f148005cfd3d41537a4b872c266213d5fe4dc6 Author: Brent Casavant Date: Tue Oct 17 00:09:25 2006 -0700 [PATCH] ioc4: Enable build on non-SN2 The SGI PCI-RT card, based on the SGI IOC4 chip, will be made available on Altix XE (x86_64) platforms in the near future. As such it is now a misnomer for the IOC4 base device driver to live under drivers/sn, and would complicate builds for non-SN2. This patch moves the IOC4 base driver code from drivers/sn to drivers/misc, and updates the associated Makefiles and Kconfig files to allow building on non-SN2 configs. Due to the resulting change in link order, it is now necessary to use late_initcall() for IOC4 subdriver initialization. [akpm@osdl.org: __udivdi3 fix] [akpm@osdl.org: fix default in Kconfig] Acked-by: Pat Gefre Acked-by: Jeremy Higdon Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 107d5a72f2c6a6819b66eebcb0281c7a67b6baaa Author: Brent Casavant Date: Tue Oct 17 00:09:24 2006 -0700 [PATCH] ioc4: Remove SN2 feature and config dependencies The SGI PCI-RT card, based on the SGI IOC4 chip, will be made available on Altix XE (x86_64) platforms in the near future. As such dependencies on SN2-specific features and config dependencies need to be removed. This patch updates the Kconfig files to remove the config dependency, and updates the IOC4 bus speed detection routine to use universally available time interfaces instead of mmtimer. Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6684e59aa3cf6cb7ebf04ea2953198500c93b0a9 Author: Laurent Riffard Date: Thu Oct 12 00:17:36 2006 +0200 [PATCH] sotftmac: fix a slab corruption in WEP restricted key association Fix a slab corruption in ieee80211softmac_auth(). The size of a buffer was miscomputed. see http://bugzilla.kernel.org/show_bug.cgi?id=7245 Acked-by: Daniel Drake Signed-off-by: Laurent Riffard Signed-off-by: John W. Linville commit 1f5c23e2c10d642a23aa3ebb449670a5184b6aab Author: Arthur Kepner Date: Mon Oct 16 20:22:35 2006 -0700 IB/mthca: Use mmiowb after doorbell ring We discovered a problem when running IPoIB applications on multiple CPUs on an Altix system. Many messages such as: ib_mthca 0002:01:00.0: SQ 000014 full (19941644 head, 19941707 tail, 64 max, 0 nreq) appear in syslog, and the driver wedges up. Apparently this is because writes to the doorbells from different CPUs reach the device out of order. The following patch adds mmiowb() calls after doorbell rings to ensure the doorbell writes are ordered. Signed-off-by: Arthur Kepner Signed-off-by: Roland Dreier commit 5bb85f18087b10a908bd793e9fd3ccd63aebb724 Author: Dave Kleikamp Date: Tue Oct 10 14:45:46 2006 -0700 [PATCH] airo: check if need to freeze The airo driver used to break out of while loop if there were any signals pending. Since it no longer checks for signals, it at least needs to check if it needs to be frozen. Signed-off-by: Dave Kleikamp Cc: Jean Tourrilhes Cc: Sukadev Bhattiprolu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 53077944f119808df3d1c6be07241f17a87e7c28 Author: Jean Tourrilhes Date: Tue Oct 10 14:45:46 2006 -0700 [PATCH] wireless: More WE-21 potential overflows... After the Orinoco issue, I did an audit of other drivers for the same issue. Three drivers were NULL terminating the ESSID, which could cause an overflow in WE-21 when the ESSID has maximum size. Signed-off-by: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 683f8c9e00d2aa911382186ca891bd221efaea74 Author: Eric Sesterhenn Date: Tue Oct 10 14:45:45 2006 -0700 [PATCH] zd1201: Possible NULL dereference If we enter the if(!zd) and set free to 1, we dereference zd in the exit code. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 7e4e8d99c2288a490a0806b9cb40016913312cfe Author: Jean Tourrilhes Date: Tue Oct 10 14:45:44 2006 -0700 [PATCH] orinoco: fix WE-21 buffer overflow This patch fixes the Orinoco driver overflow issue with WE-21. Cc: Valdis Kletnieks Cc: Pavel Roskin Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 431aca5a18f15f61cc51c466073928c4f9565fe4 Author: Florin Malita Date: Tue Oct 10 16:46:30 2006 -0400 [PATCH] airo.c: check returned values create_proc_entry() can fail and return NULL in setup_proc_entry(), the result must be checked before dereferencing. (Coverity ID 1443) init_wifidev() & setup_proc_entry() can also fail in _init_airo_card(). This adds the checks & cleanup code and removes some whitespace. Signed-off-by: Florin Malita Signed-off-by: John W. Linville commit 8da81e52b743edac0bfbb7d0c1286f919b2f209b Author: Larry Finger Date: Mon Oct 2 23:48:54 2006 -0500 [PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM The bcm43xx-softmac software currently fails when running on x86_64 systems with more than 1GB RAM and one of the card variants with 30-bit DMA addressing. This patch uses the address extension bits in the hardware to set the correct DMA mask for the specific card in use. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 16bfa676a7cc64695f7e9694c380ebd26c461ae5 Author: Larry Finger Date: Thu Sep 28 00:10:55 2006 -0500 [PATCH] bcm43xx-softmac: check returned value from pci_enable_device Linus's tree now has a configuration option that prints a warning whenever the returned value of any routine is ignored. This patch fixes the only such warning for bcm43xx. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 7c28ad2d83ecc637237fe684659a6afbce0bb2a8 Author: Michael Buesch Date: Wed Sep 27 15:26:33 2006 +0300 [PATCH] softmac: Fix WX and association related races This fixes some race conditions in the WirelessExtension handling and association handling code. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 3693ec670b3bb4d11295856bea3592dd8f37f9a5 Author: Michael Buesch Date: Tue Sep 26 13:22:41 2006 -0500 [PATCH] bcm43xx: fix race condition in periodic work handler There is a potential race condition in the periodic_work_handler routine of bcm43xx-softmac. In addition to fixing this condition, the size of code is reduced by moving the mutex lock outside the if. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 0f6f65f607b6d516fa001e8cdf5a2618c81372f5 Author: Russell King Date: Mon Oct 16 21:14:51 2006 +0100 [ARM] Update mach-types Signed-off-by: Russell King commit 4d99bfac9d5ce53b383d3c8279b917050be4e06c Author: Geert Uytterhoeven Date: Mon Oct 16 19:59:43 2006 +0200 [PATCH] CONFIG_TELCLOCK depends on X86 The telecom clock driver for MPBL0010 ATCA SBC depends on X86 Signed-off-by: Geert Uytterhoeven Acked-by: Mark Gross Signed-off-by: Linus Torvalds commit 6ef93dddfe11a72ab98a37ac4ef20ad681b008b0 Author: Robert Walsh Date: Tue Oct 10 14:55:45 2006 -0700 IB/ipath: Initialize diagpkt file on device init only Don't attempt to set up the diagpkt device in the module init code. Instead, wait until a piece of hardware is initialized. Fixes a problem when loading the ib_ipath module when no InfiniPath hardware is present: modprobe would go into the D state and stay there. Signed-off-by: Robert Walsh Signed-off-by: Roland Dreier commit fb7711e71ea7cd0d3e77e969df59162388c8a1f9 Author: Adrian Bunk Date: Tue Oct 10 14:26:02 2006 -0700 RDMA/amso1100: Fix a NULL dereference in error path This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Steve Wise Acked-by: Tom Tucker Signed-off-by: Roland Dreier commit d986a27413aad10574f7211524de6a529870d134 Author: Henrik Kretzschmar Date: Tue Oct 10 14:26:01 2006 -0700 RDMA/amso1100: pci_module_init() conversion pci_module_init() convertion in amso1100 driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Roland Dreier commit 39af114377bf80d2a88e47be33d578d1fa9b0775 Author: Randy Dunlap Date: Mon Oct 16 09:01:46 2006 -0700 [PATCH] fix epoll_pwait when EPOLL=n Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7371 sys_epoll_pwait needs to be listed as a conditional (weak) entry point for CONFIG_EPOLL=n. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 29da7eb0ec69245c6e9b4eb5bdaa04af685f5c4f Author: David Howells Date: Mon Oct 16 14:10:49 2006 +0100 [PATCH] FRV: Use the correct preemption primitives in kmap_atomic() and co Use inc/dec_preempt_count() rather than preempt_enable/disable() and manually add in the compiler barriers that were provided by the latter. This makes FRV consistent with other archs. Furthermore, the compiler barrier effects are now there unconditionally - at least as far as preemption is concerned - because we don't want the compiler moving memory accesses out of the section of code in which the mapping is in force - in effect the kmap_atomic() must imply a LOCK-class barrier and the kunmap_atomic() must imply an UNLOCK-class barrier to the compiler. Signed-off-by: David Howells Acked-by: Peter Zijlstra Signed-off-by: Linus Torvalds commit 8741ca71a3f626a56595b88200ebf952ce77ceef Author: Andrey Mirkin Date: Mon Oct 16 12:08:43 2006 +0400 [PATCH] 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: Vasily Averin Signed-off-by: Linus Torvalds commit 3a42bb223f61fbd755d6e61b9b50b9681d68fcae Author: Alan Cox Date: Mon Oct 16 16:31:02 2006 +0100 [PATCH] ide: add sanity checking to ide taskfile ioctl Without this the user can feed in bogus values and get very bogus results. Security impact is minimal as this ioctl isn't available to unpriviledged processes anyway. Reported to the l/k list and found with an auditing tool. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9d90dafdb1f0e3c2b69fa8d3fbe99649127c8fa4 Author: Alan Cox Date: Mon Oct 16 16:28:44 2006 +0100 [PATCH] rio: fix array checking Found by an analysis tool and reported to the list. Fix is simple enough Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 43518407d57f1b685f5a9f1a981734ce66a21f76 Author: Herbert Xu Date: Mon Oct 16 21:28:58 2006 +1000 [CRYPTO] api: Select cryptomgr where needed Since cryptomgr is the only way to construct algorithm instances for now it makes sense to let the templates depend on it as otherwise it may be left off inadvertently. Signed-off-by: Herbert Xu commit 3f5306927d800306ebba542438cfdf1a1c418376 Author: Marcel Holtmann Date: Sun Oct 15 17:31:19 2006 +0200 [Bluetooth] Use work queue to trigger URB submission The bcm203x firmware loading driver uses a timer to trigger the URB submission. It is better to use a work queue instead. Signed-off-by: Marcel Holtmann commit 74da626a1098640ddc40c0e3481c0cd41e8ec1e9 Author: Marcel Holtmann Date: Sun Oct 15 17:31:14 2006 +0200 [Bluetooth] Add locking for bt_proto array manipulation The bt_proto array needs to be protected by some kind of locking to prevent a race condition between bt_sock_create and bt_sock_register. And in addition all calls to sk_alloc need to be made GFP_ATOMIC now. Signed-off-by: Masatake YAMATO Signed-off-by: Frederik Deweerdt Signed-off-by: Marcel Holtmann commit cb19d9ea2ce2bcbe291d3d48e3501dc4f33ba627 Author: Marcel Holtmann Date: Sun Oct 15 17:31:10 2006 +0200 [Bluetooth] Check if DLC is still attached to the TTY If the DLC device 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 b2cfcd75df77b80d9cc3fa84190a350dfa79eb93 Author: Marcel Holtmann Date: Sun Oct 15 17:31:05 2006 +0200 [Bluetooth] Fix reference count when connection lookup fails When the connection lookup for the device structure fails, the reference count for the HCI device needs to be decremented. Signed-off-by: Marcel Holtmann commit e86070c83e9110e89800274385c013db602b1444 Author: Marcel Holtmann Date: Sun Oct 15 17:31:00 2006 +0200 [Bluetooth] Disconnect HID interrupt channel first The Bluetooth HID specification demands that the interrupt channel shall be disconnected first. This is needed to pass the qualification tests. Signed-off-by: Marcel Holtmann commit 4c67bc74f016b0d360b8573e18969c0ff7926974 Author: Marcel Holtmann Date: Sun Oct 15 17:30:56 2006 +0200 [Bluetooth] Support concurrent connect requests Most Bluetooth chips don't support concurrent connect requests, because this would involve a multiple baseband page with only one radio. In the case an upper layer like L2CAP requests a concurrent connect these chips return the error "Command Disallowed" for the second request. If this happens it the responsibility of the Bluetooth core to queue the request and try again after the previous connect attempt has been completed. Signed-off-by: Marcel Holtmann commit e9c4bec63eac001651d6d30239dd4175cc3698ef Author: Marcel Holtmann Date: Sun Oct 15 17:30:50 2006 +0200 [Bluetooth] Make use of virtual devices tree The Bluetooth subsystem currently uses a platform device for devices with no parent. It is a better idea to use the new virtual devices tree for these. Signed-off-by: Marcel Holtmann commit df5c37ea9a3820a9515d8204450aec00f48f8f88 Author: Marcel Holtmann Date: Sun Oct 15 17:30:45 2006 +0200 [Bluetooth] Handle return values from driver core functions Some return values of the driver core register and create functions are not handled and so might cause unexpected problems. Signed-off-by: Marcel Holtmann commit e9c5702e3c5558dade169949abd730173e87ef9c Author: Marcel Holtmann Date: Sun Oct 15 17:30:22 2006 +0200 [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP There exists no attempt do deal with the fact that a structure with a uint32_t followed by a pointer is going to be different for 32-bit and 64-bit userspace. Any 32-bit process trying to use it will be failing with -EFAULT if it's lucky; suffering from having data dumped at a random address if it's not. Signed-off-by: David Woodhouse Signed-off-by: Marcel Holtmann commit 39c850863d5e36e72ecf9bc3537ec717bcce97fd Author: Jan Dittmer Date: Fri Oct 13 15:05:53 2006 -0700 [IPV6] sit: Add missing MODULE_LICENSE This is missing the MODULE_LICENSE statements and taints the kernel upon loading. License is obvious from the beginning of the file. Signed-off-by: Jan Dittmer Signed-off-by: Joerg Roedel Signed-off-by: David S. Miller commit f1a95859a86fcdfd94f8b6dc3255d70d037e1caf Author: YOSHIFUJI Hideaki Date: Fri Oct 13 15:03:34 2006 -0700 [IPV6]: Remove bogus WARN_ON in Proxy-NA handling. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit adaa70bbdfbc725e485179b06c8b23a20fbb7952 Author: Thomas Graf Date: Fri Oct 13 15:01:03 2006 -0700 [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors Fixes rt6_lookup() to provide the source address in the flow and sets RT6_LOOKUP_F_HAS_SADDR whenever it is present in the flow. Avoids unnecessary prefix comparisons by checking for a prefix length first. Fixes the rule logic to not match packets if a source selector has been specified but no source address is available. Thanks to Kim Nordlund for working on this patch with me. Signed-off-by: Thomas Graf Acked-by: Ville Nuorvala Signed-off-by: David S. Miller commit 918049f0135854a1583f9b3b88f44dbf2b027329 Author: David S. Miller Date: Thu Oct 12 22:03:24 2006 -0700 [XFRM]: Fix xfrm_state_num going negative. Missing counter bump when hashing in a new ACQ xfrm_state. Now that we have two spots to do the hash grow check, break it out into a helper function. Signed-off-by: David S. Miller commit 4663afe2c848e2abc8791202beecf40684f13eb4 Author: Eric Dumazet Date: Thu Oct 12 21:21:06 2006 -0700 [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire() 1) shrink struct inet_peer on 64 bits platforms. commit ea614d7f4fb2d436b7a5ee490d1011615f6b38d5 Author: Paul Moore Date: Wed Oct 11 19:10:49 2006 -0400 NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly The CIPSO passthrough mapping had a problem when sending categories which would cause no or incorrect categories to be sent on the wire with a packet. This patch fixes the problem which was a simple off-by-one bug. Signed-off-by: Paul Moore Signed-off-by: James Morris commit bf0edf39296097f20c5fcc4919ed7d339194bd75 Author: Paul Moore Date: Wed Oct 11 19:10:48 2006 -0400 NetLabel: better error handling involving mls_export_cat() Upon inspection it looked like the error handling for mls_export_cat() was rather poor. This patch addresses this by NULL'ing out kfree()'d pointers before returning and checking the return value of the function everywhere it is called. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 044a68ed8a692f643cf3c0a54c380a922584f34f Author: Paul Moore Date: Wed Oct 11 19:10:47 2006 -0400 NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping Fix several places in the CIPSO code where it was dereferencing fields which did not have valid pointers by moving those pointer dereferences into code blocks where the pointers are valid. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 1a620698c29b5e18150ec04ace0609fb07d08d3e Author: Stephen Hemminger Date: Thu Oct 12 14:45:38 2006 -0700 [BRIDGE]: flush forwarding table when device carrier off Flush the forwarding table when carrier is lost. This helps for availability because we don't want to forward to a downed device and new packets may come in on other links. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9ea8cfd6aa74e710f0cb0731ecb9dee53fbebfb9 Author: Pablo Neira Ayuso Date: Thu Oct 12 14:09:16 2006 -0700 [NETFILTER]: ctnetlink: Remove debugging messages Remove (compilation-breaking) debugging messages introduced at early development stage. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 82b985434c5e9ceee772ca206889a856a7a4a200 Author: Patrick McHardy Date: Thu Oct 12 14:08:55 2006 -0700 [NETFILTER]: Update MAINTAINERS entry Patches should go to myself CC netfilter-devel. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c08de5d5308ae0d20290344551ddd9cea8ded661 Author: Patrick McHardy Date: Thu Oct 12 14:08:41 2006 -0700 [NETFILTER]: xt_CONNSECMARK: fix Kconfig dependencies CONNSECMARK needs conntrack, add missing dependency to fix linking error with CONNSECMARK=y and CONNTRACK=m. Reported by Toralf Förster . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a9f54596fa20be3edefaa0b24c8714edb945eeaa Author: Patrick McHardy Date: Thu Oct 12 14:08:26 2006 -0700 [NETFILTER]: ipt_ECN/ipt_TOS: fix incorrect checksum update Even though the tos field is only a single byte large, the values need to be converted to net-endian for the checkum update so they are in the corrent byte position. Also fix incorrect endian annotations. Reported by Stephane Chazelas Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f603b6ec50faabbabde53ae2e2ce774968524c40 Author: Patrick McHardy Date: Thu Oct 12 14:08:11 2006 -0700 [NETFILTER]: arp_tables: missing unregistration on module unload Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f64ad5bb044326c6ebc6535d661c1abe78a0e5f2 Author: Patrick McHardy Date: Thu Oct 12 14:07:52 2006 -0700 [NETFILTER]: fix cut-and-paste error in exit functions Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit be60358e948484e472c88bf8a2d77e644ff5ed83 Author: Patrick McHardy Date: Thu Oct 12 13:53:32 2006 -0700 [DECNET]: Use correct config option for routing by fwmark in compare_keys() Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 284a940675a64df253e3dffc60b09bb4bbb149e4 Author: Anton Blanchard Date: Fri Oct 13 12:26:57 2006 +1000 [POWERPC] Check for offline nodes in pci NUMA code During boot we bring up all memory and cpu nodes. Normally a PCI device will be in one of these online nodes, however in some weird setups it may not. We have only seen this in the lab but we may as well check for the case and fallback to -1 (all nodes). Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 00ae36de49cc718d4122e1c8aac96fd1a5a2553c Author: Anton Blanchard Date: Fri Oct 13 12:17:16 2006 +1000 [POWERPC] Better check in show_instructions Instead of just checking that an address is in the right range, use the provided __kernel_text_address() helper which covers both the kernel and module text sections. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 99f48610252b736908fa5bdea505a480368308d6 Author: Anton Blanchard Date: Fri Oct 13 12:13:12 2006 +1000 [POWERPC] POWER6 has 6 PMCs Change ->num_pmcs to match the number of PMCs in POWER6. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 6c4841c2b6c32a134f9f36e5e08857138cc12b10 Author: Anton Blanchard Date: Fri Oct 13 11:41:00 2006 +1000 [POWERPC] Never panic when taking altivec exceptions from userspace At the moment we rely on a cpu feature bit or a firmware property to detect altivec. If we dont have either of these and the cpu does in fact support altivec we can cause a panic from userspace. It seems safer to always send a signal if we manage to get an 0xf20 exception from userspace. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 60b2a46cd60c54bd6551ddfa01f0aab08ca58a5d Author: Randy Vinson Date: Thu Oct 12 13:36:23 2006 -0700 [POWERPC] Fix IO Window Updates on P2P bridges. When update_bridge_base() updates the IO window on a PCI-to-PCI bridge, it fails to zero the upper 16 bits of the base and limit registers if the window size is less than 64K. This fixes it. Signed-off-by: Paul Mackerras commit 8ba738c2bb8fb83c0c99f680444d3ffd4c178ca2 Author: Li Yang Date: Wed Oct 11 19:27:57 2006 +0800 [POWERPC] Add Makefile entry for MPC832x_mds support Add missing entry in Makefile for MPC832x MDS support. It also change white space to tab in MPC8360 entry. Signed-off-by: Li Yang Signed-off-by: Paul Mackerras commit f5a37b066165f9938a93653f6940f3dc85ce751d Author: Li Yang Date: Wed Oct 11 19:04:22 2006 +0800 [POWERPC] Fix MPC8360EMDS PB board support MPC8360EMDS PB support is broken as some code was missing in last submission. This patch adds missing code and makes MPC8360EMDS PB support working. Signed-off-by: Li Yang Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 7d2bd30f67e231920091d55d0fffc3a4bf43e68a Author: Kumar Gala Date: Wed Oct 11 02:06:59 2006 -0500 [POWERPC] ppc: Add missing calls to set_irq_regs In the timer_interrupt we were not calling set_irq_regs() and if we are profiling we will end up calling get_irq_regs(). This causes bad things to happen. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit bb579cf1d413b930be0241987b848e0f0c1b292f Author: Eric Sesterhenn Date: Tue Oct 10 14:37:29 2006 -0700 [POWERPC] Off-by-one in /arch/ppc/platforms/mpc8* A find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(" revealed several incorrect usages of ARRAY_SIZE in the mpc drivers. The last element in the array is always ARRAY_SIZE()-1, this patch modifies the bounds checks accordingly. Signed-off-by: Eric Sesterhenn Cc: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit ee4ea82c07fa8aa46037962ec3e8b40c5144b5eb Author: Timur Tabi Date: Tue Oct 10 11:53:26 2006 -0500 [POWERPC] Add DOS partition table support to mpc834x_itx_defconfig The default configuration file for the MPC8349E-mITX reference board, mpc834x_itx_defconfig, did not include support for DOS partition table types. This support is necessary because the hard drive that comes with the ITX is formatted with this partition table type. Without this config option, no partitions on the drive can be mounted. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 654e4aee495bec1e4fc71ba1af25735da7cadc15 Author: Noguchi, Masato Date: Tue Oct 10 10:27:29 2006 +0200 [POWERPC] spufs: fix support for read/write on cntl This fixes a memory leak introduced by "spufs: add support for read/write oncntl", which was missing a call to simple_attr_close. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e5267b4b376cfbdc4518abcc68d5a7fffb505638 Author: Benjamin Herrenschmidt Date: Tue Oct 10 15:14:12 2006 +1000 [POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA The SPU code will crash if CONFIG_NUMA is not set and SPUs are found on a non-0 node. This workaround will ignore those SPEs and just print an message in the kernel log. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 18088748d2a493ce9f6adf0be7f833b04041807e Author: Michel Dänzer Date: Wed Oct 4 14:56:44 2006 +0200 [AGPGART] uninorth: Add module param 'aperture' for aperture size In contrast to most if not all PC BIOSes, OpenFirmware (OF) on PowerMacs with UniNorth bridges does not allow changing the aperture size. The size set up by OF is usually 16 MB, which is too low for graphics intensive environments. Hence, add a module parameter that allows changing the aperture size at driver initialization time. When the parameter is not specified, the default is 32 MB. Signed-off-by: Michel Dänzer Acked-by: Benjamin Herrenschmidt Signed-off-by: Dave Jones commit 51018b0a3160d253283173c2f54f16746cee5852 Author: Ulrich Drepper Date: Sun Oct 15 15:03:48 2006 -0400 [PATCH] make UML compile (FC6/x86-64) I need this patch to get a UML kernel to compile. This is with the kernel headers in FC6 which are automatically generated from the kernel tree. Some headers are missing but those files don't need them. At least it appears so since the resuling kernel works fine. Tested on x86-64. Signed-off-by: Ulrich Drepper Signed-off-by: Linus Torvalds commit 80c5606c3b45e0176c32d3108ade1e1cb0b954f3 Author: Linus Torvalds Date: Sun Oct 15 14:09:55 2006 -0700 Fix VM_MAYEXEC calculation .. and clean up the file mapping code while at it. No point in having a "if (file)" repeated twice, and generally doing similar checks in two different sections of the same code Signed-off-by: Linus Torvalds commit a7a0d86f5aa40a2215e36fe21d7911cf718ba428 Author: Petr Vandrovec Date: Fri Oct 13 18:42:07 2006 +0200 [PATCH] Fix core files so they make sense to gdb... It is silly to use non-static variable for writting zeroes to the file. And more seriously, foffset in core dump file dump function was incremented too much, so some parts of core dump were shifted by size of few phdrs and notes down, so although gdb was able to load that file, it did not make lot of sense - in my test case data pages were shifted down by about 900 bytes. Signed-off-by: Petr Vandrovec Signed-off-by: Linus Torvalds commit e5a301ee02e53acf000bb8331587129930bc2290 Author: Al Viro Date: Sat Oct 14 16:51:49 2006 +0100 [PATCH] serial167 __user annotations, NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cbff67668d597da48f8bc48549a9630cbf968f34 Author: Al Viro Date: Sat Oct 14 16:53:38 2006 +0100 [PATCH] sun3_ioremap() prototype Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6ce6b3aeeae75eee34670bcd42870ac839bfec4c Author: Al Viro Date: Sat Oct 14 16:52:36 2006 +0100 [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 733f99acc82543030ce0417e2f2201ddc63097af Author: Al Viro Date: Sat Oct 14 16:48:26 2006 +0100 [PATCH] new cifs endianness bugs * missing cpu_to_le64() for ChangeTime (introduced by [CIFS] Legacy time handling for Win9x and OS/2 part 1) * missing le16_to_cpu() for DialectIndex (introduced by [CIFS] Do not send newer QFSInfo to legacy servers which can not support it) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 645408d1ffe9f27b176a88302c22420f301607db Author: Al Viro Date: Sat Oct 14 16:50:38 2006 +0100 [PATCH] gfp_t in netlabel Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 36bd262b3f2ac723dadd20ce35539c8c738877f1 Author: Russell King Date: Sun Oct 15 13:50:02 2006 +0100 [ARM] Fix Zaurii keyboard/touchscreen drivers The Zaurii drivers were partially fixed up for the IRQ register changes, but unfortunately missed some bits, resulting in build errors. Fix these. Signed-off-by: Russell King commit 2326eb985b8844f44e150489c76f5cb56fa381b4 Author: Russell King Date: Sun Oct 15 13:48:37 2006 +0100 [ARM] Fix fallout from IRQ regs changes Some ARM platforms were still broken as a result of the IRQ register passing changes, mostly due to a missing linux/irq.h include. Signed-off-by: Russell King commit cbf40d3f04c2c76a58f1183bb4a9a82fefb842e3 Author: Wim Van Sebroeck Date: Sat Oct 14 20:18:47 2006 +0200 [WATCHDOG] remove experimental on iTCO_wdt.c The iTCO_wdt.c driver has been tested enough. So we can remove the experimental classification. Signed-off-by: Wim Van Sebroeck commit 8e25b84e76a0b2c117218405818cadd591512ff8 Author: Kristoffer Ericson Date: Sun Oct 8 20:00:53 2006 +0100 [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h This adds relevant MCU commands for the j7xx chipset. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 48e3becbee8906b44050c9300b668227b85f0c95 Author: Kristoffer Ericson Date: Sun Oct 8 19:52:30 2006 +0100 [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c This adds correct sdram params for K4S281632B-1H and sets the jornada to use them by default. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 69f0304e174c765c624d75b79c35e49b7ba67ed4 Author: Liam Girdwood Date: Thu Oct 5 13:22:42 2006 +0100 [ARM] 3888/1: add pxa27x SSP FSRT register bit definition This patch adds a register bit definition for the pxa27x SSP port Frame Sync Relative Timing (FSRT) bit. Signed-off-by: Liam Girdwood Signed-off-by: Russell King commit 34c4415ab857dc6d51db08d62bcd45d4b8513bb6 Author: Jiri Kosina Date: Tue Oct 10 14:20:41 2006 -0700 ACPI: check battery status on resume for un/plug events during sleep Add ->resume method to the ACPI battery handler to check if the battery state has changed during sleep. If yes, update the ACPI internal data structures for benefit of /proc/acpi/battery/. Signed-off-by: Jiri Kosina Cc: Stefan Seyfried Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit aeb1104814e1177b865eec4f4b364602f5fcb6d1 Author: Eiichiro Oiwa Date: Mon Oct 2 19:18:03 2006 +0400 ACPICA: Fix incorrect handling of PCI Express Root Bridge _HID I could not get correct PCI Express bus number from the structure of acpi_object_extra. I always get zero as bus number regardless of bus location. I found that there is incorrect comparison with _HID (PNP0A08) in acpi/events/evrgnini.c and PCI Express _BBN method always fail. Therefore, we always get zero as PCI Express bus number. http://bugzilla.kernel.org/show_bug.cgi?id=7145 Signed-off-by: Bob Moore Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 6df05702f97f99e038ab817f4466386f6255f58d Author: Alexey Dobriyan Date: Tue Oct 10 14:20:36 2006 -0700 ACPI: asus_acpi: don't printk on writing garbage to proc files This reporting is useless (we errno anyway). Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 6311f0dac006032b82e3556874a1e18b31e80de2 Author: Darren Jenkins Date: Tue Oct 10 14:20:35 2006 -0700 ACPI: asus_acpi: fix proc files parsing ICC complains about a "Pointless comparsion of unsigned interger with zero" @ line 760 & 808 of asus_acpi.c parse_arg() mentioned below returns -E but it's copied into unsigned variable... Signed-off-by: Darren Jenkins Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 281ea49b0c294649a6de47a6f8fbe5611137726b Author: Kimball Murray Date: Tue Oct 10 14:20:33 2006 -0700 ACPI: SCI interrupt source override The Linux group at Stratus Technologies has come across an issue with SCI routing under ACPI. We were bitten by this when we made an x86_64 platform whose BIOS provides an Interrupt Source Override for the SCI itself. Apparently the override has no effect for the System Control Interrupt, and this appears to be because of the way the SCI is setup in the ACPI code. It does not handle the case where busirq != gsi. The code that sets up the SCI routing assumes that bus irq == global irq. So there is simply no provision for telling it otherwise. The attached patch provides this mechanism. This patch provided by David Bulkow, was tested on an i386 platform, which does not use the SCI override, and also on an x86_64 platform which does use an override. Signed-off-by: David Bulkow Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a790b323fb1b73f9388426bf3b96f153d1c90d2c Author: Randy Dunlap Date: Tue Oct 10 14:20:32 2006 -0700 ACPI: fix printk format warnings Fix printk format warnings in drivers/acpi: drivers/acpi/tables/tbget.c:326: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int' drivers/acpi/tables/tbrsdt.c:189: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7af8b66004fa827958b4871112e59a07db5b3f6b Author: Pierre Ossman Date: Tue Oct 10 14:20:31 2006 -0700 ACPI: fix section for CPU init functions The ACPI processor init functions should be marked as __cpuinit as they use structures marked with __cpuinitdata. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit f4d2e2d87eac0338884b2c26f6bafed115dbac5e Author: Len Brown Date: Thu Sep 14 17:16:22 2006 -0400 ACPI: update comments in motherboard.c Signed-off-by: Len Brown commit 168a328f30e9d1a8bc6ff55c0501e0bdc08bee60 Author: Jiri Kosina Date: Thu Aug 24 00:36:19 2006 -0400 ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL acpi_pci_link_set() allocates both with interrupts on and with interrupts off (resume-time), so check interrupts and decide on GFP_ATOMIC or GFP_KERNEL at run-time. Signed-off-by: Jiri Kosina Signed-off-by: Len Brown commit 786f18c666d7202a86a8aa42a98783b115fe8739 Author: Dmitry Torokhov Date: Wed Aug 23 23:18:06 2006 -0400 ACPI: fix potential OOPS in power driver with CONFIG_ACPI_DEBUG device was set to null and used before set in a debug printk Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 2fe6dffabb06bfa0591c8c490b092b458fba1f06 Author: Pavel Machek Date: Thu Aug 31 14:15:54 2006 +0200 ACPI: ibm_acpi: delete obsolete documentation As this module is now part of the kernel tree, there is no need for instructions on how to download it and build an external module. Signed-off-by: Pavel Machek Signed-off-by: Len Brown commit 37605a6900f6b4d886d995751fcfeef88c4e462c Author: Alexey Y. Starikovskiy Date: Tue Sep 26 04:20:47 2006 -0400 ACPI: created a dedicated workqueue for notify() execution http://bugzilla.kernel.org/show_bug.cgi?id=5534#c160 Signed-off-by: Len Brown commit fcfc638c6b1345b6646523dbab0065b36a868ffc Author: Alexey Y. Starikovskiy Date: Tue Sep 26 04:18:16 2006 -0400 ACPI: Remove deferred execution from global lock acquire wakeup path On acquiring the ACPI global lock, if there were sleepers on the lock, we used to use acpi_os_execute() to defer a thread which would signal sleepers. Now just signal the semaphore directly. http://bugzilla.kernel.org/show_bug.cgi?id=5534#c159 Signed-off-by: Len Brown commit 8c4c731a89ea6458001f48033f8988447736fb38 Author: Lennart Poettering Date: Fri Oct 6 01:27:02 2006 -0400 MSI S270 Laptop support: backlight, wlan, bluetooth states Create a driver to support the platform-specific features of MSI S270 laptops (and maybe other MSI laptops). This driver implements a backlight device for controlling LCD brightness (/sys/class/backlight/msi-laptop-bl/). In addition it allows access to the WLAN and Bluetooth states through a platform driver (/sys/devices/platform/msi-laptop-pf/). Signed-off-by: Lennart Poettering Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ab9e43c640b2b7d6e296fc39dd8cbcb96f9ae393 Author: Lennart Poettering Date: Tue Oct 3 22:49:00 2006 -0400 ACPI: EC: export ec_transaction() for msi-laptop driver Signed-off-by: Lennart Poettering Signed-off-by: Len Brown commit 6ffb221a82de962f31034b45d945e203a0f0500f Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Simplify acpi_hw_low_level*() with inb()/outb(). Simplify acpi_hw_low_level_xxx() functions to inb() and outb(). Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 8e0341ba791cc72c643340b0d8119141ae5a80c5 Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Unify poll and interrupt gpe handlers Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 3576cf619b73d850f5b21375609645f221e6270f Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Unify poll and interrupt mode transaction functions Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 703959d47e887a29dc58123c05aa0ffcbbfa131d Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Remove unused variables and duplicated code Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 7c6db5e51227761f42c6ac8260753f5c24dc1dde Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Remove unnecessary delay added by previous transation patch. Remove unnecessary delay (50 ms) while reading data from EC in interrupt mode. Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit d7a76e4cb3b4469b1eccb6204c053e3ebcd4c196 Author: Lennart Poettering Date: Tue Sep 5 12:12:24 2006 -0400 ACPI: consolidate functions in acpi ec driver Unify the following functions: acpi_ec_poll_read() acpi_ec_poll_write() acpi_ec_poll_query() acpi_ec_intr_read() acpi_ec_intr_write() acpi_ec_intr_query() into: acpi_ec_poll_transaction() acpi_ec_intr_transaction() These new functions take as arguments an ACPI EC command, a few bytes to write to the EC data register and a buffer for a few bytes to read from the EC data register. The old _read(), _write(), _query() are just special cases of these functions. Then unified the code in acpi_ec_poll_transaction() and acpi_ec_intr_transaction() a little more. Both functions are now just wrappers around the new acpi_ec_transaction_unlocked() function. The latter contains the EC access logic, the two original function now just do their special way of locking and call the the new function for the actual work. This saves a lot of very similar code. The primary reason for doing this, however, is that my driver for MSI 270 laptops needs to issue some non-standard EC commands in a safe way. Due to this I added a new exported function similar to ec_write()/ec_write() which is called ec_transaction() and is essentially just a wrapper around acpi_ec_{poll,intr}_transaction(). Signed-off-by: Lennart Poettering Acked-by: Luming Yu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 991528d7348667924176f3e29addea0675298944 Author: Venkatesh Pallipadi Date: Mon Sep 25 16:28:13 2006 -0700 ACPI: Processor native C-states using MWAIT Intel processors starting with the Core Duo support support processor native C-state using the MWAIT instruction. Refer: Intel Architecture Software Developer's Manual http://www.intel.com/design/Pentium4/manuals/253668.htm Platform firmware exports the support for Native C-state to OS using ACPI _PDC and _CST methods. Refer: Intel Processor Vendor-Specific ACPI: Interface Specification http://www.intel.com/technology/iapc/acpi/downloads/302223.htm With Processor Native C-state, we use 'MWAIT' instruction on the processor to enter different C-states (C1, C2, C3). We won't use the special IO ports to enter C-state and no SMM mode etc required to enter C-state. Overall this will mean better C-state support. One major advantage of using MWAIT for all C-states is, with this and "treat interrupt as break event" feature of MWAIT, we can now get accurate timing for the time spent in C1, C2, .. states. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 3cd5b87d96db503f69a5892b8f5350d356d18969 Author: Lebedev, Vladimir P Date: Tue Sep 5 19:59:22 2006 +0400 ACPI: sbs: fix module_param() initializers Signed-off-by: Len Brown commit 963497c12acb4d43caa9751b9291b014eea51a1a Author: Lebedev, Vladimir P Date: Tue Sep 5 19:49:13 2006 +0400 ACPI: sbs: check for NULL device pointer Signed-off-by: Len Brown commit 28b779d127d3038ff83f42259d135a063b7cd848 Author: Stefan Schmidt Date: Fri Sep 22 12:19:16 2006 +0200 ACPI: ibm_acpi: Documentation the wan feature. Document the wan feature Jeremy Fitzhardinge added to ibm_acpi. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 24f7ff0af855ece60064a2532d8b316df02983c6 Author: Stefan Schmidt Date: Fri Sep 22 12:19:15 2006 +0200 ACPI: ibm_acpi: Update documentation for brightness and volume. Document the change of the experimental flag for brightness and volume. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 4d6bd5ea4ec4991901a8cf5a586babef68e1fa3f Author: Stefan Schmidt Date: Fri Sep 22 12:19:14 2006 +0200 ACPI: ibm_acpi: Remove experimental status for brightness and volume. The brightness and volume features from ibm-acpi are stable. The experimental flag is no longer needed. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 288f3ad406460f03642a41bb945826891a7b866f Author: Marek W Date: Mon Aug 14 22:37:20 2006 -0700 ACPI: asus_acpi: W3000 support Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under KDE (it was triggering excessive LCD read error messages by querying asus_acpi module) allowing people (I am probably the only one who tested this) with W3000 to run kmilo. Cc: Karol Kozimor Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5570dd02ca7fb2e28d32516fae05031d48711aa5 Author: Patrick Boettcher Date: Fri Oct 13 11:35:12 2006 -0300 V4L/DVB (4750): AGC command1/2 is board specific Added config-struct-parameter to take board-specific AGC command 1 and 2 into account. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 6a74216c4590e4d322a45e1085f3553b1fb07f06 Author: Patrick Boettcher Date: Fri Oct 13 11:33:26 2006 -0300 V4L/DVB (4748): Fixed oops for Nova-T USB2 When using the remote control with the Nova-T USB there was an Oops because of the recent DVB-USB-Adapter change. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 5011915cbb139a331c083e65a61c82e9174f9813 Author: Hans Verkuil Date: Fri Oct 13 05:12:42 2006 -0300 V4L/DVB (4746): HM12 is YUV 4:2:0, not YUV 4:1:1 Fix comment in videodev2.h Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d3e6bdaa8b4b068d378ab58679c334e433496cd Author: Hans Verkuil Date: Thu Oct 12 15:45:33 2006 -0300 V4L/DVB (4744): The Samsung TCPN2121P30A does not have a tda9887 Contrary to all expections the Samsung TCPN2121P30A tuner does NOT have a tda9887. Remove the tda9887 flag from the tuner definition. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 83427ac5d643308ccb36e05d525949952bdedc27 Author: Jonathan Corbet Date: Fri Oct 13 07:51:16 2006 -0300 V4L/DVB (4743): Fix oops in VIDIOC_G_PARM The call to v4l2_std_construct() in the VIDIOC_G_PARM handler treats vfd->current_norm as if it were an index - but it's not. The result is an oops if the driver has no vidioc_g_parm() method defined. Here's the fix. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c12e3be0860652ed1e15c9442adcba44317211d1 Author: Jeff Garzik Date: Fri Oct 13 07:17:32 2006 -0300 V4L/DVB (4742): Drivers/media/video: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 2444a2fca488fa8e362895a4ca9fdc51f497282a Author: Jeff Garzik Date: Tue Oct 10 15:09:43 2006 -0300 V4L/DVB (4741): {ov511,stv680}: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Mauro Carvalho Chehab commit 474ce78130ba37cb50e620c538ab3ffe6c582ba6 Author: Enrico Scholz Date: Mon Oct 9 16:27:05 2006 -0300 V4L/DVB (4740): Fixed an if-block to avoid floating with debug-messages The dbgarg() macro in videodev.c contains some printk() statements where only the first one is influenced by an if-statement. This causes floating with debug-messages which is fixed by this patch by adding a '{ ... }' pair. Signed-off-by: Enrico Scholz Signed-off-by: Mauro Carvalho Chehab commit fc2fa31f4eaa53995593ced14c73f2cf63dcfa17 Author: Pádraig Brady Date: Mon Oct 9 08:02:17 2006 -0300 V4L/DVB (4739): SECAM support for saa7113 into saa7115 Without the attached trivial patch, the saa7113 is set up for PAL when SECAM is selected and hence will see only show black and white for SECAM signals. Tested the patch against the saa7115 module in linux-2.6.17 with a Pinnacle 50e USB tuner (em28xx). Signed-off-by: Pádraig Brady Signed-off-by: Mauro Carvalho Chehab commit 626ae83bb24927ca015503448f0199842ae2e8da Author: Amit Choudhary Date: Mon Oct 9 15:50:10 2006 -0300 V4L/DVB (4738): Bt8xx/dvb-bt8xx.c: check kmalloc() return value. Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c. Signed-off-by: Amit Choudhary Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c071fab453f7b181c49d92d06d936bb243ef1932 Author: Michael Krufky Date: Mon Oct 9 05:17:45 2006 -0300 V4L/DVB (4734): Tda826x: fix frontend selection for dvb_attach Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fc13d929cc7af3c0da09ea2b6d23465b933e279d Author: Michael Krufky Date: Mon Oct 9 05:17:09 2006 -0300 V4L/DVB (4733): Tda10086: fix frontend selection for dvb_attach Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 934765b8e2f211aec119dbdd9feea6d3f2ffaf7e Author: Uwe Bugla Date: Fri Oct 6 13:12:48 2006 -0300 V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH Signed-off-by: Uwe Bugla Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 180958febfb8d32da1d4fee13868e03be0cb931a Author: Michael Krufky Date: Sat Oct 7 16:10:53 2006 -0300 V4L/DVB (4731a): Kconfig: restore pvrusb2 menu items Looks like the pvrusb2 menu items were accidentally removed in git commit 1450e6bedc58c731617d99b4670070ed3ccc91b4 This patch restores the menu items so that the pvrusb2 driver can be built. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e0abc8cd54f5ac65465918f32f286218aa33e8c0 Author: Hans Verkuil Date: Sat Oct 7 16:22:10 2006 -0300 V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840. VIDIOC_G_FMT returned the sliced VBI types in the wrong lines for NTSC (three lines too low). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2e7cf3ea5acc7ed57b8883cc6d35ffc06a5c95fa Author: Hartmut Hackmann Date: Fri Oct 6 19:45:23 2006 -0300 V4L/DVB (4727): Support status readout for saa713x based FM radio This patch adds readout for stereo and signal level for saa713x cards which use the saa713x as FM demodulator. These are many cards based on saa7133, tda8290 and tda8275a. FM channel search should work now. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 7844d7561307d6f8b0dd18b91f4dc6cff53848b4 Author: Matthew Wilcox Date: Fri Oct 6 17:12:00 2006 -0300 V4L/DVB (4725): Fix vivi compile on parisc parisc (and several other architectures) don't have a dma_address in their sg list. Use the macro instead. Signed-off-by: Matthew Wilcox Signed-off-by: Mauro Carvalho Chehab commit 76dc82ab57236105285fd8520895c1404b8b952f Author: Steven Toth Date: Sat Sep 30 00:43:58 2006 -0300 V4L/DVB (4692): Add WinTV-HVR3000 DVB-T support The WinTV-HVR3000 is currently defined for analog support only. This patch adds full DVB-T support. (DVB-S support will be added soon) Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bdcff3458f5448fac585a6174ad9342f361b5135 Author: Andrew Victor Date: Tue Sep 26 17:49:30 2006 +0200 [WATCHDOG] Atmel AT91RM9200 rename. The new Atmel AT91SAM9261 and AT91SAM9260 processors use a different internal watchdog peripheral. This watchdog driver is therefore AT91RM9200-specific. This patch renames at91_wdt.c to at91rm9200_wdt.c, and changes the name of the configuration option. Signed-off-by: Andrew Victor Signed-off-by: Wim Van Sebroeck commit 8f6cff98477edbcd8ae4976734ba7edd07bdd244 Author: Dave Kleikamp Date: Fri Oct 13 12:42:36 2006 -0500 JFS: pageno needs to be long diRead and diWrite are representing the page number as an unsigned int. This causes file system corruption on volumes larger than 16TB. Signed-off-by: Dave Kleikamp commit b4bd8c66435a8cdf8c90334fb3b517a23ff2ab95 Author: Linus Torvalds Date: Fri Oct 13 09:25:04 2006 -0700 Linux 2.6.19-rc2 That was slightly more painful than really necessary.. commit b8a3ad5b53918787f4708ad9dfe90d2557cc78dd Author: Linus Torvalds Date: Fri Oct 13 08:42:10 2006 -0700 Include proper header file for PFN_DOWN() The recent commit (99a10a60ba9bedcf5d70ef81414d3e03816afa3f) to fix up mmap_kmem() broke compiles because it used PFN_DOWN() without including . Signed-off-by: Linus Torvalds commit 0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174 Author: David Woodhouse Date: Fri Oct 13 16:04:23 2006 +0100 [PATCH] Fix headers_check for O= builds; disable automatic check on UML. * make header_check work with O= Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit e0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8 Author: Geert Uytterhoeven Date: Thu Oct 12 23:18:53 2006 +0200 [PATCH] m68knommu: sync syscalls with m68k m68knommu: sync syscalls with m68k Signed-Off-By: Geert Uytterhoeven Signed-Off-By: Greg Ungerer Signed-off-by: Linus Torvalds commit 6569345abbcdbd1e13915a3bc5033c98817d0ec6 Author: Stephen Hemminger Date: Thu Oct 12 11:01:30 2006 -0700 [PATCH] thermal throttle: sysfs error checking Get rid of warning in the thermal throttling code about not checking sysfs return values. Signed-off-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit 1b95817dd76084c10cb8dc899f429bcc85454741 Author: Al Viro Date: Thu Oct 12 19:10:04 2006 +0100 [PATCH] uml shouldn't do HEADERS_CHECK The lack of asm-um/Kbuild is deliberate. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f Author: Franck Bui-Huu Date: Thu Oct 12 21:06:33 2006 +0200 [PATCH] Fix up mmap_kmem vma->vm_pgoff is an pfn _offset_ relatif to the begining of the memory start. The previous code was doing at first: vma->vm_pgoff << PAGE_SHIFT which results into a wrong physical address since some platforms have a physical mem start that can be different from 0. After that the previous call __pa() on this wrong physical address, however __pa() is used to convert a _virtual_ address into a physical one. This patch rewrites this convertion. It calculates the pfn of PAGE_OFFSET which is the pfn of the mem start then it adds the vma->vm_pgoff to it. It also uses virt_to_phys() instead of __pa() since the latter shouldn't be used by drivers. Signed-off-by: Franck Bui-Huu Signed-off-by: Linus Torvalds commit 7f14daa19ea36b200d237ad3ac5826ae25360461 Author: Petr Vandrovec Date: Fri Oct 13 04:13:16 2006 +0200 [PATCH] Get core dump code to work... The file based core dump code was broken by pipe changes - a relative llseek returns the absolute file position on success, not the relative one, so dump_seek() always failed when invoked with non-zero current position. Only success/failure can be tested with relative lseek, we have to trust kernel that on success we've got right file offset. With this fix in place I have finally real core files instead of 1KB fragments... Signed-off-by: Petr Vandrovec [ Cleaned it up a bit while here - use SEEK_CUR instead of hardcoding 1 ] Signed-off-by: Linus Torvalds commit 81c06b10bcd4c7e8c88b4b425c55402b1d65fd0e Author: James Bottomley Date: Thu Oct 12 22:25:03 2006 -0500 [VOYAGER] fix up ptregs removal mess Apparently whoever converted voyager never actually checked that the patch would compile ... Remove as much of the pt_regs references as possible and move the remaining ones into line with what's in x86 generic. Signed-off-by: James Bottomley commit 58f07943b0ef1e59cbf9a45cdc727048d224637f Author: James Bottomley Date: Thu Oct 12 22:23:18 2006 -0500 [VOYAGER] fix up attribute packed specifiers in voyager.h The old style (attribute on each structure entry) never really worked. Move it to an attribute per structure Signed-off-by: James Bottomley commit c771746ef6ad64357897a90da42908d5c800a2c5 Author: James Bottomley Date: Thu Oct 12 22:21:16 2006 -0500 [VOYAGER] fix genirq mess The implementation of genirq in x86 completely broke voyager (and presumably visws). Since it's plugged into so much of the x86 infrastructure, you can't expect it to work unconverted. This patch introduces a voyager IRQ handler type and switches voyager to the genirq infrastructure. Signed-off-by: James Bottomley commit 1a4e15a04ec69cb3552f4120079f5472377df5f7 Author: Steve French Date: Thu Oct 12 21:33:51 2006 +0000 [CIFS] Missing flags2 for DFS Partly suggested by Igor Mammedov Signed-off-by: Steve French commit 370298e2e6f513bc4a9e9445eeed060d8c31f1ca Author: Steven Whitehouse Date: Thu Oct 12 15:40:05 2006 -0400 [GFS2] Update git tree name/location The plan is to have two trees. One for bug fixes to be sent on a regular basis (-fixes) and another called -nmw which will contain items queued for the next merge window (hence the name). The -nmw tree will come & go according to need. Signed-off-by: Steven Whitehouse commit 4c5e1b1a8c3f591b21f09001d6748296ddff33b8 Author: Patrick Caulfield Date: Thu Oct 12 10:41:22 2006 +0100 [DLM] fix iovec length in recvmsg The DLM always passes the iovec length as 1, this is wrong when the circular buffer wraps round. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit c312c4fdc88514dd9522b7858eb879e610aeb9b1 Author: Russell Cattelan Date: Thu Oct 12 09:23:41 2006 -0400 [GFS2] Pass the correct value to kunmap_atomic Pass kaddr rather than (incorrect) struct page to kunmap_atomic. Signed-off-by: Russell Cattelan Signed-off-by: Steven Whitehouse commit fe1a698ffef5af546dd4a8cd6a1f2f202491c4ef Author: Steven Whitehouse Date: Wed Oct 11 13:34:59 2006 -0400 [GFS2] Fix bug where lock not held The log lock needs to be held when manipulating the counter for the number of free journal blocks. Signed-off-by: Steven Whitehouse commit 1ee48af22ed6dcddea8cdf93c7f2a268cbcf0d56 Author: Adrian Bunk Date: Sun Oct 8 04:30:48 2006 +0200 [DLM] Kconfig: don't show an empty DLM menu Don't show an empty "Distributed Lock Manager" menu if IP_SCTP=n. Reported by Dmytro Bagrii in kernel Bugzilla #7268. Signed-off-by: Adrian Bunk Signed-off-by: David Teigland Signed-off-by: Patrick Caulfield Signed-off-by: Steven Whitehouse commit f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 Author: Steven Whitehouse Date: Tue Oct 10 13:45:15 2006 -0400 [GFS2] Fix uninitialised variable This fixes a bug where, in certain cases an uninitialised variable could cause a dereference of a NULL pointer in gfs2_commit_write(). Also a typo in a comment is fixed at the same time. Signed-off-by: Steven Whitehouse commit 52ae7b7935a079aaba25da98fe90772d04109f26 Author: Russell Cattelan Date: Mon Oct 9 12:11:54 2006 -0500 [GFS2] Fix a size calculation error Fix a size calculation error. The size was incorrect being computed as a negative length and then being passed to an unsigned parameter. This in turn would cause the allocator to think it needed enough meta data to store a gigabyte file for every file created. Signed-off-by: Russell Cattelan Signed-off-by: Steven Whitehouse commit 733b736c91dd2c556f35dffdcf77e667cf10cefc Author: Arnaud Patard Date: Thu Oct 12 22:33:31 2006 +0200 r8169: fix infinite loop during hotplug Bug reported for PCMCIA. Signed-off-by: Arnaud Patard Signed-off-by: Francois Romieu commit 1baaf0b424fe611a99cf3e2e59e84df0561d679a Author: Al Viro Date: Thu Oct 12 19:07:59 2006 +0100 [PATCH] more kernel_execve() fallout (sbus) drivers/sbus/char stuff using kernel_execve() needs linux/syscalls.h now; includes trimmed, while we are at it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2db02c0fe8519bd5985c6280896f4d719a6ae801 Author: Jean Delvare Date: Thu Sep 28 09:35:27 2006 +0200 [WATCHDOG] includes for sample watchdog program. Add missing includes to sample watchdog program. Signed-off-by: Jean Delvare Signed-off-by: Wim Van Sebroeck commit 734c4c67393893f61b39bcdfe1e94f72111c56d6 Author: Ravikiran Thirumalai Date: Thu Oct 12 12:17:52 2006 -0700 [PATCH] Fix build breakage with CONFIG_X86_VSMP Kernel build breaks with CONFIG_X86_VSMP. Probably due to some header file cleanups in 2.6.19-rc1. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Linus Torvalds commit 78b93f2db11df75ada5d04962ba631940b0a1398 Author: Al Viro Date: Thu Oct 12 19:00:35 2006 +0100 [PATCH] fixing includes in alpha_ksyms.c kernel_execve() fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d103e164bee2f21d0efe7d713cbbb0a443ba480d Author: Steve French Date: Thu Oct 12 17:49:24 2006 +0000 [CIFS] Workaround incomplete byte length returned by some servers on small SMB responses Signed-off-by: Steve French commit 8770c018da7bbaa3b41371abc401b2aa7e76a71a Author: Jens Axboe Date: Thu Oct 12 17:24:52 2006 +0200 [PATCH] ide-cd: one more missing REQ_TYPE_CMD_ATA check Signed-off-by: Jens Axboe commit 230a03950ecd63bc613c6adeffbe9049189d9f05 Author: Andrew Morton Date: Thu Oct 12 15:07:55 2006 +0000 [CIFS] cifs Kconfig: don't select CONNECTOR `select' is a bit obnoxious: the option keeps on coming back and it's hard to work out what to do to make it go away again. The use of `depends on' is preferred (although it has usability problems too..) Signed-off-by: Andrew Morton Signed-off-by: Steve French commit 994bd4f9f5a065ead4a92435fdd928ac7fd33809 Author: Eric W. Biederman Date: Wed Oct 11 22:44:46 2006 -0600 [PATCH] x86_64 irq: Properly update vector_irq This patch fixes my one line thinko where I was clearing the vector_irq entries on the wrong cpus. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d58cdfb89ce0c6bd5f81ae931a984ef298dbda20 Author: Vasily Tarasov Date: Thu Oct 12 15:09:51 2006 +0200 [PATCH] block layer: ioprio_best function fix Currently ioprio_best function first checks wethere aioprio or bioprio equals IOPRIO_CLASS_NONE (ioprio_valid() macros does that) and if it is so it returns bioprio/aioprio appropriately. Thus the next four lines, that set aclass/bclass to IOPRIO_CLASS_BE, if aclass/bclass == IOPRIO_CLASS_NONE, are never executed. The second problem: if aioprio from class IOPRIO_CLASS_NONE and bioprio from class IOPRIO_CLASS_IDLE are passed to ioprio_best function, it will return IOPRIO_CLASS_IDLE. It means that during __make_request we can merge two requests and set the priority of merged request to IDLE, while one of the initial requests originates from a process with NONE (default) priority. So we can get a situation when a process with default ioprio will experience IO starvation, while there is no process from real-time class in the system. Just removing ioprio_valid check should correct situation. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit cea2885a2e989d1dc19af1fc991717b33b7d1456 Author: Jens Axboe Date: Thu Oct 12 15:08:45 2006 +0200 [PATCH] ide-cd: fix breakage with internally queued commands We still need to maintain a private PC style command, since it isn't completely unified with REQ_TYPE_BLOCK_PC yet. Signed-off-by: Jens Axboe commit c5841642242e9ae817275e09b36b298456dc17d2 Author: Vasily Tarasov Date: Wed Oct 11 13:26:30 2006 +0200 [PATCH] block layer: elv_iosched_show should get elv_list_lock elv_iosched_show function iterates other elv_list, hence elv_list_lock should be got. Signed-off-by: Vasily Tarasov Signed-off-by: Vasily Tarasov commit e6e80f294c2688302f41959c57acfee7e131e489 Author: Jens Axboe Date: Wed Oct 11 10:03:09 2006 +0200 [PATCH] splice: fix pipe_to_file() ->prepare_write() error path Don't jump to the unlock+release path, we already did that. Signed-off-by: Jens Axboe commit a22b169df1b9f259391cf3b8ad8bfeea3d7be3f1 Author: Vasily Tarasov Date: Wed Oct 11 09:24:27 2006 +0200 [PATCH] block layer: elevator_find function cleanup We can easily produce search through the elevator list without introducing additional elevator_type variable. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit 2b1191af683d16a899c2b81b87b605841ceffdec Author: Jens Axboe Date: Mon Oct 9 13:04:35 2006 +0200 [PATCH] elevator: elevator_type member not used elevator_type field in elevator_type structure is useless: it isn't used anywhere in kernel sources. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit 30bdbe397bf58131a91fd836f60972442bed0544 Author: Akinbou Mita Date: Thu Oct 12 01:52:05 2006 -0700 [PKT_SCHED] sch_htb: use rb_first() cleanup Use rb_first() to get first entry in rb tree. Signed-off-by: Akinbou Mita Signed-off-by: David S. Miller commit b974179abef7cd680b80bd7c7042802bdd6f0eb6 Author: Patrick McHardy Date: Thu Oct 12 01:50:30 2006 -0700 [RTNETLINK]: Fix use of wrong skb in do_getlink() skb is the netlink query, nskb is the reply message. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 52c41a3224666d252d34597b580f1b6d4dc440e7 Author: Patrick McHardy Date: Thu Oct 12 01:48:20 2006 -0700 [DECNET]: Fix sfuzz hanging on 2.6.18 Dave Jones wrote: > sfuzz D 724EF62A 2828 28717 28691 (NOTLB) > cd69fe98 00000082 0000012d 724ef62a 0001971a 00000010 00000007 df6d22b0 > dfd81080 725bbc5e 0001971a 000cc634 00000001 df6d23bc c140e260 00000202 > de1d5ba0 cd69fea0 de1d5ba0 00000000 00000000 de1d5b60 de1d5b8c de1d5ba0 > Call Trace: > [] lock_sock+0x75/0xa6 > [] dn_getname+0x18/0x5f [decnet] > [] sys_getsockname+0x5c/0xb0 > [] sys_socketcall+0xef/0x261 > [] syscall_call+0x7/0xb > DWARF2 unwinder stuck at syscall_call+0x7/0xb > > I wonder if the plethora of lockdep related changes inadvertantly broke something? Looks like unbalanced locking. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8238b218ec883adb44d710960a031c76105274cd Author: David S. Miller Date: Thu Oct 12 00:49:15 2006 -0700 [NET]: Do not memcmp() over pad bytes of struct flowi. They are not necessarily initialized to zero by the compiler, for example when using run-time initializers of automatic on-stack variables. Noticed by Eric Dumazet and Patrick McHardy. Signed-off-by: David S. Miller commit 42b6785eeb40fe3e9dab9981b6e3231a77c7c2f6 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:42:09 2006 -0700 [NET]: Introduce protocol-specific destructor for time-wait sockets. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 9469c7b4aa210ce94c6e7208cfadbd0aca0ebe08 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:41:46 2006 -0700 [NET]: Use typesafe inet_twsk() inline function instead of cast. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 496c98dff8e353880299168d36fa082d6fba5237 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:41:21 2006 -0700 [NET]: Use hton{l,s}() for non-initializers. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 4244f8a9f86a6d6e820b4cb53835c15c56d41aff Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:40:50 2006 -0700 [TCP]: Use TCPOLEN_TSTAMP_ALIGNED macro instead of magic number. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0be669bb37693103c15e64610454f8f431a38feb Author: Joerg Roedel Date: Tue Oct 10 14:49:53 2006 -0700 [IPV6]: Seperate sit driver to extra module (addrconf.c changes) This patch contains the changes to net/ipv6/addrconf.c to remove sit specific code if the sit driver is not selected. Signed-off-by: Joerg Roedel Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 989e5b96e1af399296e2d1a34ca4a5aea1cf6d63 Author: Joerg Roedel Date: Tue Oct 10 14:47:44 2006 -0700 [IPV6]: Seperate sit driver to extra module This patch removes the driver of the IPv6-in-IPv4 tunnel driver (sit) from the IPv6 module. It adds an option to Kconfig which makes it possible to compile it as a seperate module. Signed-off-by: Joerg Roedel Signed-off-by: David S. Miller commit effee6a00034a8d83a6dea6d221820d87364ac21 Author: Miklos Szeredi Date: Mon Oct 9 21:42:14 2006 -0700 [NET]: File descriptor loss while receiving SCM_RIGHTS If more than one file descriptor was sent with an SCM_RIGHTS message, and on the receiving end, after installing a nonzero (but not all) file descritpors the process runs out of fds, then the already installed fds will be lost (userspace will have no way of knowing about them). The following patch makes sure, that at least the already installed fds are sent to userspace. It doesn't solve the issue of losing file descriptors in case of an EFAULT on the userspace buffer. Signed-off-by: Miklos Szeredi Signed-off-by: David S. Miller commit 6aa2551cf135f1d246d31482adc8c679eeea3a83 Author: Vlad Yasevich Date: Mon Oct 9 21:34:26 2006 -0700 [SCTP]: Fix the RX queue size shown in /proc/net/sctp/assocs output. Show the true receive buffer usage. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 331c4ee7faa4ee1e1404c872a139784753100498 Author: Vlad Yasevich Date: Mon Oct 9 21:34:04 2006 -0700 [SCTP]: Fix receive buffer accounting. When doing receiver buffer accounting, we always used skb->truesize. This is problematic when processing bundled DATA chunks because for every DATA chunk that could be small part of one large skb, we would charge the size of the entire skb. The new approach is to store the size of the DATA chunk we are accounting for in the sctp_ulpevent structure and use that stored value for accounting. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 6e8c751e07b34d73069e9333f67fbe5ffe31ec3a Author: Chad Sellers Date: Fri Oct 6 16:09:52 2006 -0400 SELinux: Bug fix in polidydb_destroy This patch fixes two bugs in policydb_destroy. Two list pointers (policydb.ocontexts[i] and policydb.genfs) were not being reset to NULL when the lists they pointed to were being freed. This caused a problem when the initial policy load failed, as the policydb being destroyed was not a temporary new policydb that was thrown away, but rather was the global (active) policydb. Consequently, later functions, particularly sys_bind->selinux_socket_bind->security_node_sid and do_rw_proc->selinux_sysctl->selinux_proc_get_sid->security_genfs_sid tried to dereference memory that had previously been freed. Signed-off-by: Chad Sellers Signed-off-by: James Morris commit 3bccfbc7a7ba4085817deae6e7c67daf0cbd045a Author: Venkat Yekkirala Date: Thu Oct 5 15:42:35 2006 -0500 IPsec: fix handling of errors for socket policies This treats the security errors encountered in the case of socket policy matching, the same as how these are treated in the case of main/sub policies, which is to return a full lookup failure. Signed-off-by: Venkat Yekkirala Signed-off-by: James Morris commit 5b368e61c2bcb2666bb66e2acf1d6d85ba6f474d Author: Venkat Yekkirala Date: Thu Oct 5 15:42:18 2006 -0500 IPsec: correct semantics for SELinux policy matching Currently when an IPSec policy rule doesn't specify a security context, it is assumed to be "unlabeled" by SELinux, and so the IPSec policy rule fails to match to a flow that it would otherwise match to, unless one has explicitly added an SELinux policy rule allowing the flow to "polmatch" to the "unlabeled" IPSec policy rules. In the absence of such an explicitly added SELinux policy rule, the IPSec policy rule fails to match and so the packet(s) flow in clear text without the otherwise applicable xfrm(s) applied. The above SELinux behavior violates the SELinux security notion of "deny by default" which should actually translate to "encrypt by default" in the above case. This was first reported by Evgeniy Polyakov and the way James Morris was seeing the problem was when connecting via IPsec to a confined service on an SELinux box (vsftpd), which did not have the appropriate SELinux policy permissions to send packets via IPsec. With this patch applied, SELinux "polmatching" of flows Vs. IPSec policy rules will only come into play when there's a explicit context specified for the IPSec policy rule (which also means there's corresponding SELinux policy allowing appropriate domains/flows to polmatch to this context). Secondly, when a security module is loaded (in this case, SELinux), the security_xfrm_policy_lookup() hook can return errors other than access denied, such as -EINVAL. We were not handling that correctly, and in fact inverting the return logic and propagating a false "ok" back up to xfrm_lookup(), which then allowed packets to pass as if they were not associated with an xfrm policy. The solution for this is to first ensure that errno values are correctly propagated all the way back up through the various call chains from security_xfrm_policy_lookup(), and handled correctly. Then, flow_cache_lookup() is modified, so that if the policy resolver fails (typically a permission denied via the security module), the flow cache entry is killed rather than having a null policy assigned (which indicates that the packet can pass freely). This also forces any future lookups for the same flow to consult the security module (e.g. SELinux) for current security policy (rather than, say, caching the error on the flow cache entry). This patch: Fix the selinux side of things. This makes sure SELinux polmatching of flow contexts to IPSec policy rules comes into play only when an explicit context is associated with the IPSec policy rule. Also, this no longer defaults the context of a socket policy to the context of the socket since the "no explicit context" case is now handled properly. Signed-off-by: Venkat Yekkirala Signed-off-by: James Morris commit 134b0fc544ba062498451611cb6f3e4454221b3d Author: James Morris Date: Thu Oct 5 15:42:27 2006 -0500 IPsec: propagate security module errors up from flow_cache_lookup When a security module is loaded (in this case, SELinux), the security_xfrm_policy_lookup() hook can return an access denied permission (or other error). We were not handling that correctly, and in fact inverting the return logic and propagating a false "ok" back up to xfrm_lookup(), which then allowed packets to pass as if they were not associated with an xfrm policy. The way I was seeing the problem was when connecting via IPsec to a confined service on an SELinux box (vsftpd), which did not have the appropriate SELinux policy permissions to send packets via IPsec. The first SYNACK would be blocked, because of an uncached lookup via flow_cache_lookup(), which would fail to resolve an xfrm policy because the SELinux policy is checked at that point via the resolver. However, retransmitted SYNACKs would then find a cached flow entry when calling into flow_cache_lookup() with a null xfrm policy, which is interpreted by xfrm_lookup() as the packet not having any associated policy and similarly to the first case, allowing it to pass without transformation. The solution presented here is to first ensure that errno values are correctly propagated all the way back up through the various call chains from security_xfrm_policy_lookup(), and handled correctly. Then, flow_cache_lookup() is modified, so that if the policy resolver fails (typically a permission denied via the security module), the flow cache entry is killed rather than having a null policy assigned (which indicates that the packet can pass freely). This also forces any future lookups for the same flow to consult the security module (e.g. SELinux) for current security policy (rather than, say, caching the error on the flow cache entry). Signed-off-by: James Morris commit 388b24057f90ba109d4bf855006a8809c383eb76 Author: paul.moore@hp.com Date: Thu Oct 5 18:28:24 2006 -0400 NetLabel: use SECINITSID_UNLABELED for a base SID This patch changes NetLabel to use SECINITSID_UNLABLELED as it's source of SELinux type information when generating a NetLabel context. Signed-off-by: Paul Moore Signed-off-by: James Morris commit ffb733c65000ee701294f7b80c4eca2a5f335637 Author: paul.moore@hp.com Date: Wed Oct 4 11:46:31 2006 -0400 NetLabel: fix a cache race condition Testing revealed a problem with the NetLabel cache where a cached entry could be freed while in use by the LSM layer causing an oops and other problems. This patch fixes that problem by introducing a reference counter to the cache entry so that it is only freed when it is no longer in use. Signed-off-by: Paul Moore Signed-off-by: James Morris commit ab5da288ce6a526a0a730362b8c4e03c3a0b58d5 Author: Martin Habets Date: Wed Oct 11 14:58:30 2006 -0700 [SPARC32]: Fix sparc32 modpost warnings. Fix these 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'core_kernel_text' (at offset 0x3e060) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'core_kernel_text' (at offset 0x3e064) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'core_kernel_text' (at offset 0x3e07c) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'core_kernel_text' (at offset 0x3e080) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'is_ksym_addr' (at offset 0x4b3a4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'is_ksym_addr' (at offset 0x4b3a8) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'is_ksym_addr' (at offset 0x4b3b4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'is_ksym_addr' (at offset 0x4b3e4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b640) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b644) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'get_symbol_pos' (at offset 0x4b654) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'get_symbol_pos' (at offset 0x4b658) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b68c) and 'kallsyms_lookup_size_offset' The crux of the matter is that modpost only checks the relocatable sections. i386 vmlinux has none, so modpost does no checking on it (it does on the modules). However, sparc vmlinux has plenty of relocatable sections because it is being built with 'ld -r' (to allow for btfixup processing). So for sparc, modpost does do a lot of checking. Sure enough, running modpost on arch/sparc/boot/image yields no output (i.e. all is well). modpost.c check_sec_ref() has: /* We want to process only relocation sections and not .init */ if (sechdrs[i].sh_type == SHT_RELA) { // check here } else if (sechdrs[i].sh_type == SHT_REL) { // check here } Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit eba8cefc789f6e51a79363604a7db1dba6a678cb Author: Martin Habets Date: Tue Oct 10 14:44:01 2006 -0700 [SPARC32]: Fix sparc32 modpost warnings with sunzilog Fix this 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:sunzilog_console_setup from .data between 'sunzilog_console' (at offset 0x8394) and 'devices_subsys' Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit e3096de34c35683bc233f76d4e86562f1d782d0d Author: Martin Habets Date: Tue Oct 10 14:36:47 2006 -0700 [SPARC32]: Mark srmmu_nocache_init as __init. Fix these 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:__alloc_bootmem from .text between 'srmmu_nocache_init' (at offset 0x1a0f8) and 'srmmu_mmu_info' WARNING: vmlinux - Section mismatch: reference to .init.text:__alloc_bootmem from .text between 'srmmu_nocache_init' (at offset 0x1a118) and 'srmmu_mmu_info' WARNING: vmlinux - Section mismatch: reference to .init.text:srmmu_early_allocate_ptable_skeleton from .text between 'srmmu_nocache_init' (at offset 0x1a188) and 'srmmu_mmu_info' Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit c2baeb0526277676d4cee022f663af880c22fe84 Author: David S. Miller Date: Tue Oct 10 14:17:05 2006 -0700 [SPARC32]: pcic.c needs asm/irq_regs.h Signed-off-by: David S. Miller commit b435fdcda126db42343b8055d04a0a27c229717b Author: Jeff Garzik Date: Thu Oct 12 01:06:53 2006 -0400 Input: fm801-gp - handle errors from pci_enable_device() Signed-off-by: Jeff Garzik Signed-off-by: Dmitry Torokhov commit 23de1510e2468ea349354889097e018d4e8770c5 Author: Dmitry Torokhov Date: Thu Oct 12 01:06:34 2006 -0400 Input: gameport core - handle errors returned by device_bind_driver() Signed-off-by: Dmitry Torokhov commit 0a66045bcfd3a7ba5d1253f9f305b78bf636ac57 Author: Dmitry Torokhov Date: Thu Oct 12 01:06:23 2006 -0400 Input: serio core - handle errors returned by device_bind_driver() Signed-off-by: Dmitry Torokhov commit 07646e217f473a3e6213f8228336a9046833d6aa Author: Andrew Morton Date: Wed Oct 11 23:45:23 2006 -0400 Lockdep: fix compile error in drivers/input/serio/serio.c lockdep_set_subclass() was missing in !LOCKDEP case Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit acf1a1b1043327b2179ea529730358e58c7c277e Author: Steve French Date: Thu Oct 12 03:28:28 2006 +0000 [CIFS] Level 1 QPathInfo needed for proper OS2 support Signed-off-by: Steve French commit 8ae91b9ad88a130cd50fc0b78b16e7b9510b8067 Author: Ryusuke Sakato Date: Thu Oct 12 12:16:13 2006 +0900 sh: SH-4A UBC support A simple patch to enable the UBC on SH-4A. Signed-off-by: Ryusuke Sakato Signed-off-by: Paul Mundt commit baf4326e49801526e4516e4de7f37b5e51468c49 Author: Paul Mundt Date: Thu Oct 12 12:03:04 2006 +0900 sh: interrupt exception handling rework Kill off interrupt_table for all of the CPU subtypes, we now default in to stepping in to do_IRQ() for _all_ IRQ exceptions and counting the spurious ones, rather than simply flipping on the ones we cared about. This and enabling the IRQ by default automatically has already uncovered a couple of bugs and IRQs that weren't being caught, as well as some that are being generated far too often (SCI Tx Data Empty, for example). The general rationale is to use a marker for interrupt exceptions, test for it in the handle_exception() path, and skip out to do_IRQ() if it's found. Everything else follows the same behaviour of finding the cached EXPEVT value in r2/r2_bank, we just rip out the INTEVT read from entry.S entirely (except for in the kGDB NMI case, which is another matter). Note that while this changes the do_IRQ() semantics regarding r4 handling, they were fundamentally broken anyways (relying entirely on r2_bank for the cached code). With this, we do the INTEVT read from do_IRQ() itself (in the CONFIG_CPU_HAS_INTEVT case), or fall back on r4 for the muxed IRQ number, which should also be closer to what SH-2 and SH-2A want anyways. Signed-off-by: Paul Mundt commit 8884c4cb8b621963b5eb4a9ae45070bd0cb7085f Author: Paul Mundt Date: Thu Oct 12 11:56:31 2006 +0900 sh: Default enable R7780RP IRQs. Now that we've started accounting for spurious IRQs, change the logic somewhat so that we have a better chance of catching them. Signed-off-by: Paul Mundt commit ddae957da48cc381c1472a8909905e1818e4afdd Author: Steve French Date: Thu Oct 12 01:23:29 2006 +0000 [CIFS] fix typo in previous patch Signed-off-by: Steve French commit 533f90af6d90b9e4859a158565385d1d84a79f75 Author: Steve French Date: Thu Oct 12 00:02:32 2006 +0000 [CIFS] Fix old DOS time conversion to handle timezone Signed-off-by: Steve French commit 80060362aaefec507ac2d7a7bd156716d7a7ca91 Author: Jeff Garzik Date: Tue Oct 10 03:40:44 2006 -0400 [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning gcc emits the following warning: drivers/char/watchdog/iTCO_wdt.c: In function ‘iTCO_wdt_ioctl’: drivers/char/watchdog/iTCO_wdt.c:429: warning: ‘time_left’ may be used uninitialized in this function This indicates a condition near enough to a bug, to want to fix. iTCO_wdt_get_timeleft() stores a value in 'time_left' iff iTCO_version==(1 or 2). This driver only supports versions 1 or 2, so this is ok. However, since (a) the return value of iTCO_wdt_get_timeleft() is handled anyway, (b) it fixes the warning, and (c) it future-proofs the driver, we go ahead and add the obvious return value. Signed-off-by: Jeff Garzik Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 70903ca004fef17b0f6483714baefdb2f6ecceb0 Author: Steve French Date: Wed Oct 11 18:49:24 2006 +0000 [CIFS] Do not need to adjust for Jan/Feb for leap day calculation in 2100 (year divisible by 100) Signed-off-by: Yehuda Sadeh Weinraub Signed-off-by: Steve French commit 9a244b95ddb62a17b62f4b061b6e13ca4d177942 Author: Ralf Baechle Date: Wed Oct 11 19:30:03 2006 +0100 [MIPS] Pass NULL not 0 for pointer value. Signed-off-by: Ralf Baechle commit c11b3c1bc0250027ff05665898f8d8eec40b7e49 Author: Ralf Baechle Date: Wed Oct 11 18:35:33 2006 +0100 [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype. Signed-off-by: Ralf Baechle commit 67672f5b1f90ff19b970727b3fe2fa2b3cee3bef Author: Ralf Baechle Date: Wed Oct 11 01:42:30 2006 +0100 [MIPS] BigSur: More useful defconfig. Signed-off-by: Ralf Baechle commit 04d4d7d5e36957b2d941310fc8243aa7bf036f3b Author: Ralf Baechle Date: Wed Oct 11 01:22:12 2006 +0100 [MIPS] Cleanup definitions of speed_t and tcflag_t. Signed-off-by: Ralf Baechle commit 472f291df59fc1c5eb3ade74a50bfa222030e736 Author: Mark Mason Date: Tue Oct 10 17:03:10 2006 -0700 [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c Signed-off-by: Mark Mason Signed-off-by: Ralf Baechle commit 9b95e629eab59ee140fe2b17bbd7fea6821c6085 Author: Atsushi Nemoto Date: Tue Oct 10 22:46:52 2006 +0900 [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp If CONFIG_BUILD_ELF64 was not selected and gcc had -msym32 option (i.e. 4.0 or newer), there is no point to use %highest, %higher for kernel symbols. This patch also fixes 64-bit SMTC version of get_saved_sp() which is broken but harmless since there is no such CPUs for now. A bonus is set_saved_sp() and SMP version of get_saved_sp() are more readable now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit dff9262ed1491a1e531dc56e687605b5e4cd488d Author: Atsushi Nemoto Date: Wed Oct 11 01:07:01 2006 +0900 [MIPS] does not need pt_regs anymore. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f94054121efcba573f12101a75a4be93e871b309 Author: Ralf Baechle Date: Tue Oct 10 15:44:10 2006 +0100 [MIPS] Workaround for bug in gcc -EB / -EL options. Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of 2006-10-10 don't properly change the the predefined symbols if -EB / -EL are used, so we kludge that here. A bug has been filed at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. Signed-off-by: Ralf Baechle commit ea5742830ada301de22a68e604b48fb6107c270f Author: Yoichi Yuasa Date: Tue Oct 10 16:56:11 2006 +0900 [MIPS] Fix timer setup for Jazz Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f061c5847bcc72eebf6a783f458d42092eac1b6a Author: Al Viro Date: Wed Oct 11 17:45:47 2006 +0100 [PATCH] i2Output always takes kernel data now Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cff52daffa080eff6353f44df418b080dacefb96 Author: Al Viro Date: Wed Oct 11 17:40:22 2006 +0100 [PATCH] alpha_ksyms.c cleanup taken exports to actual definitions of symbols being exported. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9ab6a45394715918b025f2d3b799477295af4cc0 Author: Al Viro Date: Wed Oct 11 17:40:22 2006 +0100 [PATCH] remove bogus arch-specific syscall exports Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f39d88adc5daf544cf9ae666a097b595b212871e Author: Al Viro Date: Wed Oct 11 17:28:47 2006 +0100 [PATCH] z2_init() in non-modular case ... another victim - this time of 2.5.1-pre2 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2db5f59ca74d911f93c39494db1581c3c93d5a29 Author: Al Viro Date: Wed Oct 11 17:28:37 2006 +0100 [PATCH] amiga_floppy_init() in non-modular case It used to be called directly, but that got lost in 2.1.87-pre1. Similar breakage in ataflop got fixed 3 years ago, this one had gone unnoticed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2e811488cedddefb9d1df97c260b6048ea8ef835 Author: Al Viro Date: Wed Oct 11 17:28:27 2006 +0100 [PATCH] clean m68k ksyms sun3_ksyms gone, m68k_ksyms trimmed down to exports of the assembler ones, for sun3 added the missing exports of __ioremap() and iounmap(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 437111ca381263520d23c877e55e0a83558e79da Author: Al Viro Date: Wed Oct 11 17:28:17 2006 +0100 [PATCH] sun3 __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e5c374d3833f816b4840227c6949f689af0cb44 Author: Al Viro Date: Wed Oct 11 17:28:07 2006 +0100 [PATCH] misc m68k __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b971018bae94bb43ae2402f884684ad69e85f931 Author: Al Viro Date: Wed Oct 11 17:27:57 2006 +0100 [PATCH] m68k uaccess __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4b4fcaa1a9eec90b44b66a67af6e130349ba008e Author: Al Viro Date: Wed Oct 11 17:25:45 2006 +0100 [PATCH] misuse of strstr Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fd2c903b89a6c3cec9388eb24a134ebc1be20747 Author: Al Viro Date: Wed Oct 11 17:24:55 2006 +0100 [PATCH] m32r: more __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 12ea59e8109d7192ecb2ac994588e24b11ab0428 Author: Al Viro Date: Wed Oct 11 17:24:35 2006 +0100 [PATCH] m32r: NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 870e75a2930a1db02c7a5c09a13edcb4e3b07838 Author: Al Viro Date: Wed Oct 11 17:24:45 2006 +0100 [PATCH] m32r: signal __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7857a7f59d5d0b4e8c15606a79c0bcdbdef18ab6 Author: Al Viro Date: Wed Oct 11 17:24:25 2006 +0100 [PATCH] m32r: C99 initializers in setup.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 399ad77b9098ed2eb27cbfbeb6449c1caab3c18e Author: Al Viro Date: Wed Oct 11 17:22:34 2006 +0100 [PATCH] arm-versatile iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0 Author: Al Viro Date: Wed Oct 11 17:22:54 2006 +0100 [PATCH] arm: use unsigned long instead of unsigned int in get_user() Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 35d59fc5d6f318a28a99c5936171afd4edef28c8 Author: Al Viro Date: Wed Oct 11 17:22:44 2006 +0100 [PATCH] arm __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5f6e3c836508926e50cebe17ad87f59666a7fb47 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:26 2006 -0700 [PATCH] md: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76fd020937f2d09f76a4cd8dbae1f3bec640ff0b Author: Jeff Garzik Date: Wed Oct 11 01:22:25 2006 -0700 [PATCH] ISDN: several minor fixes pcbit: kill 'may be used uninitialized' warning. although the code does eventually fill the 32 bits it cares about, the variable truly is accessed uninitialized in each macro. Easier to just clean it up now. sc: fix a ton of obviously incorrect printk's (some with missing arguments even) Signed-off-by: Jeff Garzik Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf02c082bf7a464518d45b9c178b8aa83f74dd5d Author: Andreas Mohr Date: Wed Oct 11 01:22:24 2006 -0700 [PATCH] fs/bio.c: tweaks - Calculate a variable in bvec_alloc_bs() only once needed, not earlier (bio.o down from 18408 to 18376 Bytes, 32 Bytes saved, probably due to data locality improvements). - Init variable idx to silence a gcc warning which already existed in the unmodified original base file (bvec_alloc_bs() handles idx correctly, so there's no need for the warning): fs/bio.c: In function `bio_alloc_bioset': fs/bio.c:169: warning: `idx' may be used uninitialized in this function Signed-off-by: Andreas Mohr Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49a6cbe1cd8a72451d9d6ab5b1e163f17c1bbee3 Author: Jeff Garzik Date: Wed Oct 11 01:22:23 2006 -0700 [PATCH] drivers/mca: handle sysfs errors Also includes a kmalloc->kzalloc cleanup. Signed-off-by: Jeff Garzik Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69b2186c5fcb335e29c558e3b4e410e1939b5cc8 Author: Jeff Garzik Date: Wed Oct 11 01:22:23 2006 -0700 [PATCH] firmware/efivars: handle error Signed-off-by: Jeff Garzik Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ddfd6859b9d57490c94d26e29a43ffd78366e5 Author: Jeff Garzik Date: Wed Oct 11 01:22:22 2006 -0700 [PATCH] EISA: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e59393ec242d7b772356c95e2be48384cd0c5d7 Author: Jeff Garzik Date: Wed Oct 11 01:22:21 2006 -0700 [PATCH] ipmi: handle sysfs errors Signed-off-by: Jeff Garzik Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41bfcfd9ac0fbb59aaaa18e3ed5774e85b716de4 Author: Jeff Garzik Date: Wed Oct 11 01:22:20 2006 -0700 [PATCH] firmware/dell_rbu: handle sysfs errors Signed-off-by: Jeff Garzik Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c636ebdb186bf37f98d3839f69293597723edb36 Author: David Howells Date: Wed Oct 11 01:22:19 2006 -0700 [PATCH] VFS: Destroy the dentries contributed by a superblock on unmounting The attached patch destroys all the dentries attached to a superblock in one go by: (1) Destroying the tree rooted at s_root. (2) Destroying every entry in the anon list, one at a time. (3) Each entry in the anon list has its subtree consumed from the leaves inwards. This reduces the amount of work generic_shutdown_super() does, and avoids iterating through the dentry_unused list. Note that locking is almost entirely absent in the shrink_dcache_for_umount*() functions added by this patch. This is because: (1) at the point the filesystem calls generic_shutdown_super(), it is not permitted to further touch the superblock's set of dentries, and nor may it remove aliases from inodes; (2) the dcache memory shrinker now skips dentries that are being unmounted; and (3) the superblock no longer has any external references through which the VFS can reach it. Given these points, the only locking we need to do is when we remove dentries from the unused list and the name hashes, which we do a directory's worth at a time. We also don't need to guard against reference counts going to zero unexpectedly and removing bits of the tree we're working on as nothing else can call dput(). A cut down version of dentry_iput() has been folded into shrink_dcache_for_umount_subtree() function. Apart from not needing to unlock things, it also doesn't need to check for inotify watches. In this version of the patch, the complaint about a dentry still being in use has been expanded from a single BUG_ON() and now gives much more information. Signed-off-by: David Howells Acked-by: NeilBrown Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ce315234aefcbc599dea390c15672156ebf9e7b Author: David Howells Date: Wed Oct 11 01:22:15 2006 -0700 [PATCH] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super() Make sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super(). This makes the struct autofs_sb_info::root member variable redundant (since sb->s_root is still available), and so that is removed. The calls to shrink_dcache_sb() are also removed since they're also redundant as shrink_dcache_for_umount() will now be called after the cleanup routine. Signed-off-by: David Howells Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edc666e2ff9ec2e4e9510f1127c68c22cffc93f6 Author: David Howells Date: Wed Oct 11 01:22:14 2006 -0700 [PATCH] ReiserFS: Make sure all dentries refs are released before calling kill_block_super() Make sure all dentries refs are released before calling kill_block_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_block_super(). Changes made in [try #2]: (*) reiserfs_kill_sb() now checks that the superblock FS info pointer is set before trying to dereference it. Signed-off-by: David Howells Cc: "Rafael J. Wysocki" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e42ef777f62277ea9bb70976be65bb374e00b9c Author: Andrew Morton Date: Wed Oct 11 01:22:13 2006 -0700 [PATCH] dell_rbu: printk() warning fix drivers/firmware/dell_rbu.c: In function 'packetize_data': drivers/firmware/dell_rbu.c:252: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int' Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272057447f646c51bc77c60044eb21c683fa366d Author: Randy Dunlap Date: Wed Oct 11 01:22:12 2006 -0700 [PATCH] kernel-doc: make parameter description indentation uniform - In parameter descriptions, strip all whitespace between the parameter name (e.g., @len) and its description so that the description is indented uniformly in text and man page modes. Previously, spaces or tabs (which are used for cleaner source code viewing) affected the produced output in a negative way. Before (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. After (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. - Fix/clarify a few function description comments. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c751c1dbb1289d220a8a175ba0df47706ce95a7e Author: Mike Frysinger Date: Wed Oct 11 01:22:11 2006 -0700 [PATCH] include linux/types.h in linux/nbd.h The nbd header uses __be32 and such types but doesn't actually include the header that defines these things (linux/types.h); so let's include it. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e794015aa698fd6bf1ec21b713f900a707fb15 Author: Randy Dunlap Date: Wed Oct 11 01:22:10 2006 -0700 [PATCH] kernel-doc: drop various "inline" qualifiers Drop __inline, __always_inline, and noinline in the produced kernel-doc output, similar to other pseudo directives. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7fff6ef36526fb54694ee8201870f98b6a1747 Author: Randy Dunlap Date: Wed Oct 11 01:22:10 2006 -0700 [PATCH] uaccess.h: match kernel-doc and function names Place kernel-doc function comment header immediately before the function that is being documented. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35e38a6e03bedba7c633ae03d286accd85ab6a42 Author: Randy Dunlap Date: Wed Oct 11 01:22:09 2006 -0700 [PATCH] kernel-doc: fix function name in usercopy.c Fix kernel-doc function name in usercopy.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 256a6b41365e17cebe5c2fc91ddff716c9aa055a Author: Ingo Molnar Date: Wed Oct 11 01:22:08 2006 -0700 [PATCH] lockdep: fix printk recursion logic Bug reported and fixed by Tilman Schmidt : if lockdep is enabled then log messages make it to /var/log/messages belatedly. The reason is a missed wakeup of klogd. Initially there was only a lockdep_internal() protection against lockdep recursion within vprintk() - it grew the 'outer' lockdep_off()/on() protection only later on. But that lockdep_off() made the release_console_sem() within vprintk() always happen under the lockdep_internal() condition, causing the bug. The right solution to remove the inner protection against recursion here - the outer one is enough. Signed-off-by: Ingo Molnar Cc: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1 Author: Aneesh Kumar Date: Wed Oct 11 01:22:07 2006 -0700 [PATCH] fix lockdep-design.txt I was looking at lockdep-desing.txt and i guess i am confused with the changes with respect to fd7bcea35e7efb108c34ee2b3840942a3749cadb. It says + '.' acquired while irqs enabled + '+' acquired in irq context + '-' acquired in process context with irqs disabled + '?' read-acquired both with irqs enabled and in irq context + But the get_usage_chars() function does this for '-' if (class->usage_mask & LOCKF_ENABLED_HARDIRQS) *c1 = '-'; So i guess what would be correct would be '.' acquired while irqs disabled '+' acquired in irq context '-' acquired with irqs enabled '?' read acquired in irq context with irqs enabled. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc3099a9b2c346b16383597fadaa79a05a52388 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:06 2006 -0700 [PATCH] lockdep: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39913b31d0cd11b5b18a303e220c95ffbd9e1a88 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:06 2006 -0700 [PATCH] DAC960: use memmove for overlapping areas Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ecd05ae68a903761e736e9e0aca40d6ace4319e Author: Alexey Dobriyan Date: Wed Oct 11 01:22:05 2006 -0700 [PATCH] fs/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Cc: David Howells Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbab41ccc479b6b0ba15c137af9e0b1c100bff24 Author: Adrian Bunk Date: Wed Oct 11 01:22:04 2006 -0700 [PATCH] HT_IRQ must depend on PCI CONFIG_PCI=n, CONFIG_HT_IRQ=y results in the following compile error: ... LD vmlinux arch/i386/mach-generic/built-in.o: In function `apicid_to_node': summit.c:(.text+0x53): undefined reference to `apicid_2_node' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf79): undefined reference to `write_ht_irq_low' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf85): undefined reference to `write_ht_irq_high' arch/i386/kernel/built-in.o: In function `k7nops': alternative.c:(.data+0x1358): undefined reference to `mask_ht_irq' alternative.c:(.data+0x1360): undefined reference to `unmask_ht_irq' make[1]: *** [vmlinux] Error 1 Bug report by Jesper Juhl. Signed-off-by: Adrian Bunk Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bc5b2db16ceefdd972b9ffd1f7bde5c427939e Author: Aneesh Kumar Date: Wed Oct 11 01:22:03 2006 -0700 [PATCH] Fix typos in mm/shmem_acl.c Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e50190a8341485b413f599033cb74649f849d939 Author: Matthew Wilcox Date: Wed Oct 11 01:22:02 2006 -0700 [PATCH] Consolidate check_signature There's nothing arch-specific about check_signature(), so move it to . Use a cross between the Alpha and i386 implementations as the generic one. Signed-off-by: Matthew Wilcox Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53d5ed627df852ba8bab7f70df25290bd733792c Author: Matthew Wilcox Date: Wed Oct 11 01:22:01 2006 -0700 [PATCH] Use linux/io.h instead of asm/io.h In preparation for moving check_signature, change these users from asm/io.h to linux/io.h Signed-off-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c58165108e26d18849a0138c719e680f281197a Author: Monakhov Dmitriy Date: Wed Oct 11 01:22:00 2006 -0700 [PATCH] D-cache aliasing issue in __block_prepare_write A couple of flush_dcache_page()s are missing on the I/O-error paths. Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97e860d364aa9d08e895ecb619b9122ae2c70df8 Author: Eric Sesterhenn Date: Wed Oct 11 01:21:59 2006 -0700 [PATCH] Remove unnecessary check in fs/fat/inode.c Aince all callers dereference sb, and this function does so earlier too, we dont need the check. Signed-off-by: Eric Sesterhenn Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887ed2f3aecde2ff24e06666932dc5f144745044 Author: Trond Myklebust Date: Wed Oct 11 01:21:58 2006 -0700 [PATCH] VM: Fix the gfp_mask in invalidate_complete_page2 If try_to_release_page() is called with a zero gfp mask, then the filesystem is effectively denied the possibility of sleeping while attempting to release the page. There doesn't appear to be any valid reason why this should be banned, given that we're not calling this from a memory allocation context. For this reason, change the gfp_mask argument of the call to GFP_KERNEL. Signed-off-by: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd0810410beb86c570aeb3dcd3dc1fc5ab9e6077 Author: Matthias Urlichs Date: Wed Oct 11 01:21:57 2006 -0700 [PATCH] document the core-dump-to-a-pipe patch The pipe-a-coredump-to-a-program feature was undocumented. *Grumble*. NB: a good enhancement to that patch would be: save all the stuff that a core file can get from the %x expansions in the environment. Signed-off-by: Matthias Urlichs Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01a3ee2b203e511e20f98b85a9172fd32c53e87c Author: Reinette Chatre Date: Wed Oct 11 01:21:55 2006 -0700 [PATCH] bitmap: parse input from kernel and user buffers lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates. This has been reworked to not use kmalloc and eliminates a lot of get_user() overhead by performing one access_ok before using __get_user(). We need to test if we are in kernel or user space (is_user) and access the buffer differently. We cannot use __get_user() to access kernel addresses in all cases, for example in architectures with separate address space for kernel and user. This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code. Only a few routines used this function and they were changed too. Signed-off-by: Reinette Chatre Signed-off-by: Inaky Perez-Gonzalez Cc: Paul Jackson Cc: Joe Korty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39484e53bb00f55b6303a908070db133608ef2a5 Author: Maciej W. Rozycki Date: Wed Oct 11 01:21:54 2006 -0700 [PATCH] 32-bit compatibility HDIO IOCTLs A couple of HDIO IOCTLs are not yet handled and a few others are marked as using a pointer rather than an unsigned long. The formers include: HDIO_GET_WCACHE, HDIO_GET_ACOUSTIC, HDIO_GET_ADDRESS and HDIO_GET_BUSSTATE. The latters are: HDIO_SET_MULTCOUNT, HDIO_SET_UNMASKINTR, HDIO_SET_KEEPSETTINGS, HDIO_SET_32BIT, HDIO_SET_NOWERR, HDIO_SET_DMA, HDIO_SET_PIO_MODE and HDIO_SET_NICE. Additionally 0x330 used to be HDIO_GETGEO_BIG and may be issued by 32-bit `hdparm' run on a 64-bit kernel making Linux complain loudly. This is a fix for these issues. Signed-off-by: Maciej W. Rozycki Cc: Alan Cox Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e3ad8af43c2f555c1be6c02581f6cc939dcb71c Author: Jeff Garzik Date: Wed Oct 11 01:21:53 2006 -0700 [PATCH] x86/microcode: handle sysfs error Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8258d4a574d3a8c01f0ef68aa26b969398a0e140 Author: Andrew Morton Date: Wed Oct 11 01:21:53 2006 -0700 [PATCH] invalidate_inode_pages2_range() debug A failure in invalidate_inode_pages2_range() can result in unpleasant things happening in NFS (at least). Stick a WARN_ON_ONCE() in there so we can find out if it happens, and maybe why. (akpm: might be a -mm-only patch, we'll see..) Cc: Chuck Lever Cc: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beed33a816204cb402c69266475b6a60a2433ceb Author: Nick Piggin Date: Wed Oct 11 01:21:52 2006 -0700 [PATCH] sched: likely profiling This likely profiling is pretty fun. I found a few possible problems in sched.c. This patch may be not measurable, but when I did measure long ago, nooping (un)likely cost a couple of % on scheduler heavy benchmarks, so it all adds up. Tweak some branch hints: - the 2nd 64 bits in the bitmask is likely to be populated, because it contains the first 28 bits (nearly 3/4) of the normal priorities. (ratio of 669669:691 ~= 1000:1). - it isn't unlikely that context switching switches to another process. it might be very rapidly switching to and from the idle process (ratio of 475815:419004 and 471330:423544). Let the branch predictor decide. - preempt_enable seems to be very often called in a nested preempt_disable or with interrupts disabled (ratio of 3567760:87965 ~= 40:1) Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Cc: Daniel Walker Cc: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f33d9bd50478c9a969b65f58feb6b69a3ad478cb Author: Jeff Garzik Date: Wed Oct 11 01:21:51 2006 -0700 [PATCH] tpm: fix error handling - handle sysfs error - handle driver model errors - de-obfuscate platform_device_register_simple() call, which included an assignment in between two function calls, in the same C statement. Signed-off-by: Jeff Garzik Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a2b4062f5adf2218b9b021e1c33f374bf142cb2 Author: Vasily Averin Date: Wed Oct 11 01:21:50 2006 -0700 [PATCH] ext2: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT2_ERRORS_CONTINUE should be read from the superblock as default value for error behaviour. parse_option() should clean the alternative options and should not change default value taken from the superblock. Signed-off-by: Vasily Averin Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2245d7c21f5bb1f104ee1226ebcb3dd5b9acfff6 Author: Dmitry Mishin Date: Wed Oct 11 01:21:49 2006 -0700 [PATCH] ext3: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT3_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa3ba2e81ea23416272a22009bba95954c81969c Author: Florin Malita Date: Wed Oct 11 01:21:48 2006 -0700 [PATCH] fix Module taint flags listing in Oops/panic Module taint flags listing in Oops/panic has a couple of issues: * taint_flags() doesn't null-terminate the buffer after printing the flags * per-module taints are only set if the kernel is not already tainted (with that particular flag) => only the first offending module gets its taint info correctly updated Some additional changes: * 'license_gplok' is no longer needed - equivalent to !(taints & TAINT_PROPRIETARY_MODULE) - so we can drop it from struct module * exporting module taint info via /proc/module: pwc 88576 0 - Live 0xf8c32000 evilmod 6784 1 pwc, Live 0xf8bbf000 (PF) Signed-off-by: Florin Malita Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3719bc5c22c9025bf1c909fe8b527ebf1de9a153 Author: Alan Cox Date: Wed Oct 11 01:21:47 2006 -0700 [PATCH] ide-generic: jmicron fix Some people find their Jmicron pata port reports its disabled even though it has devices on it and was boot probed. Fix this (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper jmicron driver on the merge for that to replace ide-generic support) Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5657933863f43cc6bb76a54d659303dafaa9e58 Author: Andrew Morton Date: Wed Oct 11 01:21:46 2006 -0700 [PATCH] grow_buffers() infinite loop fix If grow_buffers() is for some reason passed a block number which wants to lie outside the maximum-addressable pagecache range (PAGE_SIZE * 4G bytes) then it will accidentally truncate `index' and will then instnatiate a page at the wrong pagecache offset. This causes __getblk_slow() to go into an infinite loop. This can happen with corrupted disks, or with software errors elsewhere. Detect that, and handle it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0ab2928cc2202f13f0574d4c6f567f166d307eb Author: Stephane Eranian Date: Wed Oct 11 01:21:45 2006 -0700 [PATCH] Add carta_random32() library routine This is a follow-up patch based on the review for perfmon2. This patch adds the carta_random32() library routine + carta_random32.h header file. This is fast, simple, and efficient pseudo number generator algorithm. We use it in perfmon2 to randomize the sampling periods. In this context, we do not need any fancy randomizer. Signed-off-by: stephane eranian Cc: David Mosberger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b611967de4dc5c52049676c4369dcac622a7cdfe Author: Davide Libenzi Date: Wed Oct 11 01:21:44 2006 -0700 [PATCH] epoll_pwait() Implement the epoll_pwait system call, that extend the event wait mechanism with the same logic ppoll and pselect do. The definition of epoll_pwait is: int epoll_pwait(int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *sigmask, size_t sigsetsize); The difference between the vanilla epoll_wait and epoll_pwait is that the latter allows the caller to specify a signal mask to be set while waiting for events. Hence epoll_pwait will wait until either one monitored event, or an unmasked signal happen. If sigmask is NULL, the epoll_pwait system call will act exactly like epoll_wait. For the POSIX definition of pselect, information is available here: http://www.opengroup.org/onlinepubs/009695399/functions/select.html Signed-off-by: Davide Libenzi Cc: David Woodhouse Cc: Andi Kleen Cc: Michael Kerrisk Cc: Ulrich Drepper Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f836e5fecf59d0d0353e9af11fd14a32a3001ae Author: David Woodhouse Date: Wed Oct 11 01:21:43 2006 -0700 [PATCH] Add CONFIG_HEADERS_CHECK option to automatically run 'make headers_check' In order to encourage people to notice when they break the exported headers, add a config option which automatically runs the sanity checks when building vmlinux. That way, those who use allyesconfig will notice failures. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c21be1c9c1ab42fe285a74f184e1acbc37ee084b Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:42 2006 -0700 [PATCH] uml: allow finer tuning for host VMSPLIT setting Now that various memory splits are enabled, add a config option allowing the user to compile UML for its need - HOST_2G_2G allowed to choose either 3G/1G or 2G/2G, and enabling it reduced the usable virtual memory. Detecting this at run time should be implemented in the future, but we must make the stop-gap measure work well enough (this is valid in _many_ cases). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca316fcf641532ee70dfc59daf632d1685b7d902 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:41 2006 -0700 [PATCH] uml: deprecate CONFIG_MODE_TT Deprecate TT mode in Kconfig so that users won't select it, update the MODE_SKAS description (it was largely obsolete and misleadin) and btw describe advantages for high memory usage with CONFIG_STATIC_LINK. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d57151bd3110ae3f0db3e5770ab1a46d1b647a Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:40 2006 -0700 [PATCH] uml: remove duplicate export The export is together with the definition, in arch/x86_64/lib/csum-partial.c, which is compiled in by arch/um/sys-x86_64/Makefile. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27ecef7c63064c1f2eadf413e694e65a34f1f79 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:40 2006 -0700 [PATCH] uml: asm offsets duplication removal Unify macros common to x86 and x86_64 kernel-offsets.h files. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2465b8580a5649ee789f213d39c1b49d84fefe8f Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:38 2006 -0700 [PATCH] uml: allow using again x86/x86_64 crypto code Enable compilation of x86_64 crypto code;, and add the needed constant to make the code compile again (that macro was added to i386 asm-offsets between 2.6.17 and 2.6.18, in 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5). Cc: Herbert Xu Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 711553efa5b8581365084cacf3585a36ca253bab Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:37 2006 -0700 [PATCH] uml: declare in Kconfig our partial LOCKDEP support Declare UML partial support for LOCKDEP - however IRQFLAGS tracing requires some coding which nobody did yet, so we cannot run full lockdep on UML. Grep for CONFIG_TRACE_IRQFLAGS on i386 code to find their implementation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69fada32d868d7f4be128ea4df8fbe4fd897fc34 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:36 2006 -0700 [PATCH] uml: fix uname under setarch i386 On a 64bit Uml, if run under "setarch i386" (which a user did), uname() currently returns the obtained i686 as machine - fix that. Btw, I'm quite surprised that under setarch i386 a 64-bit binary can run. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b4ad242fcfcf1e261604cb91ee5fb8032900997 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:35 2006 -0700 [PATCH] uml: fix processor selection to exclude unsupported processors and features Makes UML compile on any possible processor choice. The two problems were: *) x86 code, when 386 is selected, checks at runtime boot_cpuflags, which we do not have. *) 3Dnow support for memcpy() et al. does not compile currently and fixing this is not trivial, so simply disable it; with this change, if one selects MK7 UML compiles (while it did not). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5cdb5797d364a112879e49cc708083853ffc592 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:34 2006 -0700 [PATCH] uml: make UML_SETJMP always safe If enable is moved by GCC in a register its value may not be preserved after coming back there with longjmp(). So, mark it as volatile to prevent this; this is suggested (it seems) in info gcc, when it talks about -Wuninitialized. I re-read this and it seems to say something different, but I still believe this may be needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d875f9fd3f2369bf6f4d0e9989f00fe610eac470 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:34 2006 -0700 [PATCH] uml: make TT mode compile after setjmp-related changes Make TT mode compile after the introduction of klibc's implementation of setjmp. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27e80b3da7ad6b90185bd689879888907104a40 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:33 2006 -0700 [PATCH] uml: readd forgot prototype This was forgot in a previous patch so UML does not compile with TT mode enabled. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21c935e5298a3bc4f16cdff7ce3b1efab92b995e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:32 2006 -0700 [PATCH] uml: correct removal of pte_mkexec Correct commit 5906e4171ad61ce68de95e51b773146707671f80 - this makes more sense: we turn pte_mkexec + pte_wrprotect to pte_mkread. However, due to a bug in pte_mkread, it does the exact same thing as pte_mkwrite, so this patch improves the code but does not change anything in practice. The pte_mkread bug is fixed separately, as it may have big impact. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1875a48fed4239769bacb039175a52e42b0ebd71 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:31 2006 -0700 [PATCH] uml: revert wrong patch Andi Kleen pointed out that -mcmodel=kernel does not make sense for userspace code and would stop everything from working, and pointed out the correct fix for the original bug (not easy to do for me). Reverts part of commit 06837504de7b4883e92af207dbbab4310d0db0ed. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9858db504caedb2424b9a32744c23f9a81ec1731 Author: Nick Piggin Date: Wed Oct 11 01:21:30 2006 -0700 [PATCH] mm: locks_freed fix Move the lock debug checks below the page reserved checks. Also, having debug_check_no_locks_freed in kernel_map_pages is wrong. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dafb13673c463bc2aade4a4819704dde0f5fa37f Author: Nick Piggin Date: Wed Oct 11 01:21:30 2006 -0700 [PATCH] mm: arch_free_page fix After the PG_reserved check was added, arch_free_page was being called in the wrong place (it could be called for a page we don't actually want to free). Fix that. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 699397499742d1245ea5d677a08fa265df666d2d Author: Keith Owens Date: Wed Oct 11 01:21:28 2006 -0700 [PATCH] Fix do_mbind warning with CONFIG_MIGRATION=n With CONFIG_MIGRATION=n mm/mempolicy.c: In function 'do_mbind': mm/mempolicy.c:796: warning: passing argument 2 of 'migrate_pages' from incompatible pointer type Signed-off-by: Keith Owens Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b16bc64d1aed40fb9cff9187061005b2a89b5d5d Author: Dave Jones Date: Wed Oct 11 01:21:27 2006 -0700 [PATCH] move rmap BUG_ON outside DEBUG_VM We have a persistent dribble of reports of this BUG triggering. Its extended diagnostics were recently made conditional on CONFIG_DEBUG_VM, which was a bad idea - we want to know about it. Signed-off-by: Dave Jones Cc: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469340236a7c9673df3e6a2425f559517f01464e Author: Christoph Lameter Date: Wed Oct 11 01:21:26 2006 -0700 [PATCH] mm: kevent threads: use MPOL_DEFAULT Switch the memory policy of the kevent threads to MPOL_DEFAULT while leaving the kzalloc of the workqueue structure on interleave. This means that all code executed in the context of the kevent thread is allocating node local. Signed-off-by: Christoph Lameter Cc: Christoph Lameter Cc: Alok Kataria Cc: Andi Kleen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc513a333b45f8913d40c8241a0cb61be79e1c60 Author: Dave Kleikamp Date: Wed Oct 11 01:21:25 2006 -0700 [PATCH] Documentation/filesystems/ext4.txt This file, ext4.txt, was put together with information from Andrew Morton, Andreas Dilger, Suparna Bhattacharya, and Ted Ts'o. I copied the mount options, with the exception of "extents", from ext3.txt, so if anyone is aware of anything out-of-date, please let me know. Signed-off-by: Dave Kleikamp Cc: Theodore Ts'o Cc: Suparna Bhattacharya Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f5793351d821749979e36889f9c089c6028c83 Author: Andrew Morton Date: Wed Oct 11 01:21:24 2006 -0700 [PATCH] ext4 whitespace cleanups Someone's tab key is emitting spaces. Attempt to repair some of the damage. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ceea16bf85fb46035dda1db263ca29b0e07e22ba Author: Dmitry Mishin Date: Wed Oct 11 01:21:21 2006 -0700 [PATCH] ext4: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT4_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 Author: Andrew Morton Date: Wed Oct 11 01:21:20 2006 -0700 [PATCH] ext4: rename logic_sb_block I assume this means "logical sb block". So call it that. I still don't understand the name though. A block is a block. What's different about this one? Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4e5bc244f23ee024a4dfa034b591b219b2bfb8f Author: Andrew Morton Date: Wed Oct 11 01:21:19 2006 -0700 [PATCH] ext4 64 bit divide fix With CONFIG_LBD=n, sector_div() expands to a plain old divide. But ext4 is _not_ passing in a sector_t as the first argument, so... fs/built-in.o: In function `ext4_get_group_no_and_offset': fs/ext4/balloc.c:39: undefined reference to `__umoddi3' fs/ext4/balloc.c:41: undefined reference to `__udivdi3' fs/built-in.o: In function `find_group_orlov': fs/ext4/ialloc.c:278: undefined reference to `__udivdi3' fs/built-in.o: In function `ext4_fill_super': fs/ext4/super.c:1488: undefined reference to `__udivdi3' fs/ext4/super.c:1488: undefined reference to `__umoddi3' fs/ext4/super.c:1594: undefined reference to `__udivdi3' fs/ext4/super.c:1601: undefined reference to `__umoddi3' Fix that up by calling do_div() directly. Also cast the arg to u64. do_div() is only defined on u64, and ext4_fsblk_t is supposed to be opaque. Note especially the changes to find_group_orlov(). It was attempting to do do_div(int, unsigned long long); which is royally screwed up. Switched it to plain old divide. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72b64b594081ef0a0717f6aad77e891c72ed4afa Author: Andrew Morton Date: Wed Oct 11 01:21:18 2006 -0700 [PATCH] ext4 uninline ext4_get_group_no_and_offset() Way too big to inline. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fadc14323684c547f74cf2f4d13517c6c264731 Author: Alexandre Ratchov Date: Wed Oct 11 01:21:15 2006 -0700 [PATCH] ext4: move block number hi bits move '_hi' bits of block numbers in the larger part of the block group descriptor structure Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d1ee42f27d30eed1659f3e85bcbbc7b3711f61f Author: Alexandre Ratchov Date: Wed Oct 11 01:21:14 2006 -0700 [PATCH] ext4: allow larger descriptor size make block group descriptor larger. Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18eba7aae080d4a5c0d850ea810e83d11f0a8d77 Author: Mingming Cao Date: Wed Oct 11 01:21:13 2006 -0700 [PATCH] jbd2: switch blks_type from sector_t to ull Similar to ext4, change blocks in JBD2 from sector_t to unsigned long long. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b8f1f0106ab39ad58765d4e7c57189835f51127 Author: Mingming Cao Date: Wed Oct 11 01:21:13 2006 -0700 [PATCH] ext4: removesector_t bits check Previously when in-kernel ext4 block type is sector_t, it's only 4 bits long under some 32bit arch (when CONFIG_LBD is not on). So we need to check the size of sector_t before we read 48bit long on-disk blocks to in-kernel blocks. These checks are unnecessary now as we changed the in-kernel blocks to unsigned longlong. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae0210760aed9d626eaede5b63db95e198f7c8e Author: Mingming Cao Date: Wed Oct 11 01:21:11 2006 -0700 [PATCH] ext4: blk_type from sector_t to unsigned long long Change ext4 in-kernel block type (ext4_fsblk_t) from sector_t to unsigned long long. Remove ext4 block type string micro E3FSBLK, replaced with "%llu" [akpm@osdl.org: build fix] Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd81d8eec043094d3ff729a8ff6d5b3a06d3c4b1 Author: Laurent Vivier Date: Wed Oct 11 01:21:10 2006 -0700 [PATCH] ext4: 64bit metadata In-kernel super block changes to support >32 bit free blocks numbers. Signed-off-by: Laurent Vivier Signed-off-by: Dave Kleikamp Signed-off-by: Alexandre Ratchov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1ddeb7eaecea6a924e3a79aa386797020cb436f Author: Badari Pulavarty Date: Wed Oct 11 01:21:09 2006 -0700 [PATCH] ext4: 48bit i_file_acl As we are planning to support 48-bit block numbers for ext4, we need to support 48-bit block numbers for extended attributes. In the short term, we can do this by reuse (on-disk) 16-bit padding (linux2.i_pad1 currently used only by "hurd") as high order bits for xattr. This patch basically does that. Signed-off-by: Badari Pulavarty Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 299717696d48531d70aeb4614c3939e4a28456c1 Author: Mingming Cao Date: Wed Oct 11 01:21:09 2006 -0700 [PATCH] jbd2: sector_t conversion JBD layer in-kernel block varibles type fixes to support >32 bit block number and convert to sector_t type. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b517bea1c74e4773482b3f41b3f493522a8c8e30 Author: Zach Brown Date: Wed Oct 11 01:21:08 2006 -0700 [PATCH] 64-bit jbd2 core Here is the patch to JBD to handle 64 bit block numbers, originally from Zach Brown. This patch is useful only after adding support for 64-bit block numbers in the filesystem. Signed-off-by: Badari Pulavarty Signed-off-by: Zach Brown Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0d856e8bd6e697cb44b2b4dd038f3bec576a70e Author: Randy Dunlap Date: Wed Oct 11 01:21:07 2006 -0700 [PATCH] ext4: clean up comments in ext4-extents patch Signed-off-by: Randy Dunlap Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471d4011a9862efff02094388b8fe8cd67683c38 Author: Suparna Bhattacharya Date: Wed Oct 11 01:21:06 2006 -0700 [PATCH] ext4: uninitialised extent handling Make it possible to add file preallocation support in future as an RO_COMPAT feature by recognizing uninitialized extents as holes and limiting extent length to keep the top bit of ee_len free for marking uninitialized extents. Signed-off-by: Suparna Bhattacharya Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65e6fba163dfd0f962efb7d8f5528b6872e2b15 Author: Alex Tomas Date: Wed Oct 11 01:21:05 2006 -0700 [PATCH] ext4: 48bit physical block number support in extents Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a5b2ecdd1fa63a8f25bd769223bc1c2564ce45d Author: Mingming Cao Date: Wed Oct 11 01:21:05 2006 -0700 [PATCH] ext4: switch fsblk to sector_t Redefine ext3 in-kernel filesystem block type (ext3_fsblk_t) from unsigned long to sector_t, to allow kernel to handle >32 bit ext3 blocks. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a86c61812637c7dd0c57e29880cffd477b62f2e7 Author: Alex Tomas Date: Wed Oct 11 01:21:03 2006 -0700 [PATCH] ext3: add extent map support On disk extents format: /* * this is extent on-disk structure * it's used at the bottom of the tree */ struct ext3_extent { __le32 ee_block; /* first logical block extent covers */ __le16 ee_len; /* number of blocks covered by extent */ __le16 ee_start_hi; /* high 16 bits of physical block */ __le32 ee_start; /* low 32 bigs of physical block */ }; Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3fcc8137ce4296ad6ab94f88bd60cbe03d21527 Author: Dave Kleikamp Date: Wed Oct 11 01:21:02 2006 -0700 [PATCH] jbd2: cleanup ext4_jbd.h To allow ext4 to build during the transition from jbd to jbd2, we have both ext4_jbd.h and ext4_jbd2.h in the tree. We no longer need the former. Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dab291af8d6307a3075c3d67d0cc8f98e646cb94 Author: Mingming Cao Date: Wed Oct 11 01:21:01 2006 -0700 [PATCH] jbd2: enable building of jbd2 and have ext4 use it rather than jbd Reworked from a patch by Mingming Cao and Randy Dunlap Signed-off-By: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a920e9416b3469994860ab552dfd7fd5a5aff162 Author: Johann Lombardi Date: Wed Oct 11 01:21:00 2006 -0700 [PATCH] jbd2: rename slab jbd and jbd2 currently use the same slab names which must be unique. The patch below just renames jbd2's slabs. Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7f4bccb729844a0fa873e224e3a6f7eeed095bb Author: Mingming Cao Date: Wed Oct 11 01:20:59 2006 -0700 [PATCH] jbd2: rename jbd2 symbols to avoid duplication of jbd symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 470decc613ab2048b619a01028072d932d9086ee Author: Dave Kleikamp Date: Wed Oct 11 01:20:57 2006 -0700 [PATCH] jbd2: initial copy of files from jbd This is a simple copy of the files in fs/jbd to fs/jbd2 and /usr/incude/linux/[ext4_]jbd.h to /usr/include/[ext4_]jbd2.h Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02ea2104c55b625cf5b5d9ba8586a4fc17920f5c Author: Mingming Cao Date: Wed Oct 11 01:20:56 2006 -0700 [PATCH] ext4: enable building of ext4 Originally part of a patch from Mingming Cao and Randy Dunlap. Reorganized by Shaggy. Signed-off-by: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617ba13b31fbf505cc21799826639ef24ed94af0 Author: Mingming Cao Date: Wed Oct 11 01:20:53 2006 -0700 [PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac27a0ec112a089f1a5102bc8dffc79c8c815571 Author: Dave Kleikamp Date: Wed Oct 11 01:20:50 2006 -0700 [PATCH] ext4: initial copy of files from ext3 Start of the ext4 patch series. See Documentation/filesystems/ext4.txt for details. This is a simple copy of the files in fs/ext3 to fs/ext4 and /usr/incude/linux/ext3* to /usr/include/ex4* Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 502717f4e112b18d9c37753a32f675bec9f2838b Author: Chen, Kenneth W Date: Wed Oct 11 01:20:46 2006 -0700 [PATCH] hugetlb: fix linked list corruption in unmap_hugepage_range() commit fe1668ae5bf0145014c71797febd9ad5670d5d05 causes kernel to oops with libhugetlbfs test suite. The problem is that hugetlb pages can be shared by multiple mappings. Multiple threads can fight over page->lru in the unmap path and bad things happen. We now serialize __unmap_hugepage_range to void concurrent linked list manipulation. Such serialization is also needed for shared page table page on hugetlb area. This patch will fixed the bug and also serve as a prepatch for shared page table. Signed-off-by: Ken Chen Cc: Hugh Dickins Cc: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97c7801cd5b0bb6a38c16108a496235474dc6310 Author: Rafael J. Wysocki Date: Wed Oct 11 01:20:45 2006 -0700 [PATCH] swsusp: Use suspend_console Add suspend_console() and resume_console() to the suspend-to-disk code paths so that the users of netconsole can use swsusp with it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dea20a3fbdd08e5ae2a0b33d2577c794a3764a11 Author: Heiko Carstens Date: Wed Oct 11 01:20:44 2006 -0700 [PATCH] Disable DETECT_SOFTLOCKUP for s390 We got several false bug reports because of enabled CONFIG_DETECT_SOFTLOCKUP. Disable soft lockup detection on s390, since it doesn't work on a virtualized architecture. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c37e108d156101dcde7ec7033eabe7abe83366bc Author: Aneesh Kumar K.V Date: Wed Oct 11 01:20:43 2006 -0700 [PATCH] use struct irq_chip instead of struct hw_interrupt_type hw_interrupt_type is deprecated in favour of struct irq_chip. [mingo@elte.hu: do x86_64 too] Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef Author: Luca Tettamanti Date: Wed Oct 11 01:20:41 2006 -0700 [PATCH] Fix menuconfig build failure due to missing stdbool.h scripts/kconfig/lxdialog/util.c fails to build because it uses true/false without including stdbool.h: kronos:~/src/linux-2.6$ make O=../linux-build-git menuconfig GEN /home/kronos/src/linux-build/Makefile HOSTCC scripts/kconfig/lxdialog/util.o /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_classic_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: (Each undeclared identifier is reported only once /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: for each function it appears in.) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:70: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_blackbg_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:101: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:102: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_bluetitle_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:144: error: 'true' undeclared (first use in this function) make[2]: *** [scripts/kconfig/lxdialog/util.o] Error 1 make[1]: *** [menuconfig] Error 2 make: *** [menuconfig] Error 2 Add to dialog.h to fix the breakage. Signed-off-by: Luca Tettamanti Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b888132b0ff29ca0733589a594c243ed612438eb Author: Mel Gorman Date: Wed Oct 11 01:20:40 2006 -0700 [PATCH] mm: remove memmap_zone_idx() memmap_zone_idx() is not used anymore. It was required by an earlier version of account-for-memmap-and-optionally-the-kernel-image-as-holes.patch but not any more. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6391af174ad75f72e92043c1dd8302660a2fec58 Author: Mel Gorman Date: Wed Oct 11 01:20:39 2006 -0700 [PATCH] mm: use symbolic names instead of indices for zone initialisation Arch-independent zone-sizing is using indices instead of symbolic names to offset within an array related to zones (max_zone_pfns). The unintended impact is that ZONE_DMA and ZONE_NORMAL is initialised on powerpc instead of ZONE_DMA and ZONE_HIGHMEM when CONFIG_HIGHMEM is set. As a result, the the machine fails to boot but will boot with CONFIG_HIGHMEM turned off. The following patch properly initialises the max_zone_pfns[] array and uses symbolic names instead of indices in each architecture using arch-independent zone-sizing. Two users have successfully booted their powerpcs with it (one an ibook G4). It has also been boot tested on x86, x86_64, ppc64 and ia64. Please merge for 2.6.19-rc2. Credit to Benjamin Herrenschmidt for identifying the bug and rolling the first fix. Additional credit to Johannes Berg and Andreas Schwab for reporting the problem and testing on powerpc. Signed-off-by: Mel Gorman Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e0fadfcf62e252d2b14de0e0927eb2830c0c28c Author: Haavard Skinnemoen Date: Wed Oct 11 01:20:37 2006 -0700 [PATCH] IRQ: Fix AVR32 breakage Make the necessary changes to AVR32 required by the irq regs stuff. Signed-off-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41716c7c21b15e7ecf14f0caf1eef3980707fb74 Author: Eric Sesterhenn Date: Wed Oct 11 01:20:37 2006 -0700 [PATCH] null dereference in fs/jbd/journal.c Since commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 we dereference a NULL pointer. Coverity id #1432. We set journal to NULL, and use it directly afterwards. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e491092e442b3f8c0d90d470b398fdb74703ec7 Author: Andrew Morton Date: Wed Oct 11 01:20:35 2006 -0700 [PATCH] revert "nvidiafb: use generic ddc reading" Olaf reports that this gave him a black screen. Cc: Olaf Hering Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e9de18f079a51fa987ef0703112d5bc125fdb7 Author: Christian Borntraeger Date: Wed Oct 11 15:31:52 2006 +0200 [S390] stacktrace bug. The latest kernel 2.6.19-rc1 triggers a bug in the s390 specific stack trace code when compiled with gcc 3.4. This patch fixes the latest lock dependency validator code (2.6.19-rc1) on s390 gcc 3.4. The variable sp was fixed to r15 (which is the stack pointer in the s390 abi) and assigned new values to r15. Therefore, gcc 3.4 assigns a new value to r15 and does not restore it on exit (r15 is supposed to be call save) - the kernel stack is broken. Avoid trouble by not assigning any new value to sp (r15). Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 12975aef62836e9f3e179afaaded8045f8a25ac4 Author: Cornelia Huck Date: Wed Oct 11 15:31:47 2006 +0200 [S390] cio: remove casts from/to (void *). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit e7769b48a0216d7262fe2ba59b1b3697be462cbb Author: Cornelia Huck Date: Wed Oct 11 15:31:41 2006 +0200 [S390] cio: Remove grace period for vary off chpid. The grace period handling introduced needless complexity. It didn't help the dasd driver (which can handle terminated I/O just well), and it doesn't help for long running channel programs (which won't complete during the grace period anyway). Terminating I/O using a path that just disappeared immediately is much more consistent with what the user expects. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 789642680518b28e7dc13f96061460a8238ec622 Author: Cornelia Huck Date: Wed Oct 11 15:31:38 2006 +0200 [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private Use the proper structures to identify device and subchannel. Change get_disc_ccwdev_by_devno() to get_disc_ccwdev_by_dev_id(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 715d854bc215bbcca35097176d674c3ac58a085c Author: Melissa Howland Date: Wed Oct 11 15:31:34 2006 +0200 [S390] monwriter kzalloc size. Fix length on kzalloc for data buffer so as to not overwrite unallocated storage. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 08983787d2ccab64cb790965ba89621d96cc22c1 Author: Cornelia Huck Date: Wed Oct 11 15:31:30 2006 +0200 [S390] cio: add missing KERN_INFO printk header. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 9d0a57cbdb4976f382eb1c03baee338e467b6592 Author: Heiko Carstens Date: Wed Oct 11 15:31:26 2006 +0200 [S390] irq change improvements. Remove the last few places where a pointer to pt_regs gets passed. Also make sure we call set_irq_regs() before irq_enter() and after irq_exit(). This doesn't fix anything but makes sure s390 looks the same like all other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 9765d262b8230b735c4b2815b041c09a00833cf1 Author: Akinobu Mita Date: Wed Oct 11 22:29:51 2006 +1000 [CRYPTO] api: fix crypto_alloc_base() return value This patch makes crypto_alloc_base() return proper return value. - If kzalloc() failure happens within __crypto_alloc_tfm(), crypto_alloc_base() returns NULL. But crypto_alloc_base() is supposed to return error code as pointer. So this patch makes it return -ENOMEM in that case. - crypto_alloc_base() is suppose to return -EINTR, if it is interrupted by signal. But it may not return -EINTR. Signed-off-by: Akinobu Mita Signed-off-by: Herbert Xu commit 53e36ada37cb8b01cfbf674580a79edc0bb764c7 Author: Peter Korsgaard Date: Mon Oct 9 09:53:09 2006 +0200 [PATCH] pata-qdi: fix le32 in data_xfer The following tiny patch fixes a typo in qdi_data_xfer (le32 instead of le16). Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit a83068bbaca39197dca26287c16186baee615f0a Author: Jeff Garzik Date: Wed Oct 11 04:46:52 2006 -0400 [libata] sata_promise: add PCI ID Noticed by Steve Brown Signed-off-by: Jeff Garzik commit bbe1fe7ea3438f8c4447dbcd46a126581ed2ed41 Author: Eran Tromer Date: Tue Oct 10 14:29:25 2006 -0700 [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl Make the HDIO_DRIVE_CMD ioctl in libata (ATA command pass through) return a few ATA registers to userspace, following the same convention as the drivers/ide implementation of the same ioctl. This is needed to support ATA commands like CHECK POWER MODE, which return information in nsectors. This fixes "hdparm -C" on SATA drives. Forcing the sense data read via the cc flag causes spurious check conditions, so we filter these out (following the ATA command pass-through specification T10/04-262r7). Signed-off-by: Eran Tromer Acked-by: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a1d2d81fa327d095a0a8a1f961bace5b0a2f7da Author: Helge Deller Date: Fri Oct 6 12:12:34 2006 -0600 [PATCH] Fix section mismatch in de2104x.c WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20) WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28) Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox Signed-off-by: Jeff Garzik commit 6e532cfe49b6e961e1260642a44959b645e9ab54 Author: Stephen Hemminger Date: Mon Oct 9 15:49:27 2006 -0700 [PATCH] sky2: set lower pause threshold to prevent overrun Adjust the pause threshold on slower systems to keep from getting overrun. Since FIFO is 2K bytes, don't send XON pause until there is space for a full frame. Signed-off-by: Jeff Garzik commit 7bd656d12119708b37414bf909ab2995473da818 Author: Stephen Hemminger Date: Mon Oct 9 14:40:38 2006 -0700 [PATCH] sky2: revert pci express extensions The pci express error handling extensions don't work unless PCI access is via mmconfig. Otherwise, all accesses to pci config registers greater than 256 fail. Since the sky2 driver has other ways of getting to PCI config space, it works around this short coming, but the pci_find_ext_capablity doesn't work. This backs out commit 91aeb3edbcf4e6ed72d138ac8c22fd68e6d717c3 Go back to hardcoding, since we know where the error registers are anyway. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7222 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 370de6cdc2ed27c41b313c031e4258ffa32272bc Author: Stephen Hemminger Date: Thu Oct 5 15:49:53 2006 -0700 [PATCH] skge: version 1.9 Want to be able to track downstream impact of fiber related fixes. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5d5c8e03786691d0d083142b922edce8609c0fd5 Author: Stephen Hemminger Date: Thu Oct 5 15:49:52 2006 -0700 [PATCH] skge: better flow control negotiation Do flow control negotiation properly. Don't let auto negotiation status limit renegotiation. Separate desired pause values from the result of auto negotiation. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4b67be999ed5bfb1bfe4cc502d37d59b4f6b6b7f Author: Stephen Hemminger Date: Thu Oct 5 15:49:51 2006 -0700 [PATCH] skge: pause mapping for fiber Do correct mapping of pause and duplex when using 1000BaseX fiber versions of the board. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a1bc9b875be597cdf147db2748ba7ddc6b0f0fbe Author: Stephen Hemminger Date: Thu Oct 5 15:49:50 2006 -0700 [PATCH] skge: fix stuck irq when fiber down The PHY interrupt from the internal fiber is getting stuck on when the link is down. Add code to handle the transition and mask it. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 647519100105fb4ddfe6455e820093999c08c4be Author: Linas Vepstas Date: Tue Oct 10 16:22:29 2006 -0500 [PATCH] powerpc/cell spidernet release all descrs Bugfix: rx descriptor release function fails to visit the last entry while walking receive descriptor ring. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 348bc2a6e306dc3e875cee3389e1405963ace617 Author: Linas Vepstas Date: Tue Oct 10 16:21:10 2006 -0500 [PATCH] powerpc/cell spidernet DMA direction fix The ring buffer descriptors are DMA-accessed bidirectionally, but are not declared in this way. Fix this. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 66c097165cf6d4196e798145fb33c768164fb361 Author: Linas Vepstas Date: Tue Oct 10 16:19:34 2006 -0500 [PATCH] powerpc/cell spidernet variable name change Cosmetic patch: give the variable holding the numer of descriptors a more descriptive name, so to avoid confusion. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a664ccf430547696951bf3949f5a2de5079ece5a Author: Linas Vepstas Date: Tue Oct 10 16:18:18 2006 -0500 [PATCH] powerpc/cell spidernet reduce DMA kicking The current code attempts to start the TX dma every time a packet is queued. This is too conservative, and wastes CPU time. This patch changes behaviour to call the kick-dma function less often, only when the tx queue is at risk of emptying. This reduces cpu usage, improves performance. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 499eea18722e43f0ee15e11ac16ffcbd10b70b24 Author: Linas Vepstas Date: Tue Oct 10 16:15:29 2006 -0500 [PATCH] powerpc/cell spidernet Remove a dummy register read that is not needed. This reduces CPU usage notably during transmit. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 9cc7bf7edf50a8a6b456b337aff97fe780ae369b Author: Linas Vepstas Date: Tue Oct 10 16:14:29 2006 -0500 [PATCH] powerpc/cell spidernet refine locking The transmit side of the spider ethernet driver currently places locks around some very large chunks of code. This results in a fair amount of lock contention is some cases. This patch makes the locks much more fine-grained, protecting only the cirtical sections. One lock is used to protect three locations: the queue head and tail pointers, and the queue low-watermark location. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 68a8c609b3071c2441fa64f584d15311f2c10e61 Author: Linas Vepstas Date: Tue Oct 10 16:13:05 2006 -0500 [PATCH] powerpc/cell spidernet NAPI polling info. This patch moves transmit queue cleanup code out of the interrupt context, and into the NAPI polling routine. Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 204e5fa17c7ba45a89989f8da6dfe8e54d64b79b Author: Linas Vepstas Date: Tue Oct 10 16:11:33 2006 -0500 [PATCH] powerpc/cell spidernet low watermark patch. Implement basic low-watermark support for the transmit queue. Hardware low-watermarks allow a properly configured kernel to continously stream data to a device and not have to handle any interrupts at all in doing so. Correct zero-interrupt operation can be actually observed for this driver, when the socket buffer is made large enough. The basic idea of a low-watermark interrupt is as follows. The device driver queues up a bunch of packets for the hardware to transmit, and then kicks the hardware to get it started. As the hardware drains the queue of pending, untransmitted packets, the device driver will want to know when the queue is almost empty, so that it can queue some more packets. If the queue drains down to the low waterark, then an interrupt will be generated. However, if the kernel/driver continues to add enough packets to keep the queue partially filled, no interrupt will actually be generated, and the hardware can continue streaming packets indefinitely in this mode. The impelmentation is done by setting the DESCR_TXDESFLG flag in one of the packets. When the hardware sees this flag, it will interrupt the device driver. Because this flag is on a fixed packet, rather than at fixed location in the queue, the code below needs to move the flag as more packets are queued up. This implementation attempts to keep the flag at about 1/4 from "empty". Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit b21606a773faffc2b3ec326325c433bdf37ecbdf Author: Linas Vepstas Date: Tue Oct 10 16:09:40 2006 -0500 [PATCH] powerpc/cell spidernet incorrect offset Bugfix -- the rx chain is in memory after the tx chain -- the offset being used was wrong, resulting in memory corruption when the size of the rx and tx rings weren't exactly the same. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 98b9040c747e50fe02ad616c9d5fee9aa4017cd1 Author: Linas Vepstas Date: Tue Oct 10 16:08:42 2006 -0500 [PATCH] powerpc/cell spidernet stop error printing patch. Turn off mis-interpretation of the queue-empty interrupt status bit as an error. Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 37aad7500bf7064bf150ea1f234303f4173f7b24 Author: Linas Vepstas Date: Tue Oct 10 16:06:53 2006 -0500 [PATCH] powerpc/cell spidernet fix error interrupt print The print message associated with the descriptor chain end interrupt prints a bogs value. Fix that. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 43932d938d5a193bf9602b0ac8aa6783ba78b1aa Author: Linas Vepstas Date: Tue Oct 10 16:05:00 2006 -0500 [PATCH] powerpc/cell spidernet bogus rx interrupt bit The current receive interrupt mask sets a bogus bit that doesn't even belong to the definition of this register. Remove it. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 313ef4b76c96ef427a7613d89df550aa5d02bf21 Author: Linas Vepstas Date: Tue Oct 10 16:04:00 2006 -0500 [PATCH] Spidernet stop queue when queue is full. This patch adds a call to netif_stop_queue() when there is no more room for more packets on the transmit queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit ded8028a0b61075d841c33a412da5c869140d7aa Author: Linas Vepstas Date: Tue Oct 10 16:02:54 2006 -0500 [PATCH] Spidernet fix register field definitions This patch fixes the names of a few fields in the DMA control register. There is no functional change. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 917a5b8e648f420105158023ae0317eb0e77a2d5 Author: Linas Vepstas Date: Tue Oct 10 16:01:51 2006 -0500 [PATCH] powerpc/cell spidernet add missing netdev watchdog Set the netdev watchdog timer. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 808999c9a4749dc67c39bf52f712d0c27aa00e67 Author: Linas Vepstas Date: Tue Oct 10 16:01:00 2006 -0500 [PATCH] powerpc/cell spidernet zlen min packet length Polite device drivers pad short packets to 60 bytes, so that mean-spirited users don't accidentally DOS some other OS that can't handle short packets. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit c3fee4c55915c42b3278b65c91f9be8cee13426e Author: Linas Vepstas Date: Tue Oct 10 16:00:04 2006 -0500 [PATCH] powerpc/cell spidernet force-end fix Bugfix: when cleaning up the transmit queue upon device close, be sure to walk the entire queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit e2874f2e8c3695953b9ec26d396d678a7128ee64 Author: Linas Vepstas Date: Tue Oct 10 15:59:02 2006 -0500 [PATCH] Spidernet module parm permissions The module param permsissions should bw read-only, not writable. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a02d601dd59d08a77563499cc05b48603df8f4a4 Author: Linas Vepstas Date: Tue Oct 10 15:57:26 2006 -0500 [PATCH] powerpc/cell spidernet burst alignment patch. This patch increases the Burst Address alignment from 64 to 1024 in the Spidernet driver. This improves transmit performance for large packets. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 90f10841180e9b7938f63db69e90dacb7d21bbe5 Author: Linas Vepstas Date: Tue Oct 10 15:56:04 2006 -0500 [PATCH] powerpc/cell spidernet ethtool -i version number info. This patch adds version information as reported by ethtool -i to the Spidernet driver. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit bff0a55f34e62970203c4af9c8ef4dc7d73e2f96 Author: Jan-Bernd Themann Date: Thu Oct 5 16:53:14 2006 +0200 [PATCH] ehea: fix port state notification, default queue sizes This patch includes a bug fix for the port state notification and fixes the default queue sizes. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 08093c8fd66ef7a8c2f887812cc98c54f5f12703 Author: Jan-Bernd Themann Date: Thu Oct 5 16:53:12 2006 +0200 [PATCH] ehea: firmware (hvcall) interface changes This eHEA patch covers required changes related to Anton Blanchard's new hvcall interface. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 5f77113c01d8a9f8193769d2ca73763047af39ef Author: Andrew Morton Date: Tue Oct 10 14:33:30 2006 -0700 [PATCH] ibmveth irq fix drivers/net/ibmveth.c:939: error: too many arguments to function `ibmveth_interrupt' Cc: Jeff Garzik Cc: Anton Blanchard Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6f62768344e46520ae585f3e201c9d3e497b028f Author: Michael Buesch Date: Tue Oct 10 14:33:26 2006 -0700 [PATCH] b44: fix eeprom endianess issue This fixes eeprom read on big-endian architectures. readw returns the data in CPU order. With cpu_to_le16 we convert it to little endian, because "ptr" is a pointer to a _byte_ arrray. See the cast above. A byte array is little endian. The bug is: Reading u16 values with readw, casting them into an u8 array and accessing this u8 array as an u8 (byte) array. The correct fix is to swap the CPU-ordering value returned by readw into little endian, as the u8 array is little endian. This compiles to nothing on little endian hardware (so it does not change b44 code on LE hardware), but _fixes_ code on BE hardware. Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 12f417ee95bf98cd3e42d2a771f7c6d360159b9d Author: Deepak Saxena Date: Tue Oct 10 14:33:22 2006 -0700 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 88aa0103e408616e433c209e80169ab8d6eda99e Author: Jiri Kosina Date: Wed Oct 11 01:45:31 2006 -0400 Input: serio - add lockdep annotations Signed-off-by: Jiri Kosina Acked-by: Peter Zijlstra Signed-off-by: Dmitry Torokhov commit 4dfbb9d8c6cbfc32faa5c71145bd2a43e1f8237c Author: Peter Zijlstra Date: Wed Oct 11 01:45:14 2006 -0400 Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass() This annotation makes it possible to assign a subclass on lock init. This annotation is meant to reduce the _nested() annotations by assigning a default subclass. One could do without this annotation and rely on lockdep_set_class() exclusively, but that would require a manual stack of struct lock_class_key objects. Signed-off-by: Peter Zijlstra Signed-off-by: Dmitry Torokhov commit 86255d9d0bede79140f4912482447963f00818c0 Author: Dmitry Torokhov Date: Wed Oct 11 01:44:46 2006 -0400 Input: atkbd - supress "too many keys" error message Many users seems to be annoyed by this warning so kill the message and implement a counter exported as a sysfs attribute so we still know what is going on. Make atkbd use attribute groups while we are at it. Signed-off-by: Dmitry Torokhov commit 817e6ba3623de9cdc66c6aba90eae30b5588ff11 Author: Dmitry Torokhov Date: Wed Oct 11 01:44:28 2006 -0400 Input: i8042 - supress ACK/NAKs when blinking during panic This allows using SysRq and not fill logs with complaints from atkbd. Signed-off-by: Dmitry Torokhov commit 80fc9f532d8c05d4cb12d55660624ce53a378349 Author: Dmitry Torokhov Date: Wed Oct 11 01:43:58 2006 -0400 Input: add missing exports to fix modular build Signed-off-by: Dmitry Torokhov commit 438dd926260f11ff01fc3441ac6dd4c412d20ea4 Author: Steve French Date: Wed Oct 11 03:49:30 2006 +0000 [CIFS] Fix leaps year calculation for years after 2100 Signed-off-by: Steve French commit 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 Author: Linus Torvalds Date: Tue Oct 10 17:14:44 2006 -0700 ACPI: Allow setting SCI_EN bit in PM1_CONTROL register This is needed by at least the Mac Mini's, which (incorrectly) come back from suspend with SCI_EN clear. Thanks to Frédéric Riss for hunting this down. Acked-by: Frédéric Riss Cc: Pavel Machek Cc: Len Brown Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit 0968cf51b6f2ca8a951de4b976370189cf43bbdd Author: Jeff Garzik Date: Tue Oct 10 02:58:14 2006 -0400 [PATCH] firmware/dcdbas: fix bug in error cleanup The error path path mistakenly called sysfs_create_group() rather than sysfs_remove_group(). They take the same arguments, so it's easy to cut-n-paste such a bug. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 15e541feb340bc2a4caaf707ee5ad71a47fdd068 Author: Jeff Garzik Date: Tue Oct 10 01:40:55 2006 -0400 [PATCH] irda: donauboe fixes, cleanups - fix: toshoboe_invalid_dev() was recently removed, but not all callers were updated, causing the obvious linker error. Remove caller, because the check (like the one removed) isn't used. - fix: propagate request_irq() return value - cleanup: remove void* casts - cleanup: remove impossible ASSERTs Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 Author: Al Viro Date: Sun Aug 13 15:38:04 2006 -0400 [PATCH] endianness annotations in s2io Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 44aa5359be589f9cbe9cf0d5c97e22b27a04c7d3 Author: Al Viro Date: Sun Aug 13 01:54:30 2006 -0400 [PATCH] ufs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3524de1c7953e7a22c43b9214ffc3680af6f8edb Author: Al Viro Date: Sat Dec 24 14:39:13 2005 -0500 [PATCH] fs/partitions endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d136fe7243081a45a141bb297a7b7a627ab60fa9 Author: Alexey Dobriyan Date: Wed Dec 28 22:27:10 2005 +0300 [PATCH] Finish annotations of struct vlan_ethhdr Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit d02d48d8650bf3e2011f25373dbcf87f3c19f16b Author: Al Viro Date: Sat Dec 24 14:33:09 2005 -0500 [PATCH] isofs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6ca1584173d0320f47464092eb180a17259cc3f9 Author: Al Viro Date: Sat Dec 24 14:32:38 2005 -0500 [PATCH] smbfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2ef1031282cd401b47a5f7f7477fe9ae69aff058 Author: Al Viro Date: Sat Dec 24 14:31:53 2005 -0500 [PATCH] hpfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 31b1f85b71b0b69afba89a60989097cd805f13c3 Author: Al Viro Date: Sat Dec 24 14:31:04 2005 -0500 [PATCH] fs/fat endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9721f3152bc2be6702807705902e06abdd6e3bb Author: Al Viro Date: Sat Dec 24 14:28:55 2005 -0500 [PATCH] befs: endianness annotations split the data structures that exist in host- and disk-endian variants, annotate the fields of disk-endian ones, propagate changes. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e5201c58cd81066ecd0210bcc6c02e71200040a3 Author: Al Viro Date: Sat Dec 24 03:09:03 2005 -0500 [PATCH] befs: missing fs32_to_cpu() in debug.c inode->mode is disk-endian Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1151895f8076584e061092afffb110b90cb38a68 Author: Al Viro Date: Sat Dec 24 01:32:03 2005 -0500 [PATCH] befs: introduce on-disk endian types Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit af10b0084dff530fb7232a0f8bbc4499e9c58574 Author: Al Viro Date: Sat Dec 24 01:13:13 2005 -0500 [PATCH] befs: prepare to sanitizing headers pulled includes of endian.h from fs/befs/*.c to befs.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 88c124d847d0fc60531e45323752665b01fc14f0 Author: Al Viro Date: Fri Dec 23 20:56:46 2005 -0500 [PATCH] befs: remove bogus typedef Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7359bbfd85751de23079cc26cd248635aebe840b Author: Alexey Dobriyan Date: Fri Dec 23 01:18:25 2005 +0300 [PATCH] chelsio: add endian annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d08f74e58cad8f1844f6e01636a76dd52d41bb0f Author: Alexey Dobriyan Date: Fri Dec 23 01:12:25 2005 +0300 [PATCH] serpent: fix endian warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 56052d525a05ba9e53d4f11be2d5deee64924514 Author: Alexey Dobriyan Date: Thu Dec 1 17:10:40 2005 -0500 [PATCH] cdrom: add endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 70f38912935fd4aa3fea1ddf87ed1cee63109cc5 Author: Al Viro Date: Tue Oct 10 22:49:57 2006 +0100 [PATCH] use %p for pointers Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 3c5c6658d2f1385cf06cdc00db9f7f124a35fb25 Author: Al Viro Date: Tue Oct 10 22:49:47 2006 +0100 [PATCH] use %zu for size_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 59bd59842617565b27acb0b55388363211123b9c Author: Al Viro Date: Tue Oct 10 22:49:37 2006 +0100 [PATCH] missed const in prototype Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfbdbab0634cafae2c43371396e5443cf4d5d7bc Author: Al Viro Date: Tue Oct 10 22:49:27 2006 +0100 [PATCH] net/sunrpc/auth_gss/svcauth_gss.c endianness regression Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86b95c12139785a0f4c17cb7b4cb865e7084cd34 Author: Al Viro Date: Tue Oct 10 22:49:17 2006 +0100 [PATCH] strndup() would better take size_t, not int Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5e7ddac75deaa2887e2b03441f9bed67ea8648d8 Author: Al Viro Date: Tue Oct 10 22:49:07 2006 +0100 [PATCH] ptrdiff_t is %t, not %z Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1af9892811ad3bf2abb31566bfb2ec0b5070a66a Author: Al Viro Date: Tue Oct 10 22:48:57 2006 +0100 [PATCH] cpuset ANSI prototype Signed-off-by: Al Viro Acked-by: Paul Jackson Signed-off-by: Linus Torvalds commit e6c6e640b8b258dc7f60533e81f050d15fc0a9af Author: Al Viro Date: Tue Oct 10 22:48:47 2006 +0100 [PATCH] fs/inode.c NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 663d1ba2f1f66db43ab95350f965c1d9f2e3e5bc Author: Al Viro Date: Tue Oct 10 22:48:37 2006 +0100 [PATCH] em28xx NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba674cfcbdb93cb560a4ae4d2c8b53cfbddc2d22 Author: Al Viro Date: Tue Oct 10 22:48:27 2006 +0100 [PATCH] __user annotations: loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a6ded1b0605376e18a17cb01977819bcf2677cdc Author: Al Viro Date: Tue Oct 10 22:48:17 2006 +0100 [PATCH] openprom NULL noise removal Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 03dc55064117508ad474f3eede3a77bf9fbb636f Author: Al Viro Date: Tue Oct 10 22:48:07 2006 +0100 [PATCH] trivial iomem annotations: sata_promise Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb Author: Al Viro Date: Tue Oct 10 22:47:57 2006 +0100 [PATCH] gfp annotations: radix_tree_root struct radix_tree_root has unused upper bits of ->gfp_mask reused for tags bitmap. Annotated. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fa1f5ea860af34d74c1475eddde3364e71fac15d Author: Al Viro Date: Tue Oct 10 22:47:47 2006 +0100 [PATCH] gfp annotations: scsi_error Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86f93336543314ffc46787845b631029cf11d6f8 Author: Al Viro Date: Tue Oct 10 22:47:37 2006 +0100 [PATCH] ptrace32 trivial __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 29756fa3287ff702535e459e7ca8c6038f6e9ae3 Author: Al Viro Date: Tue Oct 10 22:47:27 2006 +0100 [PATCH] trivial iomem annotations: istallion Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4370df9782a8456039cf85d2b833c2c2097f3ded Author: Al Viro Date: Tue Oct 10 22:47:17 2006 +0100 [PATCH] acpi NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e4cad1b5a4851c90c1bcf460062074a2fa10815b Author: Al Viro Date: Tue Oct 10 22:47:07 2006 +0100 [PATCH] passing pointer to setup_timer() should be via unsigned long Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba2397efe10ba728c7ff22b179e218c292227c13 Author: Al Viro Date: Tue Oct 10 22:46:57 2006 +0100 [PATCH] make kernel/relay.c __user-clean Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fb136e97840872638cb08588c4c9b9fff7f7c456 Author: Al Viro Date: Tue Oct 10 22:46:47 2006 +0100 [PATCH] fix misannotation in ioc4.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit afc12d30a74415a49a6ce36d89f82641b46c499b Author: Al Viro Date: Tue Oct 10 22:46:37 2006 +0100 [PATCH] mtd: remove several bogus casts to void * in iounmap() argument Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9f627c9df2b6a242cdc25d46f87191941cd0844 Author: Al Viro Date: Tue Oct 10 22:46:27 2006 +0100 [PATCH] ia64/sn __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfa7fd72ca03ac2324e8e469bd4b9ecc6f53394c Author: Al Viro Date: Tue Oct 10 22:46:17 2006 +0100 [PATCH] ia64/hp NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba46df984b8e8114c3cf19c51670fab084bd4196 Author: Al Viro Date: Tue Oct 10 22:46:07 2006 +0100 [PATCH] __user annotations: futex Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28c4dadd3a7221f5b9cd5c7d03c499788b193353 Author: Al Viro Date: Tue Oct 10 22:45:57 2006 +0100 [PATCH] tipc __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 47b16539e1072afd2c964b97be4a95b5cf2ff801 Author: Al Viro Date: Tue Oct 10 22:45:47 2006 +0100 [PATCH] drivers/dma trivial annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c714de5dcf41cee869c4a74e8783c6d9be459ef6 Author: Al Viro Date: Tue Oct 10 22:45:37 2006 +0100 [PATCH] devio __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cb04e6b61985d7fafcb9529e5fcff4689f0961d3 Author: Al Viro Date: Tue Oct 10 22:45:27 2006 +0100 [PATCH] hwdep_compat missed __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 04b1add1ab9121898b7d63570aad2a9c7ee9cfa3 Author: Al Viro Date: Tue Oct 10 22:45:17 2006 +0100 [PATCH] misc sata __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 98ae6ccd8e15aeac1c624615c044deecf46a359a Author: Al Viro Date: Tue Oct 10 22:45:07 2006 +0100 [PATCH] fix misannotations in loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aa7677d40072a97a861390f0ed1a8c25ce312201 Author: Al Viro Date: Tue Oct 10 22:44:57 2006 +0100 [PATCH] NULL noise removal: advansys Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 48343273e846d2612b7977f2503fd97503996fa0 Author: Al Viro Date: Tue Oct 10 22:44:47 2006 +0100 [PATCH] __iomem annotations in sunzilog Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1acc04cd4c0b54ada85d0dd5d7c5efc3441261bf Author: Al Viro Date: Tue Oct 10 22:44:37 2006 +0100 [PATCH] dccp __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 6aae8738473b7447284fe370d4e6816c02b4511b Author: Al Viro Date: Tue Oct 10 22:44:27 2006 +0100 [PATCH] drivers/s390 misc sparse annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 90cbad65911b5952a03111423347a6ab38236e0b Author: Al Viro Date: Tue Oct 10 22:44:17 2006 +0100 [PATCH] more fs/compat.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c Author: Al Viro Date: Tue Oct 10 22:44:07 2006 +0100 [PATCH] advansys __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2cbe19d48af198f0070470a2d836828de24fe163 Author: Michael S. Tsirkin Date: Mon Oct 9 18:06:32 2006 +0200 IB/mthca: Fix off-by-one in mthca SRQ creation All HCAs (not just mem-free) need a spare SRQ entry, so bump srq->max by 1 in all cases. Noted by Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 73fbe8be73512b8a3ffa3d20c9d7f531af99679c Author: Roland Dreier Date: Tue Oct 10 12:50:38 2006 -0700 IPoIB: Check for DMA mapping error for TX packets Signed-off-by: Roland Dreier commit 1031bfb93adf641436b2192170525b76e2eb25bd Author: Roland Dreier Date: Tue Oct 10 12:50:38 2006 -0700 RDMA/amso1100: Fix build with debugging off Since pr_debug() has changed from a macro to an inline function when DEBUG is not defined, its arguments now need to be defined even when debugging is off. Therefore to_event_str() and to_qp_state_str() need to be moved out of #ifdef DEBUG. The compiler will throw the definitions away if DEBUG is not defined, but it needs to be able to see that the functions exist. Signed-off-by: Roland Dreier commit 82a9c16a10521a0ceadbd27a549f6e8d5e70e0ab Author: Sean Hefty Date: Wed Oct 4 11:37:25 2006 -0700 IB/cm: Send DREP in response to unmatched DREQ Currently a DREP is only sent in response to a DREQ if a connection has been found matching the DREQ, and it is in the proper state. Once a DREP is sent, the local connection moves into timewait. Duplicate DREQs received while in this state result in re-sending the DREP. However, it's likely that the local connection will enter and exit timewait before the remote side times out a lost DREP and resends a DREQ. To handle this, we send a DREP in response to a DREQ, even if a local connection is not found. This avoids maintaining disconnected id's in timewait states for excessively long times, just to handle a lost DREP. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8575329d4f8596519d86830f622d2c30601f3ef3 Author: Sean Hefty Date: Wed Oct 4 11:29:59 2006 -0700 IB/cm: Fix timewait crash after module unload If the ib_cm module is unloaded while id's are still in timewait, the CM will destroy the work queue used to process timewait. Once the id's exit timewait, their timers will fire, leading to a crash trying to access the destroyed work queue. We need to track id's that are in timewait, and cancel their deferred work on module unload. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a8bf4e7717142b0688a726dd07501a6a7783792a Author: Jack Morgenstein Date: Wed Oct 4 13:56:34 2006 +0200 IB/mthca: Query port fix Fill in "max_vl_num" (encoded according to VLCap field in the PortInfo MAD) and "init_type_reply" values in the ib_query_port() verb. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 01cb9bcbd34b7ba768a7f05375faf43becdb8a60 Author: Ishai Rabinovitz Date: Wed Oct 4 15:28:56 2006 +0200 IB/srp: Enable multiple connections to the same target Enable multiple concurrent connections to the same SRP target: 1) Use port GUID instead of node GUID in the initiator port identifier. This allows connections to be made from multiple HCA ports at the same time. 2) Let the user specify the identifier extention when adding the device. This allows userspace to make multiple connections even from the same port, if it wants too. Without this, only one connection can be made from any given HCA, even if it has multiple ports, because we don't use multi-channel mode, so targets will only allow one connection from a given initiator port ID. Signed-off-by: Ishai Rabinovitz Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 9b0af401aae336975e620fccdd294bb763424f3f Author: Ishai Rabinovitz Date: Tue Oct 10 09:51:14 2006 -0700 IB/srp: Remove redundant memset() scsi_host_alloc() already allocates with kzalloc(), so the struct Scsi_Host is zeroed out, including the private data portion. Remove the redundant memset that zeros this out again in the SRP initiator. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit e52e6080ca10e0a8ce2a35c86965945cdfa8ed7e Author: Tom Tucker Date: Tue Oct 3 09:46:41 2006 -0500 RDMA/amso1100: Add spinlocks to serialize ib_post_send/ib_post_recv The AMSO driver was not thread-safe in the post WR code and had code that would sleep if the WR post FIFO was full. Since these functions can be called on interrupt level I changed the sleep to a udelay. Signed-off-by: Tom Tucker Signed-off-by: Roland Dreier commit 833abf7fe011c3dfe9bcab405856b73deab17062 Author: Paul Mundt Date: Tue Oct 10 18:33:10 2006 +0900 sh: Zero-out coherent buffer in consistent_alloc(). Be sure to zero out the buffer, this was causing occasional problems under heavier PCI tests. Signed-off-by: Paul Mundt commit 10270613fb4d5a44c335cfa13e9626bf5743c01d Author: Benjamin Herrenschmidt Date: Tue Oct 10 11:47:31 2006 +1000 [POWERPC] Fix windfarm platform device usage The windfarm code uses a struct device_driver instead of platform_driver, which can cause crashes if any of the callbacks are called (like on module removal). This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9f2545c11869868fd3cde7098d99e690891e442c Author: Benjamin Herrenschmidt Date: Tue Oct 10 11:45:45 2006 +1000 [POWERPC] Fix i2c-powermac platform device usage i2c-powermac was written & merged right after Russell King's changes adding platform_driver... which I missed. Thus it still used struct device, causing crashes when hitting sleep/wakeup callbacks (it happened to work by luck so far, until early/late callbacks got added). This causes crashes on sleep/wakeup on PowerBooks with 2.6.19. The patch fixes it by using a proper platform_driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d6a29252ad120457cd544d44b2fbea46a00734a7 Author: Paul Mackerras Date: Tue Oct 10 13:51:00 2006 +1000 [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs On the old "powersurge" SMP powermacs, the second CPU is started up by sending it an IPI, which has the side effect of stopping the timebase clock (so the secondary CPU's timebase can be synchronized with the primary's). The routine that did this used udelay, which will hang forever when the timebase is stopped, since udelay now spins until the timebase reaches a certain value. The end result is that the kernel would hang when bringing up the second CPU. This fixes it by using a simple loop which just does a fixed number of iterations to generate the delay. These old systems were all clocked at around 200 MHz or so, so a fixed number of iterations is acceptable. Signed-off-by: Paul Mackerras commit ebf7a227dd1d810203a19642655d2fa293f395dd Author: Nick Piggin Date: Tue Oct 10 04:36:54 2006 +0200 [PATCH] mm: bug in set_page_dirty_buffers This was triggered, but not the fault of, the dirty page accounting patches. Suitable for -stable as well, after it goes upstream. Unable to handle kernel NULL pointer dereference at virtual address 0000004c EIP is at _spin_lock+0x12/0x66 Call Trace: [<401766e7>] __set_page_dirty_buffers+0x15/0xc0 [<401401e7>] set_page_dirty+0x2c/0x51 [<40140db2>] set_page_dirty_balance+0xb/0x3b [<40145d29>] __do_fault+0x1d8/0x279 [<40147059>] __handle_mm_fault+0x125/0x951 [<401133f1>] do_page_fault+0x440/0x59f [<4034d0c1>] error_code+0x39/0x40 [<08048a33>] 0x8048a33 Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 39e3eb7265b8698e5f607a317af13c9478274736 Author: Al Viro Date: Mon Oct 9 12:48:42 2006 +0100 [POWERPC] ARCH=ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Paul Mackerras commit 8de242e60a441f177dd51b323894b17d3d63e9f2 Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:28:59 2006 +1000 [POWERPC] Update maple defconfig This updates the Maple defconfig to 4 CPUs (along with current defaults) to support the "tigerwood" 970MP evaluation board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 1e1b20a119ac45a290bbc6261f69a2a6a2cc064a Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:27:28 2006 +1000 [POWERPC] Fix Maple secondary IDE interrupt The IDE driver will pick up the PCI IRQ for both channels on Maple despite the fact that it's in legacy mode. This works around it by "hiding" the PCI IRQ of the AMD8111 IDE controller when it's configured in legacy mode on the Maple platform, thus causing the driver to call pci_get_legacy_ide_irq() which will return the correct interrupts for both channels. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c10af8c38da7a0bc9010d6609237c1ab6d2da12c Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:25:15 2006 +1000 [POWERPC] Make U4 PCIe work on maple The Maple support code was missing code for U4/CPC945 PCIe. This adds it, enabling it to work on tigerwood boards, and possibly also js21 using SLOF. Also disable an obsolete firmware workaround. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 020533ef24309803789ab8b325b1a6463388decf Author: Geoff Levand Date: Sat Oct 7 15:33:53 2006 -0700 [POWERPC] cell: fix default zImage build target Change CONFIG_PPC_CELL to CONFIG_PPC_IBM_CELL_BLADE in the powerpc boot makefile. CONFIG_PPC_CELL is used to build the generic cell processor support, and is not an indication of platform. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit dcf9065122660f4e3df02a47a75dc702d5531244 Author: Michael Ellerman Date: Sat Sep 30 11:54:09 2006 +1000 [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces My CROSS_COMPILE is "ccache /opt/compilers/blah", which confuses the boot wrapper script. Quote CROSS_COMPILE and CROSS32_COMPILE so they can safely contain spaces. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f583ffce1aac783fd16d5d75cd69ac5ebb8f4933 Author: Paul Mackerras Date: Tue Oct 10 11:47:07 2006 +1000 [POWERPC] Fix xmon IRQ handler for pt_regs removal Signed-off-by: Paul Mackerras commit 078830eaa8abccd1e95d3effce5b29273bb5ed09 Author: Martin Habets Date: Mon Oct 9 18:10:16 2006 -0700 [SPARC32]: Fix prom.c build warning Fix these 2.6.19-rc1 build warnings: CC arch/sparc/kernel/prom.o arch/sparc/kernel/prom.c: In function `of_set_property': arch/sparc/kernel/prom.c:246: warning: passing arg 2 of `prom_setprop' discards qualifiers from pointer target type arch/sparc/kernel/prom.c: In function `build_one_prop': arch/sparc/kernel/prom.c:446: warning: unused variable `len' arch/sparc/kernel/prom.c:480: warning: ignoring return value of `prom_getproperty', declared with attribute warn_unused_result Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 79bf06248b69b937f3a917281b4a8520a66c7582 Author: David S. Miller Date: Thu Oct 5 02:08:59 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4b75eb2bd30707c1af76145fd3a4ec2d890e1870 Author: David S. Miller Date: Thu Oct 5 02:07:32 2006 -0700 [SPARC64]: Fix of_device bus_id settings. They have to be unique system-wide, so use "NAME@NODE" as the string pattern of the non-root nodes. Thanks to Andrew Morton for fixing the error value checking in bus_add_device() which made this problem finally noticable. Signed-off-by: David S. Miller commit 99ae1c83b5107cd91e45d4d3c7bf096cdff0cf06 Author: David S. Miller Date: Wed Oct 4 17:31:00 2006 -0700 [SPARC64]: Update MAINTAINERS entry. ultralinux@vger is deprecated, folks should use sparclinux@vger for both sparc ports. Eddie, Anton, and Jakub haven't been active in sparc64 maintainence for years, so best to remove them as reports do nothing more than fill up their mailboxes :) Signed-off-by: David S. Miller commit b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 Author: Dave Jones Date: Mon Oct 9 19:13:51 2006 -0400 [HEADERS] Put linux/config.h out of its misery. Signed-off-by: Dave Jones commit e04582b7bc70b40c57287cdc24f81964ee88f565 Author: Atsushi Nemoto Date: Mon Oct 9 00:10:01 2006 +0900 [MIPS] Make sure cpu_has_fpu is used only in atomic context Make sure cpu_has_fpu (which uses smp_processor_id()) is used only in atomic context. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f5c70dd7f384db4c524c35288d9be3ed61ac41a9 Author: Atsushi Nemoto Date: Sun Aug 20 22:55:52 2006 +0900 [MIPS] Fix build errors related to wbflush.h on tx4927/tx4938. TX49 CPUs have a SYNC instruction so that CONFIG_CPU_HAS_WB is no longer needed. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5536b2351425136e629bd9fc18135c6e21e125c2 Author: Ralf Baechle Date: Mon Oct 9 16:34:41 2006 +0100 [MIPS] Alchemy: nuke usbdev; it's useless as is ... Signed-off-by: Ralf Baechle commit 0118c3ca9e7518b06a10e9d7f4bd15957df45783 Author: Ralf Baechle Date: Mon Jun 5 11:54:41 2006 +0100 [MIPS] Malta: Fix build for non-MIPS32/64 configuration. Signed-off-by: Ralf Baechle commit 12a0a703b3f07e5b01c81fe4f5d2a221c9318f16 Author: Ralf Baechle Date: Mon Oct 9 23:20:47 2006 +0100 [RTC] Consistently use of tabs for formatting. commit 0e8f8f54c1537d22eb0168622a5f6aef4040da6a Author: Ralf Baechle Date: Sat Jul 8 01:07:40 2006 +0200 [MIPS] NUMA: Register all nodes before cpus or sysfs will barf. Signed-off-by: Ralf Baechle commit 18965513fdc3af976f000f231ee216500d707c11 Author: Ralf Baechle Date: Mon Oct 9 23:20:46 2006 +0100 [MIPS] qtronix: remove driver. Another leftover of removing support for the ITE8172. Signed-off-by: Ralf Baechle commit f431baa55abf8adeed0c718b51deacbc151f58f1 Author: Atsushi Nemoto Date: Mon Oct 9 01:24:23 2006 +0900 [MIPS] ret_from_irq adjustment Make sure that RA on top of interrupt stack is an address of ret_from_irq, so that dump_stack etc. can trace info interrupted context. Also this patch fixes except_vec_vi_handler and __smtc_ipi_vector which seems broken. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 441ee341ad63572f39cb8074e31806b5b1471d0b Author: Ralf Baechle Date: Fri Jun 2 11:48:11 2006 +0100 [MIPS] Fix RM9000 wait instruction detection. Only revisions < 4.0 don't have a functional wait instruction. From Thomas Koeller (Thomas.Koeller@baslerweb.com). Signed-off-by: Ralf Baechle commit 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 Author: Geert Uytterhoeven Date: Mon Oct 9 22:27:42 2006 +0200 [PATCH] m68k/MVME167: SERIAL167 tty flip buffer updates Compile fixes related to changed tty flip buffer handling. Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit ea62aa1b6f6d31b53a34a6f5271ed85735ccc0bc Author: Geert Uytterhoeven Date: Mon Oct 9 22:27:42 2006 +0200 [PATCH] m68k/MVME167: SERIAL167 is no longer broken - SERIAL167 is no longer broken - Removed some unused variables from the driver to fix compiler warnings Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 2ed0ce5b57950a620155433c62a5a02a067f1376 Author: Geert Uytterhoeven Date: Mon Oct 9 22:23:56 2006 +0200 [PATCH] m68k/Apollo: Remove obsolete arch/m68k/apollo/dma.c Remove unused arch/m68k/apollo/dma.c, which was obsoleted by the move to the generic DMA API. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 69961c375288bdab7604e0bb1c8d22999bb8a347 Author: Geert Uytterhoeven Date: Mon Oct 9 22:23:31 2006 +0200 [PATCH] m68k/Atari: Interrupt updates Misc Atari fixes: - initialize correct number of atari irqs - silence vbl interrupt until it's used by atafb - use mdelay() to read clock if necessary Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da96d0b58adddf3bdeaa9644ac74f0dcc9039407 Author: Geert Uytterhoeven Date: Mon Oct 9 22:22:37 2006 +0200 [PATCH] m68k/HP300: Enable HIL configuration options Enable HIL configuration options on HP300 Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6fb8296aa1681e74b2aa3c59169d9014e6a0dfc3 Author: Geert Uytterhoeven Date: Mon Oct 9 22:02:31 2006 +0200 [PATCH] m68k: more syscall updates Add missing syscalls Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6aabd6af4aaf6d794f67226934ad731eb1765e5d Author: Geert Uytterhoeven Date: Mon Oct 9 22:02:25 2006 +0200 [PATCH] m68k: syscall updates Add some missing system calls (recent udev needs them) Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d3696cf7370583b272ff2f09524c9d37a83c71b2 Author: Eric W. Biederman Date: Sun Oct 8 23:41:59 2006 -0600 [PATCH] x86_64 irq: Scream but don't die if we receive an unexpected irq Due to code bugs or misbehaving hardware it is possible that we can receive an interrupt that we have not mapped into a linux irq. Calling BUG when that happens is very rude, and if the problem is mild enough prevents anything else from getting done. So instead of calling BUG just scream loudly about the problem and continue running. We don't have enough knowledge to know which interrupt triggered this behavior so we don't acknowledge it. This will likely prevent a recurrence of the problem by jamming up the works with an unacknowledged interrupt. If the interrupt was something important it is quite possible that nothing productive will happen past this point. But it is now at least possible to keep working if the kernel can survive without the interrupt we dropped on the floor. Solutions like irqpoll should generally make dropped irqs non-fatal. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 659564c8adfe1765476beee8d55cd18986946892 Author: Bill Nottingham Date: Mon Oct 9 16:10:48 2006 -0400 [PATCH] Introduce vfs_listxattr This patch moves code out of fs/xattr.c:listxattr into a new function - vfs_listxattr. The code for vfs_listxattr was originally submitted by Bill Nottingham to Unionfs. Sorry about that. The reason for this submission is to make the listxattr code in fs/xattr.c a little cleaner (as well as to clean up some code in Unionfs.) Currently, Unionfs has vfs_listxattr defined in its code. I think that's very ugly, and I'd like to see it (re)moved. The logical place to put it, is along side of all the other vfs_*xattr functions. Overall, I think this patch is benefitial for both kernel.org kernel and Unionfs. Signed-off-by: Josef "Jeff" Sipek Acked-by: Al Viro Signed-off-by: Linus Torvalds commit e069d79d23739977800c3b8495853b735f77ef30 Author: Al Viro Date: Mon Oct 9 20:29:43 2006 +0100 [PATCH] tifm __iomem annotations, NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97c4965d970587a1cc4264c1cffbf0ea9c1e35e8 Author: Al Viro Date: Mon Oct 9 20:29:03 2006 +0100 [PATCH] mos7840 annotations __user annotations, NULL noise removal, %p use for pointers Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5a42b81f03b756116f982e72838bc358bc4e460f Author: Al Viro Date: Mon Oct 9 20:28:03 2006 +0100 [PATCH] s390 traps.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c8adf94a4806b4ae49a3057d434471a0b01096e3 Author: Al Viro Date: Mon Oct 9 20:26:58 2006 +0100 [PATCH] hppfs: readdir callback missed in prototype change Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 38d6fd26ea7f291141039fe340a581dc6f770fc0 Author: Al Viro Date: Mon Oct 9 20:27:30 2006 +0100 [PATCH] dlm gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5c09d96b34ac9b95ab4606e51ddb34ed0f19faf1 Author: Al Viro Date: Mon Oct 9 20:24:49 2006 +0100 [PATCH] wrong order of arguments in copy_to_user() in ncpfs Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dc42f9e037e5fb7b01c1334b7752b9355f5293a Author: Al Viro Date: Mon Oct 9 16:26:47 2006 +0100 [PATCH] mv64630_pic NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7c84ace9bcd90e38ebf88b304a8ed4fed7ff3574 Author: Al Viro Date: Mon Oct 9 16:23:09 2006 +0100 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Signed-off-by: Al Viro Acked-by: Olof Johansson Signed-off-by: Linus Torvalds commit f3d2ab41b5e2dfb2fc8679b786476327cea2f249 Author: Al Viro Date: Mon Oct 9 16:22:09 2006 +0100 [PATCH] extern doesn't make sense on a definition of function... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a23b7cb998f18101f9b0f505d81e6c68a7830a05 Author: Al Viro Date: Mon Oct 9 12:47:31 2006 +0100 [PATCH] more ia64 irq handlers Cast to (void *) in request_irq() argument is stupid and only hides problems... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 041a6baec5a9260ad8b71c43a7ea1de95dfa974c Author: Al Viro Date: Mon Oct 9 12:46:52 2006 +0100 [PATCH] fallout from alpha pt_regs patches missed irq handler in sys_titan and forgotten prototype update. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 63540ba3691600759c6732f800dcf0fe8075960b Author: Al Viro Date: Mon Oct 9 11:51:14 2006 +0100 [PATCH] sparc64 irq pt_regs fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 73f5e28b336772c4b08ee82e5bf28ab872898ee1 Author: Andrew Morton Date: Mon Oct 9 21:58:54 2006 +0200 r8169: PCI ID for Corega Gigabit network card Fix for http://bugzilla.kernel.org/show_bug.cgi?id=7239. Signed-off-by: Andrew Morton Signed-off-by: Francois Romieu commit 40220c1a192f51695f806d75b1f9970f0f17a6e8 Author: David Howells Date: Mon Oct 9 12:19:47 2006 +0100 IRQ: Use the new typedef for interrupt handler function pointers Use the new typedef for interrupt handler function pointers rather than actually spelling out the full thing each time. This was scripted with the following small shell script: #!/bin/sh egrep -nHrl -e 'irqreturn_t[ ]*[(][*]' $* | while read i do echo $i perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $? done Signed-Off-By: David Howells commit 58ba81dba77eab43633ea47d82e96245ae3ff666 Author: Al Viro Date: Mon Oct 9 02:11:47 2006 +0100 [PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1622605cf6e15bfdc55a3dc78b792018edded435 Author: Al Viro Date: Mon Oct 9 02:09:49 2006 +0100 [PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 832504933757ba7913bf64cd574326e014215b41 Author: Linus Torvalds Date: Sun Oct 8 17:28:25 2006 -0700 Fix extraneous '&' in recent NFS client cleanup We should pass "wait_event_interruptible()" the wait-queue itself, not the pointer to it. The magic macro will pointerize it internally. Signed-off-by: Linus Torvalds commit 7bea96fd22a8fd19f90817405b4abe032317a0e3 Author: Al Viro Date: Sun Oct 8 22:49:34 2006 +0100 [PATCH] uml pt_regs fixes Real fix for UML pt_regs stuff. Note set_irq_regs() logics in there... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27f768192fe2d96936cef5d4713e228daee07ae2 Author: Ralf Baechle Date: Mon Oct 9 00:03:05 2006 +0100 [MIPS] Cleanup unnecessary inclusions. Signed-off-by: Ralf Baechle commit 6dab2f4564b3dc8747452e256fb779f320ff5650 Author: Ralf Baechle Date: Mon Oct 9 00:00:31 2006 +0100 [MIPS] DEC: pt_regs fixes for buserror handlers Signed-off-by: Ralf Baechle commit 65542070de7d6cd307657a71ab1712a6c58c0889 Author: Ralf Baechle Date: Sun Oct 8 23:56:13 2006 +0100 [MIPS] Fix return type of gt64120_irq. Signed-off-by: Ralf Baechle commit d864b96bb08f88d000cf8f78b5bac93fe631d0f5 Author: Ralf Baechle Date: Sun Oct 8 21:32:40 2006 +0100 [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. Signed-off-by: Ralf Baechle commit de4f742b96f286ac20c04dd9c53897a05b412843 Author: Ralf Baechle Date: Sun Oct 8 20:50:12 2006 +0100 [MIPS] Jazz defconfig file. Signed-off-by: Ralf Baechle commit 06e80113c765119e73394a5878c137f2d09a4dcd Author: Ralf Baechle Date: Sun Oct 8 19:35:00 2006 +0100 [MIPS] Jazz: build fix - include Signed-off-by: Ralf Baechle commit 3bdcdd681b64fa92934039ff0d217414720a4b1e Author: Ralf Baechle Date: Sun Oct 8 19:28:44 2006 +0100 [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) Signed-off-by: Ralf Baechle commit 2cf69e765a99baacf0121f3312ec84ff1031961d Author: Ralf Baechle Date: Sun Oct 8 19:19:11 2006 +0100 [MIPS] Jazz: Fix I/O port resources. struct resource members were shuffeled a while ago. Signed-off-by: Ralf Baechle commit d62801e961e148313910ec430e230e488fadc196 Author: Ralf Baechle Date: Sun Oct 8 17:38:18 2006 +0100 [MIPS] DEC: pt_regs fixes for dec_intr_halt. Signed-off-by: Ralf Baechle commit b104189c203a47219e51ab179e50fd0c73ccea3b Author: Ralf Baechle Date: Mon Oct 9 00:15:27 2006 +0100 handle_sysrq lost its pt_regs * argument Signed-off-by: Ralf Baechle commit e24bb60e11e3fe9858b71874a4ac59333adbc4fc Author: Linus Torvalds Date: Sun Oct 8 15:38:22 2006 -0700 Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" This reverts commit 41550c5128150175197257b6ceab2cd50dea7b51. Quoth Ben Herrenschmidt: "Please revert this one for now. It seems to break G5s :( Looks like PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set. I need to figure out a better fix." Signed-off-by: Linus Torvalds commit 0bae89ec8b1519dae67036637942f5b5bbaa9424 Author: Trond Myklebust Date: Sun Oct 8 14:33:24 2006 -0400 [PATCH] NFS: Fix typo in nfs_get_client() Commit ca4aa09635516258f158a7bc1594a794e4c34864 fixed waiting for the structure to get initialised, but it is also possible to break out of the loop while still in TASK_INTERRUPTIBLE. Replace the whole thing by wait_event_interruptible, which is much more readable, and doesn't suffer from these problems. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit cb1055fb1b79775d398038ad8dcd2c7581f141d8 Author: Al Viro Date: Sun Oct 8 15:08:45 2006 +0100 [PATCH] linux/io.h needs types.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9288d1a3c7ed0abaa7976844e5d42bbd4fa0eae3 Author: Al Viro Date: Sun Oct 8 15:05:14 2006 +0100 [PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a8f47c45aee6efa5ef7ec209b90681b091bd3d2c Author: Al Viro Date: Sun Oct 8 15:04:15 2006 +0100 [PATCH] missing include of scatterlist.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97432886617825d412bcedadf5e5b308f931caad Author: Al Viro Date: Sun Oct 8 15:01:14 2006 +0100 [PATCH] missing include in pdaudiocf_irq Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9da3b1ad7b074effd56729f9fc01cc5abf6503cc Author: Al Viro Date: Sun Oct 8 15:00:44 2006 +0100 [PATCH] misc ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28431146993e0ab3a2a592af8541543fe0cc2c8e Author: Al Viro Date: Sun Oct 8 15:00:12 2006 +0100 [PATCH] misc arm pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5dcded1b0b4f1537bb6dff453fb805517756c94b Author: Al Viro Date: Sun Oct 8 14:59:19 2006 +0100 [PATCH] missed ia64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 Author: Al Viro Date: Sun Oct 8 14:45:28 2006 +0100 [PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs() titan_dispatch_irqs() always gets get_irq_regs() as argument; kill the argument and collapse set_irq_regs() in body. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 Author: Al Viro Date: Sun Oct 8 14:44:38 2006 +0100 [PATCH] alpha pt_regs cleanups: machine_check() do set_irq_regs() in caller, kill pt_regs argument. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3dbb8c62897f96bbf5d4e4fe649e5d3791fc33c5 Author: Al Viro Date: Sun Oct 8 14:37:32 2006 +0100 [PATCH] alpha pt_regs cleanups: handle_irq() isa_no_iack_sc_device_interrupt() always gets get_irq_regs() as argument; kill that argument. All but two callers of handle_irq() pass get_irq_regs() as argument; convert the remaining two, kill set_irq_regs() inside handle_irq(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7ca56053b29633ef08b14e5ca16c663363edac36 Author: Al Viro Date: Sun Oct 8 14:36:08 2006 +0100 [PATCH] alpha pt_regs cleanups: device_interrupt callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument removed, remaining uses of regs in instances of ->device_interrupt() are switched to get_irq_regs() and will be gone in the next patch. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 Author: Al Viro Date: Sun Oct 8 14:33:33 2006 +0100 [PATCH] m68k pt_regs fixes, part 2 Fallout from previous patch: - actually add include/asm-m68k/irq_regs.h - missed the prototype of sun3_sched_init() NB: git diff without argumentgs sucks when you've added some files... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7a39f52202a70ff6834e37053e2ee55c7d351621 Author: Al Viro Date: Sun Oct 8 14:32:15 2006 +0100 [PATCH] sparc32 rwlock fix read_trylock() is broken on sparc32 (doesn't build and didn't work right, actually). Proposed fix: - make "writer holds lock" distinguishable from "reader tries to grab lock" - have __raw_read_trylock() try to acquire the mutex (in LSB of lock), terminating spin if we see that there's writer holding it. Then do the rest as we do in read_lock(). Thanks to Ingo for discussion... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6d24c8dc2e656b02807aa0506405727d34c0376c Author: Al Viro Date: Sun Oct 8 08:23:28 2006 -0400 [PATCH] sparc64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0d84438d98777b0f9425d39121c42f47a06878ca Author: Al Viro Date: Sun Oct 8 14:30:44 2006 +0100 [PATCH] sparc32 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c7111c1318ee8890f385813f232fdb32643e2653 Author: Eric W. Biederman Date: Sun Oct 8 07:47:55 2006 -0600 [PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat. The problem we can't take advantage of lowest priority delivery mode if the vectors are allocated for only one cpu at a time. Nor can we work around hardware that assumes lowest priority delivery mode is always used with several cpus. So this patch introduces the concept of a vector_allocation_domain. A set of cpus that will receive an irq on the same vector. Currently the code for implementing this is placed in the genapic structure so we can vary this depending on how we are using the io_apics. This allows us to restore the previous behaviour of genapic_flat without removing the benefits of having separate vector allocation for large machines. This should also fix the problem report where a hyperthreaded cpu was receving the irq on the wrong hyperthread when in logical delivery mode because the previous behaviour is restored. This patch properly records our allocation of the first 16 irqs to the first 16 available vectors on all cpus. This should be fine but it may run into problems with multiple interrupts at the same interrupt level. Except for some badly maintained comments in the code and the behaviour of the interrupt allocator I have no real understanding of that problem. Signed-off-by: Eric W. Biederman Acked-by: Muli Ben-Yehuda Signed-off-by: Linus Torvalds commit b940d22d58c41b2ae491dca9232850f6f38f3653 Author: Eric W. Biederman Date: Sun Oct 8 07:43:46 2006 -0600 [PATCH] i386/x86_64: Remove global IO_APIC_VECTOR Which vector an irq is assigned to now varies dynamically and is not needed outside of io_apic.c. So remove the possibility of accessing the information outside of io_apic.c and remove the silly macro that makes looking for users of irq_vector difficult. The fact this compiles ensures there aren't any more pieces of the old CONFIG_PCI_MSI weirdness that I failed to remove. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 7da5d406792eedb5341a8c20296470b2e67743e7 Author: Eric W. Biederman Date: Sun Oct 8 07:41:19 2006 -0600 [PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number In commit ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b I removed the weird logic that used the vector number as the irq number when MSI was defined. However pci_enable_irq was using a different test in the io_apic_assign_irqs path and I missed it :( This patch removes the wrong code so no one hits this problem. This code is only active when a specific set of boot command line parameters is specified which likely explains why no one has notices this earlier. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit ca4aa09635516258f158a7bc1594a794e4c34864 Author: Trond Myklebust Date: Sun Oct 8 14:33:24 2006 -0400 [PATCH] NFS: Fix typo in nfs_get_client() NFS_CS_INITING > NFS_CS_READY, so instead of waiting for the structure to get initialised, we currently immediately jump out of the loop without ever sleeping. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit a8edd74e4404d011ab821d5bf35b27335d26f001 Author: Wim Van Sebroeck Date: Sun Oct 8 21:05:21 2006 +0200 [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2) Add ICH8 support to the iTCO_wdt driver. Signed-off-by: Wim Van Sebroeck commit bcbf25bd0d4afb108a755e1c4e4e2d854a2869d7 Author: Arnaud Patard (Rtp) Date: Wed Oct 4 14:18:29 2006 +0200 [WATCHDOG] add ich8 support to iTCO_wdt.c Add ICH8 support to the iTCO_wdt driver. Signed-off-by: Arnaud Patard Signed-off-by: Wim Van Sebroeck commit b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 Author: Stefan Richter Date: Fri Oct 6 19:49:52 2006 +0200 ieee1394: nodemgr: fix startup of knodemgrd Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c: When knodemgrd starts, it needs to sleep until host->generation was incremented above its initial value of 0. My wrong logic caused it to start sending requests when the bus wasn't completely ready. Seen as "AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1. Signed-off-by: Stefan Richter commit f1d08f71974dcf68ce4510a2dfaeb798b05df2c0 Author: Yoichi Yuasa Date: Sat Oct 7 13:41:51 2006 +0900 [MIPS] Fix DECserial build error by IRQ hander change Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 937a801576f954bd030d7c4a5a94571710d87c0b Author: Ralf Baechle Date: Sat Oct 7 19:44:33 2006 +0100 [MIPS] Complete fixes after removal of pt_regs argument to int handlers. Signed-off-by: Ralf Baechle commit 31aa36658a123263a9a69896e348b9600e050679 Author: Karl-Johan Karlsson Date: Sun Oct 8 01:15:02 2006 +0200 [MIPS] Show actual CPU information in /proc/cpuinfo Currently, /proc/cpuinfo contains several copies of the information for whatever processor we happen to be scheduled on. This patch makes it contain the proper information for each CPU, which is particularly useful on mixed R12k/R10k IP27 machines. Signed-off-by: Karl-Johan Karlsson Signed-off-by: Ralf Baechle commit 5c90d528b21cb9506713f92730f33246b80ecc25 Author: Scott Ashcroft Date: Fri Oct 6 16:54:54 2006 +0100 [MIPS] Cobalt: Time runs too quickly A kernel built with HZ==250 runs about 4 four times too quickly on a Cobalt RaQ2. Signed-off-by: Scott Ashcroft Signed-off-by: Ralf Baechle commit 59d6ab86a6b1097d5e5eae5d820f8e2661009324 Author: Ralf Baechle Date: Fri Oct 6 17:36:20 2006 +0100 [MIPS] Update Malta config. Signed-off-by: Ralf Baechle commit e34477e9906acc137329b654a51fb7d4598813f7 Author: Amol Lad Date: Fri Oct 6 13:41:12 2006 -0700 [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c 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: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 Author: Al Viro Date: Sat Oct 7 16:29:18 2006 +0100 [PATCH] m32r pt_regs fixes ... and now with irq_regs.h not forgotten... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8774cb815f2492a95b90a927f93a2de555753b32 Author: Al Viro Date: Sat Oct 7 14:17:31 2006 +0100 [PATCH] minimal alpha pt_regs fixes Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 2850bc273776cbb1b510c5828e9e456dffb50a32 Author: Al Viro Date: Sat Oct 7 14:16:45 2006 +0100 [PATCH] m68k pt_regs fixes m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 00079e04fe478cd3c59ae2106ef2fbe779e67024 Author: Eric Eric Sesterhenn Date: Fri Oct 6 22:19:45 2006 -0700 [PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block null pointer dereferencing in reiserfs_read_bitmap_block. Signed-off-by: Alexander Zarochentsev Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c339d4541995df2fd3ca31a84c042e7afe9b3c1 Author: Rafael J. Wysocki Date: Fri Oct 6 22:19:44 2006 -0700 [PATCH] swsusp: Make userland suspend work on SMP again Unfortunately one of the recent changes in swsusp has broken the userland suspend on SMP. Fix it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcbd4ec4c258f88d4cfd3c309c8a56faff061340 Author: Christoph Lameter Date: Fri Oct 6 22:19:44 2006 -0700 [PATCH] slab: remove wrongly placed BUG_ON Init list is called with a list parameter that is not equal to the cachep->nodelists entry under NUMA if more than one node exists. This is fully legitimatei. One may want to populate the list fields before switching nodelist pointers. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 Author: Olaf Hering Date: Fri Oct 6 23:06:48 2006 +0200 [POWERPC] PReP fixup after irq changes Compile fixes for PReP in ARCH=ppc. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit f5a924581a4e7b9bc29a49ee1397dcaaacd5f25f Author: Olaf Hering Date: Fri Oct 6 22:52:16 2006 +0200 [POWERPC] SPU fixup after irq changes Remove struct pt_regs * from remaining spu irq functions. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 35a84c2f56e0f77ea2c5a4327b17104705f4c8c7 Author: Olaf Hering Date: Sat Oct 7 22:08:26 2006 +1000 [POWERPC] Fix up after irq changes Remove struct pt_regs * from all handlers. Also remove the regs argument from get_irq() functions. Compile tested with arch/powerpc/config/* and arch/ppc/configs/prep_defconfig Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit c7753f18711782738936f224aaa421468e87f6ed Author: Matthew Wilcox Date: Sat Oct 7 06:01:11 2006 -0600 [PARISC] More pt_regs removal Remove pt_regs from ipi_interrupt and timer_interrupt. Inline smp_do_timer() into its only caller, and unify the SMP and non-SMP paths. Fixes a profiling bug. Signed-off-by: Matthew Wilcox commit bbd6330ea1154fc13a351263160d4f9cca2ff5d9 Author: Matthew Wilcox Date: Fri Oct 6 23:45:09 2006 -0400 [PARISC] pdc_init no longer exists Just a stale prototype Signed-off-by: Matthew Wilcox commit 09690b18b7b9696bb719b246e77c7af9952da12c Author: Kyle McMartin Date: Thu Oct 5 23:45:45 2006 -0400 [PARISC] Make firmware calls irqsafe-ish... There's no reason why we shouldn't be using _irqsave instead of _irq for any of these calls. fwiw, this fixes the "start_kernel(): bug: interrupts were enabled early" message displayed on bootup recently. Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox commit ba0e427f215b1c58881a737f46d30ae03b83178c Author: Matthew Wilcox Date: Wed Oct 4 22:57:28 2006 -0600 [PA-RISC] Fix boot breakage Conditionals were the wrong way around. Turns out I was booting the wrong kernel when testing the original fix. Signed-off-by: Matthew Wilcox commit e11e30a063b515e95fb590f1558b5fea21273c63 Author: Matthew Wilcox Date: Sat Oct 7 05:11:07 2006 -0600 [PARISC] Use set_irq_regs Actually set the irq_regs pointer. Signed-off-by: Matthew Wilcox commit be577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 Author: Matthew Wilcox Date: Fri Oct 6 20:47:23 2006 -0600 Build fixes for struct pt_regs removal Signed-off-by: Matthew Wilcox commit 1224f373c974eacc46fe5e1073422c794d0b0d34 Author: Stephen Rothwell Date: Fri Oct 6 13:55:26 2006 +1000 [POWERPC] Fix iseries/smp.c for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 27db2d0cb9b56210dc1e29bc89a7413f3ae67b91 Author: Stephen Rothwell Date: Fri Oct 6 13:54:28 2006 +1000 [POWERPC] Fix viocons for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b75f3f751c17e01544bd6706e54efae35d66d446 Author: Stephen Rothwell Date: Fri Oct 6 13:53:12 2006 +1000 [POWERPC] Update iseries_defconfig This make sure that an iseries_defconfig does not inlude other platforms. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 2b00b254debd707571f20149dbd4b45264a120e5 Author: Olof Johansson Date: Thu Oct 5 21:16:48 2006 -0500 [POWERPC] Fix fsl_soc build breaks Hrm, there's no way this ever built at time of merge. There's a missing } and the wrong type on phy_irq. Also, another const for get_property(). CC arch/powerpc/sysdev/fsl_soc.o arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init': arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq' arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init' arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1 Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 268f3be177ce93791da38facc34126b5038cd851 Author: Steve French Date: Fri Oct 6 21:47:09 2006 +0000 [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers Signed-off-by: Steve French commit d150ad7bd946f066c98a9725685109dcffae0cba Author: Andrew Morton Date: Fri Oct 6 13:28:09 2006 -0700 [PATCH] x86_64 irq_regs fix smp_apic_timer_interrupt() needs to stack the pt_regs* for profile_tick. If any other of those APIC interrupt handlers want to run get_irq_regs() then their C entrypoint handlers will need the same treatment. Cc: Andi Kleen Cc: David Howells Signed-off-by: Andrew Morton Acked-by: Andrew Vasquez Signed-off-by: Linus Torvalds commit e630015504cdd4d166c371fec39b8ca258fcbc0e Author: Linus Torvalds Date: Fri Oct 6 13:11:15 2006 -0700 ARM: fix up nested irq regs usage This should fix up the per-cpu irq register pointer if we have nested hardware interrupts. Signed-off-by: Linus Torvalds commit e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 Author: Frederik Deweerdt Date: Fri Oct 6 18:58:24 2006 +0000 [PATCH] ixp4xxdefconfig arm fixes With the following patch, the ixp4xxdefconfig builds correctly. I'll test some more configs if I get some time. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit b7696ee3c050a76a6cebccdbadfc93896b336e44 Author: Olaf Hering Date: Fri Oct 6 20:53:10 2006 +0200 [PATCH] fix mesh compile errors after irq changes drivers/scsi/mesh.c:469: error: too many arguments to function 'mesh_interrupt' drivers/scsi/mesh.c:507: error: too many arguments to function 'mesh_interrupt' Signed-off-by: Olaf Hering Signed-off-by: Linus Torvalds commit d87dbede030d17770aa6a6170e70ab6f8044e5ae Author: Jeff Garzik Date: Fri Oct 6 15:04:35 2006 -0400 drivers/isdn/act2000: kill irq2card_map Eliminate irq->card lookup table, by properly passing the card pointer via request_irq() like other drivers. Signed-off-by: Jeff Garzik commit 8f4aff6cb178b0a580ee206e7cca63e2d31f4a4e Author: Jeff Garzik Date: Fri Oct 6 15:03:04 2006 -0400 drivers/net/eepro: kill dead code The irq2dev_map has not been used for a long time. Signed-off-by: Jeff Garzik commit c7bec5aba52392aa8d675b8722735caf4a8b7265 Author: Jeff Garzik Date: Fri Oct 6 15:00:58 2006 -0400 Various drivers' irq handlers: kill dead code, needless casts - Eliminate casts to/from void* - Eliminate checks for conditions that never occur. These typically fall into two classes: 1) Checking for 'dev_id == NULL', then it is never called with NULL as an argument. 2) Checking for invalid irq number, when the only caller (the system) guarantees the irq handler is called with the proper 'irq' number argument. Signed-off-by: Jeff Garzik commit c31f28e778ab299a5035ea2bda64f245b8915d7c Author: Jeff Garzik Date: Fri Oct 6 14:56:04 2006 -0400 drivers/net: eliminate irq handler impossible checks, needless casts - Eliminate check for irq handler 'dev_id==NULL' where the condition never occurs. - Eliminate needless casts to/from void* Signed-off-by: Jeff Garzik commit 5a078351d2d0a7ae834087de3637eb42cfd209e3 Author: Jaroslav Kysela Date: Fri Oct 6 20:28:26 2006 +0200 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit 8a238c7b6a2ec1852419e8fb8b8b0457c55c47e6 Author: Amol Lad Date: Fri Oct 6 16:45:19 2006 +0200 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap Signed-off-by: Amol Lad Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a9edfc60227a1dc5c741666ff252a6055b73b184 Author: Karsten Wiese Date: Fri Oct 6 16:08:27 2006 +0200 [ALSA] Handle file operations during snd_card disconnects using static file->f_op Alsa used to kmalloc one file->f_op per file per disconnecting snd_card. This led to oopses sometimes when file->f_op was freed before __fput() finished. Patch adds a virtual device for disconnect: VDD. VDD consists of: LIST_HEAD(shutdown_files) protected by DEFINE_SPINLOCK(shutdown_mutex) static struct file_operations snd_shutdown_f_ops and functions assigned to it Additions to struct snd_monitor_file to specify if instance is hidden by VDD or not. A VDD's instance is created in snd_card_disconnect() under the card->files_lock. cleaned up in snd_card_file_remove() under the card->files_lock. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4130d59b1ac6e32c130bd59dbce5eb30fede0197 Author: Arnaud Patard Date: Wed Oct 4 18:21:05 2006 +0200 [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs() The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores it on resumes. Unfortunately, this doesn't work as the arguments to outl() are reversed. Signed-off-by: Arnaud Patard Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 635bbb355ebb735647ca49fb649a6a7edea9b3ed Author: Karsten Wiese Date: Wed Oct 4 17:17:32 2006 +0200 [ALSA] Repair snd-usb-usx2y for usb 2.6.18 urb->start_frame rolls over beyond MAX_INT now. This is for stable kernel and stable alsa. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9b08c2aa54948361da0e2d26b47e3bcb8f8911e8 Author: Karsten Wiese Date: Wed Oct 4 17:16:46 2006 +0200 [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() substream can be NULL...... in mainline, bug was introduced by: 2006-06-22 [ALSA] Add O_APPEND flag support to PCM Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 104326f8df9925317cca64b84249d3eac5de7c74 Author: Florin Malita Date: Fri Sep 29 12:55:25 2006 +0200 [ALSA] Dereference after free in snd_hwdep_release() snd_card_file_remove() may free hw->card so we can't dereference hw->card->module after that. Coverity ID 1420. Signed-off-by: Florin Malita Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 92b93d31718a3ccbbcf911d2f570bb345c496d66 Author: Eric Sesterhenn Date: Thu Sep 28 12:35:48 2006 +0200 [ALSA] Fix memory leak in sound/isa/es18xx.c Fixed a memory leak in the error patch. Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f3838ba9204cd8af83c4358379221af66d77714e Author: Dan Cyr Date: Tue Sep 26 15:32:35 2006 +0200 [ALSA] hda-intel - New pci id for Nvidia MCP61 Added the new PCI id to support Nvidia MCP61 in snd-hda-intel driver. Signed-off-by: Dan Cyr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7a99795477ca758a4b29ef3595edde2e067af85a Author: Tobin Davis Date: Tue Sep 26 15:30:10 2006 +0200 [ALSA] Add new subdevice ids for hda-intel This patch adds a couple of device ids for Acer laptops. In both cases, the owners got the driver working by adding 'model=acer' to their modprobe.conf files. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2aedbda6f9a51f0a2130c150676a5c99c81fa7a2 Author: Luke Zhang Date: Tue Sep 26 15:28:41 2006 +0200 [ALSA] WM9712 fixes for ac97_patch.c This patch by Luke Zhang fixes a couple of issues with the WM9712 support in ac97_patch.c Changes:- o Fix Out3 ZC switch invert. o Extend capture volume control to 6 bits. o Change Mic 1 volume mask to 5 bits (31). o Add Mic 2 volume. Signed-off-by: Luke Zhang Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 476d1205d182e12a74f4197ccc9092ea6a80e15b Author: Sasha Khapyorsky Date: Tue Sep 26 15:27:38 2006 +0200 [ALSA] hda/patch_si3054: new codec vendor IDs There are additional IDs for Si3054 codec based HDA modems. Most of them were discovered on discuss@linmodems.org list - Thanks to MarvS and all linmodems.org folks. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 815a965b0e6d925646e1f6012175830ef21e0d21 Author: Jiri Kosina Date: Fri Oct 6 11:11:56 2006 +0200 [PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could be compiled also for UP archs. The patch fixes compilation error in include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP Signed-off-by: Jiri Kosina Acked-by: Keith Mannthey Signed-off-by: Linus Torvalds commit 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 Author: Linus Torvalds Date: Fri Oct 6 10:53:39 2006 -0700 Initial blind fixup for arm for irq changes Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier. Signed-off-by: Linus Torvalds commit 86d91bab4806191a8126502d80d729c2a4765ebe Author: Jeff Garzik Date: Fri Oct 6 13:32:44 2006 -0400 arch/i386/kernel/time: don't shadow 'irq' function arg Signed-off-by: Jeff Garzik commit 8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 Author: Tony Luck Date: Fri Oct 6 10:09:41 2006 -0700 [IA64] Fix breakage from irq change A few missed spots in ia64-land from this gigantic commit: 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Signed-off-by: Tony Luck commit 96e1a87392293cf895ea99ab70758453897c7bbf Author: Pekka Enberg Date: Fri Oct 6 00:44:06 2006 -0700 [PATCH] um: irq changes break build Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5 "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers". Cc: David Howells Cc: Jeff Dike Cc: Paolo "Blaisorblade" Giarrusso Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b0a9f87b82f25fa35206ec04b5160372eabab4 Author: NeilBrown Date: Fri Oct 6 00:44:05 2006 -0700 [PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc There is some confusion about the meaning of 'bufsz' for a sunrpc server. In some cases it is the largest message that can be sent or received. In other cases it is the largest 'payload' that can be included in a NFS message. In either case, it is not possible for both the request and the reply to be this large. One of the request or reply may only be one page long, which fits nicely with NFS. So we remove 'bufsz' and replace it with two numbers: 'max_payload' and 'max_mesg'. Max_payload is the size that the server requests. It is used by the server to check the max size allowed on a particular connection: depending on the protocol a lower limit might be used. max_mesg is the largest single message that can be sent or received. It is calculated as the max_payload, rounded up to a multiple of PAGE_SIZE, and with PAGE_SIZE added to overhead. Only one of the request and reply may be this size. The other must be at most one page. Cc: Greg Banks Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5842730de179405d80649231faa0b3f254477434 Author: NeilBrown Date: Fri Oct 6 00:44:04 2006 -0700 [PATCH] md: fix bug where new drives added to an md array sometimes don't sync properly This fixes a bug introduced in 2.6.18. If a drive is added to a raid1 using older tools (mdadm-1.x or raidtools) then it will be included in the array without any resync happening. It has been submitted for 2.6.18.1. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec5a19dd935eb3793e1f6ed491e8035b3d7b1df9 Author: Pierre Ossman Date: Fri Oct 6 00:44:03 2006 -0700 [PATCH] mmc: multi sector write transfers SD cards extend the protocol by allowing the host to query a card how many blocks were successfully stored on the medium. This allows us to safely write chunks of blocks at once. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45e02b5b52e43aa7a674f64ca3470b9ee51fc9fd Author: Maciej W. Rozycki Date: Fri Oct 6 00:44:02 2006 -0700 [PATCH] swarm: Actually initialize the IDE driver This is required for the SWARM GenBus IDE interface to be recognized. Signed-off-by: Maciej W. Rozycki Cc: Ralf Baechle Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3260259f0084e51ce21503b130473b78871e7077 Author: Henne Date: Fri Oct 6 00:44:01 2006 -0700 [PATCH] sched: fix a kerneldoc error on is_init() Fix a kerneldoc warning and reorderd the description for is_init(). Signed-off-by: Henrik Kretzschmar Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1662d32cea96a8711bd61094ff090979478f0fd4 Author: Jim Cromie Date: Fri Oct 6 00:43:59 2006 -0700 [PATCH] MAINTAINERS: take over scx200-* and pc8736* drivers Add MAINTAINERS entries for new scx200_hrt and pc8736x_gpio drivers, and take over maintenance of scx200_gpio, authored by Christer Weinigel (which I've hacked at), who no longer has the hardware. Also take over hwmon/pc87360, authored by Jean Delvare, who's dropped maintenance to dedicate more time to hwmon subsystem. Signed-off-by: Jim Cromie Cc: Jean Delvare Cc: Christer Weinigel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a666ecfbf512dbd63a60f65d2ad6733a9a1b12ee Author: Jan Blunck Date: Fri Oct 6 00:43:58 2006 -0700 [PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch Trivial typo fix in the "syntax error if percpu macros are incorrectly used" patch. I misspelled "identifier" in all places. D'Oh! Thanks to Dirk Mueller to point this out. Signed-off-by: Jan Blunck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc366708b3b022050f139347a44c65a102e4835d Author: Al Viro Date: Fri Oct 6 00:43:58 2006 -0700 [PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument annotate, fix the bogus argument of vmap() in it. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e7c4ea83efa9d6269bcbf17611f83aeef71c096 Author: Roman Zippel Date: Fri Oct 6 00:43:57 2006 -0700 [PATCH] m68k: fix NBPG define The recent header cleanup removed PAGE_SIZE from the exported information as it depends on the configuration. BTW This has possibly other consequences, as the core dump code is using PAGE_SIZE directly, which may need fixing as well. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ef308946fa8390136130a886b0d9a57867a747a Author: Roman Zippel Date: Fri Oct 6 00:43:56 2006 -0700 [PATCH] m68k: small system.h cleanup avoid unnecessary xchg() use in set_mb() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c04c28a656c1717fbe617efc40edabca3a85ca3 Author: Roman Zippel Date: Fri Oct 6 00:43:56 2006 -0700 [PATCH] m68k: fix typo in __generic_copy_to_user Jump to the correct exit label after exception Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6359fd783251238dbbf70b7c2fc745db25cf51f Author: Roman Zippel Date: Fri Oct 6 00:43:55 2006 -0700 [PATCH] m68k: cleanup string functions - cleanup asm of string functions - deinline strncat()/strncmp() - provide non-inlined strcpy() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7236e978a3883406ca06ee79e0739743c7c92a85 Author: Roman Zippel Date: Fri Oct 6 00:43:54 2006 -0700 [PATCH] provide tickadj define Provide a tickadj compatibility define for archs still using it. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f7bbbe50b8a28f4dfaa4cea939ddb50198c4a99 Author: Benjamin Herrenschmidt Date: Fri Oct 6 00:43:53 2006 -0700 [PATCH] page fault retry with NOPAGE_REFAULT Add a way for a no_page() handler to request a retry of the faulting instruction. It goes back to userland on page faults and just tries again in get_user_pages(). I added a cond_resched() in the loop in that later case. The problem I have with signal and spufs is an actual bug affecting apps and I don't see other ways of fixing it. In addition, we are having issues with infiniband and 64k pages (related to the way the hypervisor deals with some HV cards) that will require us to muck around with the MMU from within the IB driver's no_page() (it's a pSeries specific driver) and return to the caller the same way using NOPAGE_REFAULT. And to add to this, the graphics folks have been following a new approach of memory management that involves transparently swapping objects between video ram and main meory. To do that, they need installing PTEs from a no_page() handler as well and that also requires returning with NOPAGE_REFAULT. (For the later, they are currently using io_remap_pfn_range to install one PTE from no_page() which is a bit racy, we need to add a check for the PTE having already been installed afer taking the lock, but that's ok, they are only at the proof-of-concept stage. I'll send a patch adding a "clean" function to do that, we can use that from spufs too and get rid of the sparsemem hacks we do to create struct page for SPEs. Basically, that provides a generic solution for being able to have no_page() map hardware devices, which is something that I think sound driver folks have been asking for some time too). All of these things depend on having the NOPAGE_REFAULT exit path from no_page() handlers. Signed-off-by: Benjamin Herrenchmidt Cc: Hugh Dickins Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ca4cb2418c04914e4661c059cf5b7b9262c645a Author: Pekka Enberg Date: Fri Oct 6 00:43:52 2006 -0700 [PATCH] slab: reduce numa text size Reduce the NUMA text size of mm/slab.o a little on x86 by using a local variable to store the result of numa_node_id(). text data bss dec hex filename 16858 2584 16 19458 4c02 mm/slab.o (before) 16804 2584 16 19404 4bcc mm/slab.o (after) [akpm@osdl.org: use better names] [pbadari@us.ibm.com: fix that] Cc: Christoph Lameter Signed-off-by: Pekka Enberg Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da66b719d16f6ea3801b859c1ff35d5cd05c517d Author: David Brownell Date: Fri Oct 6 00:43:51 2006 -0700 [PATCH] ohci: don't play with IRQ regs This is a more correct fix for the way the ohci hcd was referencing pt_regs in the unlink paths. Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efbc52f945696702a97a78b12812093f61880c2c Author: Andrew Morton Date: Fri Oct 6 00:43:50 2006 -0700 [PATCH] irq_reqs: export __irq_regs Modules might want this. Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69a892268c66c13fcb445a8274baa9d7befb7b5 Author: Andrew Morton Date: Fri Oct 6 00:43:49 2006 -0700 [PATCH] Fix WARN_ON / WARN_ON_ONCE regression Tim and Ananiev report that the recent WARN_ON_ONCE changes cause increased cache misses with the tbench workload. Apparently due to the access to the newly-added static variable. Rearrange the code so that we don't touch that variable unless the warning is going to trigger. Also rework the logic so that the static variable starts out at zero, so we can move it into bss. It would seem logical to mark the static variable as __read_mostly too. But it would be wrong, because that would put it back into the vmlinux image, and the kernel will never read from this variable in normal operation anyway. Unless the compiler or hardware go and do some prefetching on us? For some reason this patch shrinks softirq.o text by 40 bytes. Cc: Tim Chen Cc: Herbert Xu Cc: "Ananiev, Leonid I" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4899b8b16b302299cc91289f7b5bac295e9ab387 Author: Andrew Morton Date: Fri Oct 6 00:43:48 2006 -0700 [PATCH] kauditd_thread warning fix Squash this warning: kernel/audit.c: In function 'kauditd_thread': kernel/audit.c:367: warning: no return statement in function returning non-void We might as test kthread_should_stop(), although it's not very pointful at present. The code which starts this thread looks racy - the kernel could start multiple threads. Cc: Al Viro Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d195412c35fe777811bd58ad43fba3aacc67e15c Author: Andrew Morton Date: Fri Oct 6 00:43:48 2006 -0700 [PATCH] i386: irqs build fix Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc64bef5439c8e1fafea225054da4d8882c9d10c Author: Martin Schwidefsky Date: Fri Oct 6 16:38:48 2006 +0200 [S390] Use CONFIG_GENERIC_TIME and define TOD clock source. Fix too slow clock by using CONFIG_GENERIC_TIME and adding a clock source for the s390 time-of-day clock. As added benefit we get rid of the s390 specific definition of do_gettimeofday and do_settimeofday. Signed-off-by: Martin Schwidefsky commit 2033b0c330d50d3f1cccd207147a10ad7f4f47f8 Author: Heiko Carstens Date: Fri Oct 6 16:38:42 2006 +0200 [PATCH] sysrq: irq change build fix. drivers/char/sysrq.c: In function `sysrq_handle_crashdump': drivers/char/sysrq.c:98: warning: implicit declaration of function `get_irq_regs' Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5a489b9846f688db7e69aa7ccb23c53459a9c20e Author: Heiko Carstens Date: Fri Oct 6 16:38:35 2006 +0200 [S390] irq change build fixes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7e8ae7bfe8354b1f1b98c5cd29db8965ca1e6391 Author: Cornelia Huck Date: Fri Oct 6 16:38:29 2006 +0200 [S390] cio: 0 is a valid chpid. In order to determine chpid validity, we need to check whether the corresponding path is specified in the pim. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 2d103d5a80846e96e1cb1ba5e635e8c37d30ada8 Author: Melissa Howland Date: Fri Oct 6 16:38:26 2006 +0200 [S390] monwriter buffer limit. Make max_bufs a global (per linux guest) limit. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit d83682b3971d6707d6d668b3b62d416ab7dd1ab3 Author: Christian Borntraeger Date: Fri Oct 6 16:38:22 2006 +0200 [S390] ap bus poll thread priority. The ap bus is supposed to have a low priority. We must use 19 instead of -20, which is just the opposite. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1 Author: Geoff Levand Date: Thu Oct 5 11:35:16 2006 -0700 [POWERPC] Minor fix for bootargs property Avoid the use of an uninitialized stack variable when the powerpc device tree bootargs property is either missing or incorrectly defined. This also makes CONFIG_CMDLINE work properly under these conditions. This change adds a test for the existence of the bootargs property. early_init_dt_scan_chosen() tests for a zero length bootargs property in its CONFIG_CMDLINE processing, but the current implementation of of_get_flat_dt_prop() doesn't assign a value to the length when no property is found. Since an automatic variable is used, a stale value from the stack will be used in the test. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 52aed7cd52ce8a1d576e26976c3950512e1af8b6 Author: Anton Blanchard Date: Fri Oct 6 02:54:07 2006 +1000 [POWERPC] Update MTFSF_L() comment David Woodhouse points out that the comment accompanying the MTFSF_L macro is misleading. We should make it clear that the L bit is ignored on older CPUS, not the entire instruction. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3afbf5d6ef791be61d18329ae5302bbf1cd83723 Author: Brian King Date: Thu Oct 5 10:52:04 2006 -0500 [POWERPC] Update pSeries defconfig for SATA Since the ipr driver now supports SATA and depends on libata, enable libata to get built. Signed-off-by: Brian King Signed-off-by: Paul Mackerras commit 41550c5128150175197257b6ceab2cd50dea7b51 Author: Benjamin Herrenschmidt Date: Thu Oct 5 16:40:41 2006 +1000 [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ This patch adds checking of the PCI_INTERRUPT_PIN register before using standard OF parsing to retreive PCI interrupts. The reason is that some PCI devices may have no PCI interrupt, though they may have interrupts attached via other means. In this case, we shall not use irq->pdev, but device-specific code can later retreive those interrupts instead. Without that patch, Maple and derivatives don't get the right interrupt for the second IDE channel as the linux IDE code fallsback to the PCI irq instead of trying to use the legacy ones for the on-board controller (which has no PCI_INTERRUPT_PIN). Having no PCI IRQ assign to it (as it doesn't request any) fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c998de146061db17787c1a31a3db1989f1341fdf Author: Benjamin Herrenschmidt Date: Thu Oct 5 14:18:46 2006 +1000 [POWERPC] Fix zImage decompress location The zImage wrapper has a "hack" that force the decompression to happen above 20Mb for 64 bits kernels, to work around issues with some firmwares on the field. However, the new wrapper has a bug which makes that hack not work properly. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9938c474f39e416091db9993954996266a3f2edf Author: Nathan Lynch Date: Wed Oct 4 22:28:00 2006 -0500 [POWERPC] linux,tce-size property is 32 bits The "linux,tce-size" property is only 32 bits (see prom_initialize_tce_table() in arch/powerpc/kernel/prom_init.c). Treating it as an unsigned long in iommu_table_setparms() leads to access beyond the end of the property's buffer, so we pass garbage to the memset() in that function. [boot]0020 XICS Init i8259 legacy interrupt controller initialized [boot]0021 XICS Done PID hash table entries: 4096 (order: 12, 32768 bytes) cpu 0x0: Vector: 300 (Data Access) at [c0000000fe783850] pc: c000000000035e90: .memset+0x60/0xfc lr: c000000000044fa4: .iommu_table_setparms+0xb0/0x158 sp: c0000000fe783ad0 msr: 9000000000009032 dar: c000000100000000 dsisr: 42010000 current = 0xc00000000450e810 paca = 0xc000000000411580 pid = 1, comm = swapper enter ? for help [link register ] c000000000044fa4 .iommu_table_setparms+0xb0/0x158 [c0000000fe783ad0] c000000000044f4c .iommu_table_setparms+0x58/0x158 (unreliable) [c0000000fe783b70] c00000000004529c .iommu_bus_setup_pSeries+0x1c4/0x254 [c0000000fe783c00] c00000000002b8ac .do_bus_setup+0x3c/0xe4 [c0000000fe783c80] c00000000002c924 .pcibios_fixup_bus+0x64/0xd8 [c0000000fe783d00] c0000000001a2d5c .pci_scan_child_bus+0x6c/0x10c [c0000000fe783da0] c00000000002be28 .scan_phb+0x17c/0x1b4 [c0000000fe783e40] c0000000003cfa00 .pcibios_init+0x58/0x19c [c0000000fe783ec0] c0000000000094b4 .init+0x1e8/0x3d8 [c0000000fe783f90] c000000000026e54 .kernel_thread+0x4c/0x68 Signed-off-by: Nathan Lynch Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 74c37e8c9f626ed000388bebdc781a8e35ee4ab7 Author: Timur Tabi Date: Wed Oct 4 11:03:44 2006 -0500 [POWERPC] Add DTS for MPC8349E-mITX board Add the DTS for the Freescale MPC 8349E-mITX reference board. Contact Vitesse for the driver for the VSC 7385. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 13a2eea1461f5d54cc5d58334fbde4bf4cc9cb23 Author: Nick Piggin Date: Wed Oct 4 17:25:44 2006 +0200 [POWERPC] Fix harmless typo Fix a typo. Noticed by the unlikely profiler. Signed-off-by: Nick Piggin Signed-off-by: Paul Mackerras commit 3211be5c6a61946c75318069611699c90b10e0f8 Author: Paul Mackerras Date: Fri Oct 6 21:09:40 2006 +1000 [PPC] Fix some irq breakage with ARCH=ppc Signed-off-by: Paul Mackerras commit 0f13804ae9d894c1fbd90bde38ae2aa0f01b0edd Author: Paul Mundt Date: Fri Oct 6 17:55:25 2006 +0900 sh: Convert IPR-IRQ to IRQ chip. One more initial conversion.. Signed-off-by: Paul Mundt commit 525ccc452c79db41874c5edac3f67618a0997d6f Author: Paul Mundt Date: Fri Oct 6 17:35:48 2006 +0900 sh: Convert INTC2 IRQ handler to irq_chip. More struct irq_chip conversions, this time the INTC2 handlers. Signed-off-by: Paul Mundt commit 580410005daecd8e9f0e1baa9ddadbb7f706e7e2 Author: Jamie Lenehan Date: Fri Oct 6 15:36:15 2006 +0900 sh: Fix pr_debug statements for sh4 Fix a problem uncovered by the recent change to always check the arguments to pr_debug. The sh7751 was using the wrong name for the PCI IO base address. Signed-off-by: Jamie Lenehan Signed-off-by: Paul Mundt commit 257440b00ba42a96522255029aa9406ffb7e2f62 Author: Paul Mundt Date: Fri Oct 6 15:33:00 2006 +0900 sh: Convert r7780rp IRQ handler to IRQ chip. Simple conversion of the R7780RP IRQ handler to struct irq_chip. Signed-off-by: Paul Mundt commit 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 Author: Paul Mundt Date: Fri Oct 6 15:31:16 2006 +0900 sh: Updates for IRQ handler changes. Trivial fixes for build breakage introduced by IRQ handler changes. Signed-off-by: Paul Mundt commit a700f3594d63a85af196ac64984f7375d903afad Author: Paul Mundt Date: Wed Oct 4 13:27:32 2006 +0900 sh: Kill off timer_ops get_frequency(). We're not using this anywhere these days, kill it off. Signed-off-by: Paul Mundt commit 458821452642fd5dc2377b73cd1323fd4a9653e7 Author: Paul Mundt Date: Wed Oct 4 13:21:45 2006 +0900 sh: First step at generic timeofday support. At the moment we wrap GENERIC_TIME around our existing timer API. As boards start providing their own clocksources, they're able to select GENERIC_TIME accordingly and optimize out most of the timer API. Once the current timers have been reworked as proper clocksource drivers, the rest of the place holders for the timer API can go away and we can flip on GENERIC_TIME unconditionally. Signed-off-by: Paul Mundt commit 49f19ce401edfff937c448dd74c22497da361889 Author: Olof Johansson Date: Thu Oct 5 20:31:10 2006 -0500 [PATCH] powerpc: irq change build breaks Fix up some of the buildbreaks from the irq handler changes. Signed-off-by: Olof Johansson Signed-off-by: Linus Torvalds commit c1a26e7d40fb814716950122353a1a556844286b Author: Peter Osterlund Date: Thu Oct 5 21:17:50 2006 +0200 [PATCH] UDF: Fix mounting read-write The UDF filesystem can't be mounted in read-write mode any more, because of forgotten braces. Signed-off-by: Peter Osterlund [ Duh! ] Signed-off-by: Linus Torvalds commit 4b0ff1a94cba36a35734c84f377e49cacc77f293 Author: Randy Dunlap Date: Thu Oct 5 19:07:26 2006 +0200 [PATCH] x86-64: Fix compilation without CONFIG_KALLSYMS Include linux/kallsyms.h unconditionally for print_symbol(). Signed-off-by: Randy Dunlap Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7a297baa6edea94167163bed808c6a8933bd5aa Author: Frederik Deweerdt Date: Thu Oct 5 20:49:18 2006 +0000 [PATCH] fix qla{2,4} build error commit 0181944fe647cae18d545ac1167df3d15d393701 adds a 'extended_error_logging' global variable to qla2xxx which is defined by qla4xxx too. Trying to build both drivers results in the following error: LD drivers/scsi/built-in.o drivers/scsi/qla4xxx/built-in.o: In function `qla4xxx_slave_configure': drivers/scsi/qla4xxx/ql4_os.c:1433: multiple definition of `extended_error_logging' drivers/scsi/qla2xxx/built-in.o:drivers/scsi/qla2xxx/qla_os.c:2166: first defined here make[2]: *** [drivers/scsi/built-in.o] Error 1 make[1]: *** [drivers/scsi] Error 2 make: *** [drivers] Error 2 The following patch simply adds a qla2_ (qla4_ respectively) prefix to the variable name. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit 88271e9e43e65537c6390af3718a60c45c787e8f Author: Ingo Molnar Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] i386: fix rwsem build bug on CONFIG_M386=y CONFIG_M386 turns on spinlock-based generic rwsems - which surprises the semaphore.S rwsem stubs. Tested both with and without CONFIG_M386. Reported-by: Klaus Knopper Triaged-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen commit 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers Add correct CFI annotation to the backlink on top of the interrupt stack. Signed-off-by: Andi Kleen commit 0a5ace2ab08d45cd78d7ef0067cdcd5c812ac54f Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86-64: Fix FPU corruption This reverts an earlier patch that was found to cause FPU state corruption. I think the corruption happens because unlazy_fpu() can cause FPU exceptions and when it happens after the current switch some processing would affect the state in the wrong process. Thanks to Douglas Crosher and Tom Hughes for testing. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 51ec28e1b2cb267a09a0b8eac1ccf8d61b7268bf Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86: Terminate the kernel stacks for the unwinder Always make sure RIP/EIP is 0 in the registers stored on the top of the stack of a kernel thread. This makes sure the unwinder code won't try a fallback but knows the stack has ended. AK: this patch is a bit mysterious. in theory they should be terminated anyways, but it seems to fix at least one crash. Anyways double termination probably doesn't hurt. Signed-off-by: Andi Kleen commit f015c6c4d733f68cbc1c5d231bb158abaa5c9606 Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] i386: Fix PCI BIOS config space access Got broken by a earlier change. Also add a printk when no pci config method could be found. Cc: gregkh@suse.de Signed-off-by: Andi Kleen commit 70d666d6ae9724c0a08434c20f8830c90a635bd3 Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex Make the references to the bus number in hex instead of decimal, as that is the way that lspci prints out the bus numbers. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info Also add copyright for work done after leaving IBM. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 76fd231717453e06347ad17b3fc1707c6918d172 Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location The purpose of the code being modified is to determine the location of the calgary chip address space. This is done by a magical formula of FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase) to find the offset where BIOS puts it. In this formula, OneBasedChassisNumber corresponds to the NUMA node, and rionodeid is always 2 or 3 depending on which chip in the system it is. The problem was that we had an off by one error that caused us to account some busses to the wrong chip and thus give them the wrong address space. Fixes RH bugzilla #203971. Signed-off-by: Jon Mason Signed-off-bu: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit dedc9937e876cb5430bca6a1dccfcc2ff22f8b7c Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init calgary_init's for loop does not correspond to the actual device being checked, which makes its upperbound check for array overflow useless. Changing this to a do-while loop is the correct way of doing this. There should be no possibility of spinning forever in this loop, as pci_get_device states that it will go through all iterations, then return NULL (thus breaking the loop). Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 814eadcefe79a2977a11ba135c4763a402112746 Author: Andi Kleen Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit a7441a39a3c62addd6ce10497c101057f4d69184 Author: Andi Kleen Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Author: David Howells Date: Thu Oct 5 14:55:46 2006 +0100 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: David Howells (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit) commit da482792a6d1a3fbaaa25fae867b343fb4db3246 Author: David Howells Date: Thu Oct 5 13:06:34 2006 +0100 IRQ: Typedef the IRQ handler function type Typedef the IRQ handler function type. Signed-Off-By: David Howells (cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit) commit 57a58a9435aef3e0342ba4b2c97e0ddfea6f2c7f Author: David Howells Date: Thu Oct 5 13:06:34 2006 +0100 IRQ: Typedef the IRQ flow handler function type Typedef the IRQ flow handler function type. Signed-Off-By: David Howells (cherry picked from 8e973fbdf5716b93a0a8c0365be33a31ca0fa351 commit) commit 2f614fe04f4463ff22234133319067d7361f54e5 Author: Jeff Garzik Date: Thu Oct 5 07:10:38 2006 -0400 [netdrvr] b44: handle excessive multicast groups If there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees. This change makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to, similar to other network drivers. Noticed by Bill Helfinstine Signed-off-by: Jeff Garzik commit 39984a9fad0c642182f426d7771332d46f222103 Author: Karsten Keil Date: Fri Sep 29 23:28:42 2006 -0700 [PATCH] bonding: fix deadlock on high loads in bond_alb_monitor() In bond_alb_monitor the bond->curr_slave_lock write lock is taken and then dev_set_promiscuity maybe called which can take some time, depending on the network HW. If a network IRQ for this card come in the softirq handler maybe try to deliver more packets which end up in a request to the read lock of bond->curr_slave_lock -> deadlock. This issue was found by a test lab during network stress tests, this patch disable the softirq handler for this case and solved the issue. Signed-off-by: Karsten Keil Acked-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 46767aeba58ca9357a2309765201bad38d8f5e9b Author: Alan Cox Date: Fri Sep 29 18:26:47 2006 +0100 [PATCH] libata: Don't believe bogus claims in the older PIO mode register Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0a07bc645e818b88559d99f52ad45e35352e8228 Author: Peter Zijlstra Date: Tue Sep 19 14:55:22 2006 +0200 [PATCH] forcedeth: hardirq lockdep warning BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted) Call Trace: show_trace dump_stack trace_hardirqs_on :forcedeth:nv_nic_irq_other handle_IRQ_event __do_IRQ do_IRQ ret_from_intr DWARF2 barf default_idle cpu_idle rest_init start_kernel _sinittext These 3 functions nv_nic_irq_tx(), nv_nic_irq_rx() and nv_nic_irq_other() are reachable from IRQ context and process context. Make use of the irq-save/restore spinlock variant. (Compile tested only, since I do not have the hardware) Signed-off-by: Peter Zijlstra Cc: Jeff Garzik Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Dave Jones Cc: Andrew Morton Signed-off-by: Jeff Garzik commit 70fbf32703a9c4d3403663d1fc24fd8afc76d56f Author: Maxime Bizon Date: Tue Oct 3 10:27:10 2006 -0700 [PATCH] mv643xx_eth: Fix ethtool stats Some stats reported by ethtool -S on mv643xx_eth device are cleared between each call. This patch fixes it. Signed-off-by: Maxime Bizon Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 Author: Santiago Leon Date: Tue Oct 3 12:24:45 2006 -0500 [PATCH] ibmveth: fix int rollover panic This patch fixes a nasty bug that has been sitting there since the very first versions of the driver, but is generating a panic because we changed the number of 2K buffers for 2.6.16. The consumer_index and producer_index are u32's that get incremented on every buffer emptied and replenished respectively. We use the {producer,consumer}_index mod'ed with the size of the pool to pick out an entry in the free_map. The problem happens when the u32 rolls over and the number of the buffers in the pool is not a perfect divisor of 2^32. i.e. if the number of 2K buffers is 0x300, before the consumer_index rolls over, our index to the free map = 0xffffffff mod 0x300 = 0xff. The next time a buffer is emptied, we want the index to the free map to be 0x100, but 0x0 mod 0x300 is 0x0. This patch assigns the mod'ed result back to the consumer and producer indexes so that they never roll over. The second chunk of the patch covers the unlikely case where the consumer_index has just been reset to 0x0 and the hypervisor is not able to accept that buffer. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 03a85d0907b2455c772b8fb179b0c07a66b00ddb Author: Santiago Leon Date: Tue Oct 3 12:24:39 2006 -0500 [PATCH] ibmveth: rename proc entry name This patch changes the name of the proc file for each ibmveth adapter from the network device name to the slot number in the virtual bus. The proc file is created when the device is probed, so a change in the name of the device will not be reflected in the name of the proc file giving problems when identifying and removing the adapter. The slot number is a property that does not change through the life of the adapter so we use that instead. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 4347ef15f76dca33ae8da769d6900a468253bda2 Author: Santiago Leon Date: Tue Oct 3 12:24:34 2006 -0500 [PATCH] ibmveth: kdump interrupt fix This patch fixes a race that panics the kernel when opening the device after a kdump. Without this patch there is a window where the hypervisor can send an interrupt before all the structures for the kdump ibmveth module are ready (because the hypervisor is not aware that the partition crashed and that the virtual driver is reloading). We close this window by disabling the interrupts before registering the adapter to the hypervisor. This patch depends on the "ibmveth: Harden driver initilisation" patch. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 6b4223748895ed5b200c8049231567ea399fc0c2 Author: Santiago Leon Date: Tue Oct 3 12:24:28 2006 -0500 [PATCH] ibmveth: Add netpoll function This patch adds the net poll controller function to ibmveth to support netconsole and netdump. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit bbedefccc6b0da43cfaf785dac89c88bc59cb6ed Author: Michael Ellerman Date: Tue Oct 3 12:24:23 2006 -0500 [PATCH] ibmveth: Harden driver initilisation This patch has been floating around for a while now, Santi originally sent it in March: http://www.spinics.net/lists/netdev/msg00471.html After a kexec the ibmveth driver will fail when trying to register with the Hypervisor because the previous kernel has not unregistered. So if the registration fails, we unregister and then try again. We don't unconditionally unregister, because we don't want to disturb the regular code path for 99% of users. Signed-off-by: Michael Ellerman Acked-by: Anton Blanchard Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 489b10c1f63fafcb89c330a0603694652068132a Author: Stephen Hemminger Date: Tue Oct 3 16:39:12 2006 -0700 [PATCH] sky2: incorrect length on receive packets The previous change to do fragmented receive (post 2.6.18) introduced a bug where packets are passed up with size set to the size of the receive buffer not the actual received data. IP silently trims this so it didn't show up right away. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d223a60106891bfe46febfacf46b20cd8509aaad Author: Linus Torvalds Date: Wed Oct 4 19:57:05 2006 -0700 Linux 2.6.19-rc1 Merge window closed.. commit 77dc2db6d1d2703ee4e83d4b3dbecf4e06a910e6 Author: Mark Assad Date: Thu Oct 5 12:25:05 2006 +1000 [PATCH] itmtouch: fix inverted flag to indicate touch location correctly, correct white space There is a bug in the current version of the itmtouch USB touchscreen driver. The if statment that checks if pressure is being applied to the touch screen is now missing a ! (not), so events are no longer being reported correctly. The original source code for this line was as follows: #define UCP(x) ((unsigned char*)(x)) #define UCOM(x,y,z) ((UCP((x)->transfer_buffer)[y]) & (z)) ... if (!UCOM(urb, 7, 0x20)) { And was cleaned to: unsigned char *data = urb->transfer_buffer; .... if (data[7] & 0x20) { (note the lack of '!') This has been tested on an LG L1510BF and an LG1510SF touch screen. Signed-off-by: Mark Assad Signed-off-by: Linus Torvalds commit 1604f31895dcdb42edf6511ce7ef0546ff92c8e5 Author: Matthew Wilcox Date: Wed Oct 4 15:12:52 2006 -0600 [PA-RISC] Fix time.c for new do_timer() calling convention do_timer now wants to know how many ticks have elapsed. Now that we have to calculate that, we can eliminate some of the clever code that avoided having to calculate that. Also add some more documentation. I'd like to thank Grant Grundler for helping me with this. Signed-off-by: Matthew Wilcox commit 1070c9655b90016ec4c9b59c402292e57ee15885 Author: Matthew Wilcox Date: Wed Oct 4 13:37:41 2006 -0600 [PA-RISC] Fix must_check warnings in drivers.c Panic if we can't register the parisc bus or the root parisc device. There's no way we can boot without them, so let the user know ASAP. If we can't register a parisc device, handle the failure gracefully. Signed-off-by: Matthew Wilcox commit f64ef295032d07345ca26bf4876a1577c4dccb37 Author: Matthew Wilcox Date: Wed Oct 4 13:33:53 2006 -0600 [PA-RISC] Fix parisc_newuname() The utsname virtualisation broke parisc_newuname compilation. Rewrite the implementation to call sys_newuname() like sparc64 does. Signed-off-by: Matthew Wilcox commit ccd6c355e89a21d9047ae19471629758d3a01959 Author: Matthew Wilcox Date: Wed Oct 4 13:27:45 2006 -0600 [PA-RISC] Remove warning from pci.c max() doesn't like comparing an unsigned long and a resource_size_t, so make the local variables resource_size_t too. Signed-off-by: Matthew Wilcox commit 15c130c1cde38da528f82efce882e8d7632f4d91 Author: Matthew Wilcox Date: Wed Oct 4 13:18:25 2006 -0600 [PA-RISC] Fix filldir warnings filldir_t now takes a u64, not an ino_t. Signed-off-by: Matthew Wilcox commit 17cca07237617a2d712eb44cffd8720055e61291 Author: Matthew Wilcox Date: Wed Oct 4 13:16:10 2006 -0600 [PA-RISC] Fix sys32_sysctl When CONFIG_SYSCTL_SYSCALL isn't defined, do_sysctl doesn't exist and we fail to link. Fix with an ifdef, the same way sparc64 did. Also add some minor changes to be more like sparc64. Signed-off-by: Matthew Wilcox commit ee9f4b5d95d03d1546f0d06cbe384bd4ab97bcba Author: Matthew Wilcox Date: Wed Oct 4 13:08:33 2006 -0600 [PA-RISC] Fix sba_iommu compilation klist_iter_exit() only takes one parameter. Also fix warning by adding additional brackets. Signed-off-by: Matthew Wilcox commit 43b4f4061cf54aa225a1e94a969450ccf5305cd9 Author: Arnd Bergmann Date: Wed Oct 4 17:26:24 2006 +0200 [POWERPC] cell: fix bugs found by sparse - Some long constants should be marked 'ul'. - When using desc->handler_data to pass an __iomem register area, we need to add casts to and from __iomem. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit f7e2ce788677ca0996d360202b91524db894c7b2 Author: Arnd Bergmann Date: Wed Oct 4 17:26:23 2006 +0200 [POWERPC] spiderpic: enable new style devtree support This enables support for new firmware test releases. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 68272047c51145a8aa4f3b6ae27edae6986c28cc Author: Arnd Bergmann Date: Wed Oct 4 17:26:22 2006 +0200 [POWERPC] Update cell_defconfig This adds defaults for new configuration options added since 2.6.18 and it enables the option for 64kb pages by default. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 867672777964b9309e4e914fe097648c938b67b2 Author: Arnd Bergmann Date: Wed Oct 4 17:26:21 2006 +0200 [POWERPC] spufs: add infrastructure for finding elf objects This adds an 'object-id' file that the spe library can use to store a pointer to its ELF object. This was originally meant for use by oprofile, but is now also used by the GNU debugger, if available. In order for oprofile to find the location in an spu-elf binary where an event counter triggered, we need a way to identify the binary in the first place. Unfortunately, that binary itself can be embedded in a powerpc ELF binary. Since we can assume it is mapped into the effective address space of the running process, have that one write the pointer value into a new spufs file. When a context switch occurs, pass the user value to the profiler so that can look at the mapped file (with some care). Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 7650f2f2c367242a2092908794b4486876baf6c7 Author: Arnd Bergmann Date: Wed Oct 4 17:26:20 2006 +0200 [POWERPC] spufs: support new OF device tree format The properties we used traditionally in the device tree are somewhat nonstandard. This adds support for a more conventional format using 'interrupts' and 'reg' properties. The interrupts are specified in three cells (class 0, 1 and 2) and registered at the interrupt-parent. The reg property contains either three or four register areas in the order 'local-store', 'problem', 'priv2', and 'priv1', so the priv1 one can be left out in case of hypervisor driven systems that access these through hcalls. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e1dbff2bafa83f839ef15f51904b0cce9fc89387 Author: Arnd Bergmann Date: Wed Oct 4 17:26:19 2006 +0200 [POWERPC] spufs: add support for read/write on cntl Writing to cntl can be used to stop execution on the spu and to restart it, reading from cntl gives the contents of the current status register. The access is always in ascii, as for most other files. This was always meant to be there, but we had a little problem with writing to runctl so it was left out so far. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 772920e594df25f2011ca49abd9c8b85c4820cdc Author: Arnd Bergmann Date: Wed Oct 4 17:26:18 2006 +0200 [POWERPC] spufs: remove support for ancient firmware Any firmware that still uses the 'spc' nodes already stopped running for other reasons, so let's get rid of this. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit cdcc89bb1c6e886a55fe00e2de3b9c65d41674c2 Author: Arnd Bergmann Date: Wed Oct 4 17:26:17 2006 +0200 [POWERPC] spufs: make mailbox functions handle multiple elements Since libspe2 will provide a function that can read/write multiple mailbox elements at once, the kernel should handle that efficiently. read/write on the three mailbox files can now access the spe context multiple times to operate on any number of mailbox data elements. If the spu application keeps writing to its outbound mailbox, the read call will pick up all the data in a single system call. Unfortunately, if the user passes an invalid pointer, we may lose a mailbox element on read, since we can't put it back. This probably impossible to solve, if the user also accesses the mailbox through direct register access. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ac91cb8dae061ced64e475d0d70fac4a95298819 Author: Arnd Bergmann Date: Wed Oct 4 17:26:16 2006 +0200 [POWERPC] spufs: use correct pg_prot for mapping SPU local store This hopefully fixes a long-standing bug in the spu file system. An spu context comes with local memory that can be either saved in kernel pages or point directly to a physical SPE. When mapping the physical SPE, that mapping needs to be cache-inhibited. For simplicity, we used to map the kernel backing memory that way too, but unfortunately that was not only inefficient, but also incorrect because the same page could then be accessed simultaneously through a cacheable and a cache-inhibited mapping, which is not allowed by the powerpc specification and in our case caused data inconsistency for which we did a really ugly workaround in user space. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 6263203ed6e9ff107129a1ebe613290b342a4465 Author: Arnd Bergmann Date: Wed Oct 4 17:26:15 2006 +0200 [POWERPC] spufs: Add infrastructure needed for gang scheduling Add the concept of a gang to spufs as a new type of object. So far, this has no impact whatsover on scheduling, but makes it possible to add that later. A new type of object in spufs is now a spu_gang. It is created with the spu_create system call with the flags argument set to SPU_CREATE_GANG (0x2). Inside of a spu_gang, it is then possible to create spu_context objects, which until now was only possible at the root of spufs. There is a new member in struct spu_context pointing to the spu_gang it belongs to, if any. The spu_gang maintains a list of spu_context structures that are its children. This information can then be used in the scheduler in the future. There is still a bug that needs to be resolved in this basic infrastructure regarding the order in which objects are removed. When the spu_gang file descriptor is closed before the spu_context descriptors, we leak the dentry and inode for the gang. Any ideas how to cleanly solve this are appreciated. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 9add11daeee2f6d69f6b86237f197824332a4a3b Author: Arnd Bergmann Date: Wed Oct 4 17:26:14 2006 +0200 [POWERPC] spufs: implement error event delivery to user space This tries to fix spufs so we have an interface closer to what is specified in the man page for events returned in the third argument of spu_run. Fortunately, libspe has never been using the returned contents of that register, as they were the same as the return code of spu_run (duh!). Unlike the specification that we never implemented correctly, we now require a SPU_CREATE_EVENTS_ENABLED flag passed to spu_create, in order to get the new behavior. When this flag is not passed, spu_run will simply ignore the third argument now. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 28347bce8a837258e737873a55d31f2f424a6ea6 Author: HyeonSeung Jang Date: Wed Oct 4 17:26:13 2006 +0200 [POWERPC] spufs: fix context switch during page fault For better explanation, I break down the page fault handling into steps: 1) There is a page fault caused by DMA operation initiated by SPU and DMA is suspended. 2) The interrupt handler 'spu_irq_class_1()/__spu_trap_data_map()' is called and it just wakes up the sleeping spe-manager thread. 3) by PPE scheduler, the corresponding bottom half, spu_irq_class_1_bottom() is called in process context and DMA is restarted. There can be a quite large time gap between 2) and 3) and I found the following problem: Between 2) and 3) If the context becomes unbound, 3) is not executed because when the spe-manager thread is awaken, the context is already saved. (This situation can happen, for example, when a high priority spe thread newly started in that time gap) But the actual problem is that the corresponding SPU context does not work even if it is bound again to a SPU. Besides I can see the following warning in mambo simulator when the context becomes unbound(in save_mfc_cmd()), i.e. when unbind() is called for the context after step 2) before 3) : 'WARNING: 61392752237: SPE2: MFC_CMD_QUEUE channel count of 15 is inconsistent with number of available DMA queue entries of 16' After I go through available documents, I found that the problem is because the suspended DMA is not restarted when it is bound again. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit a68cf983f635930ea35f9e96b27d96598550dea0 Author: Mark Nutter Date: Wed Oct 4 17:26:12 2006 +0200 [POWERPC] spufs: scheduler support for NUMA. This patch adds NUMA support to the the spufs scheduler. The new arch/powerpc/platforms/cell/spufs/sched.c is greatly simplified, in an attempt to reduce complexity while adding support for NUMA scheduler domains. SPUs are allocated starting from the calling thread's node, moving to others as supported by current->cpus_allowed. Preemption is gone as it was buggy, but should be re-enabled in another patch when stable. The new arch/powerpc/platforms/cell/spu_base.c maintains idle lists on a per-node basis, and allows caller to specify which node(s) an SPU should be allocated from, while passing -1 tells spu_alloc() that any node is allowed. Since the patch removes the currently implemented preemptive scheduling, it is technically a regression, but practically all users have since migrated to this version, as it is part of the IBM SDK and the yellowdog distribution, so there is not much point holding it back while the new preemptive scheduling patch gets delayed further. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 27d5bf2a35c0762f1358e9ef39776733cd942121 Author: Benjamin Herrenschmidt Date: Wed Oct 4 17:26:11 2006 +0200 [POWERPC] spufs: cell spu problem state mapping updates This patch adds a new "psmap" file to spufs that allows mmap of all of the problem state mapping of SPEs. It is compatible with 64k pages. In addition, it removes mmap ability of individual files when using 64k pages, with the exception of signal1 and signal2 which will both map the entire 64k page holding both registers. It also removes CONFIG_SPUFS_MMAP as there is no point in not building mmap support in spufs. It goes along a separate patch to libspe implementing usage of that new file to access problem state registers. Another patch will follow up to fix races opened up by accessing the 'runcntl' register directly, which is made possible with this patch. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ff02cfc76a5040ee125c597baa1cfc9874918ed2 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch Update Kconfig for the w83697hf/hg watchdog driver. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit e223f01a822e999b0aea2e720e12d8bb3532da70 Author: Wim Van Sebroeck Date: Fri Sep 15 17:59:07 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - autodetect patch Change the autodetect code so that it is more generic. Signed-off-by: Wim Van Sebroeck commit 3fdee8db010d5cbf890ec49332ac4946f3f63720 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 16 This is patch 16 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add copyright notice for Samuel Tardieu also. This is the last patch in this series. The original description for Samuel's driver was: driver for the Winbond W83697HF/W83697HG watchdog timer The Winbond SuperIO W83697HF/HG includes a watchdog that can count from 1 to 255 seconds (or minutes). This drivers allows the seconds mode to be used. It exposes a standard /dev/watchdog interface. This chip is currently being used on some motherboards designed by VIA. By default, the module looks for a chip at I/O port 0x2e. The chip can be configured to be at 0x4e on some motherboards, the address can be chosen using the wdt_io module parameter. Using 0 will try to autodetect the address. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit b7b9868ba6f528d60e5869b4a6aad1fe49838b03 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 15 This is patch 15 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Clean-up initialization code - part 2: * the line reading "set second mode & disable keyboard ..." is plain wrong, the register being manipulated (CRF4) is the counter itself, not the control byte (CRF3) -- looks like it has been copied from another driver. * I think garbage is being written in CRF3 (the control word) as the timeout value is being stored in this register (such as 60 for 60 seconds). * We only want to set pin 119 to WDTO# mode and leave the rest of CR29 like it is. * Set count mode to seconds and not minutes. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit fa69afd3c224252890cb30864dc648d1399dd9fe Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 14 This is patch 14 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Clean-up initialization code (part 1: remove w83697hf_select_wd_register() and w83697hf_unselect_wd_register() functions). - Make sure that the watchdog device is stopped as soon as we found it. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 089d8139f4c19c2f4d6984323e9d8a6e77cc92f7 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 13 This is patch 13 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Remove wdt_ctrl (it has been replaced with the w83697hf_write_timeout() function) and redo/clean-up the start/stop/ping code. - Make sure that the watchdog is enabled or disabled When starting or stoping the device (with a call to w83697hf_set_reg(0x30, ?); ). Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit d46ab596e251e35a7e27c95e4e4d01921f3e579e Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 12 This is patch 12 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add w83697hf_write_timeout() to set the watchdog's timeout value. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit a7933e05d46f49385841d09028ee07fae2b383f2 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 11 This is patch 11 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add w83697hf_select_wdt() and w83697hf_deselect_wdt() so that the start/stop/ping code can directly talk to the watchdog. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit c81b2996253a94278057f83a24dfa9053f0dee7a Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 10 This is patch 10 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - check whether the device is really present (we *can* probe for the device now). Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 0cd544763bacad14d0d15fb16d29999b450cb77f Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 9 This is patch 9 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_get_reg() and w83697hf_set_reg() functions. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit fe851ebade80af9b58599c74d61718657b02cfd3 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 8 This is patch 8 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_lock function to leave the chipsets extended function mode. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit f7be3328b6e8b09b3a910a93ef569cba162ea81d Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 7 This is patch 7 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_unlock function to enter the chipsets extended function mode. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit de710d6871c7f569da007f1074710fadf1708c29 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 6 This is patch 6 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - The driver works for both the w83697hf and the w83697hg chipset's. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 44d7d3282baa4080b73adca31648e6ef1e191874 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 5 This is patch 5 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Rename the Extended Function Registers to the names used in the data-sheet. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit eb64419e397aaea55b2ef6904e86b6263a80acc7 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 4 This is patch 4 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - limits the watchdog timeout to 1-63 while this device accepts 1-255. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit db16525e63f8cf554696045e0e360b81e2263279 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 3 This is patch 3 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Fix identation. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit b41a9f59d13a4c4c3f0e0b8d9ff15743607096a2 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 2 This is patch 2 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - wdt_io is 2 bytes long. We should do a request_region for 2 bytes instead of 1. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 8de6fc1e2023954ec21d4e84d002839afed4cad3 Author: Samuel Tardieu Date: Thu Sep 7 11:57:00 2006 +0200 [WATCHDOG] w83697hf/hg WDT driver - patch 1 This is patch 1 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - the note concerning tyan motherboards has been copied from another driver, This doesn't apply here. - the comments concerning CRF6 are wrong as CRF3 is manipulated and CRF6 is never read nor written. - the comments concerning CRF5 are wrong as CRF4 is manipulated and CRF5 is never read nor written. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 196f29c8e8cd3352d26ed7bdf44f622e14adb931 Author: Wim Van Sebroeck Date: Wed Sep 13 21:27:29 2006 +0200 [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl() Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands. ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck Acked-by: Alan Cox Signed-off-by: Andrew Morton commit c310e2b950c949cfc14754baed877eadb1a26f6b Author: Wim Van Sebroeck Date: Sat Sep 2 19:04:02 2006 +0200 [WATCHDOG] Kconfig clean up fixed some more trailing spaces. Signed-off-by: Wim Van Sebroeck commit ab9d441425559aa035ba6327f21e8922e8a13927 Author: Wim Van Sebroeck Date: Sat Sep 2 18:50:20 2006 +0200 [WATCHDOG] w836?7hf_wdt spinlock fixes. Add io spinlocks to prevent possible race conditions between start and stop operations that are issued from different child processes where the master process opened /dev/watchdog. Signed-off-by: Wim Van Sebroeck commit e0845bf4e1df07e16fa39d96508a1ba4a480ce3e Author: Wim Van Sebroeck Date: Sat Sep 2 17:59:54 2006 +0200 [WATCHDOG] Kconfig clean-up * fix typo's according to spellings checker * Fix some leading and trailing spaces Signed-off-by: Wim Van Sebroeck commit f9a8c8913a95aed91bfa81f7d4043c6430423bf8 Author: Marcus Junker Date: Thu Aug 24 17:11:50 2006 +0200 [WATCHDOG] w83697hf WDT driver New watchdog driver for the Winbond W83697HF chipset. Signed-off-by: Marcus Junker Signed-off-by: Wim Van Sebroeck commit aa1fd4d7c3b131026bf156da40fdf94bcbd705aa Author: Wim Van Sebroeck Date: Sat Sep 2 20:53:19 2006 +0200 [WATCHDOG] Winbond SMsC37B787 watchdog fixes * Added io spinlocking * Deleted WATCHDOG_MINOR (it's in the miscdevice include * Changed timer_enabled to use set_bit functions * WDIOC_GETSUPPORT should return -EFAULT or 0 * timeout should be correct before we initialize the watchdog * we should initialize the watchdog before we give access to userspace * Third parameter of module_param is not the default or initial value Signed-off-by: Wim Van Sebroeck commit 8386c8cfb2131b2a9caae3db6bf94292bbbe1caf Author: Wim Van Sebroeck Date: Sat Sep 2 19:32:26 2006 +0200 [WATCHDOG] Winbond SMsC37B787 - remove trailing whitespace Remove trailing whitespace. Signed-off-by: Wim Van Sebroeck commit 485ae77dc7f484563707557ccf8c5d228980619f Author: Sven Anders Date: Thu Aug 24 17:11:50 2006 +0200 [WATCHDOG] Winbond SMsC37B787 watchdog driver New watchdog driver for the Winbond SMsC37B787 chipset. Signed-off-by: Sven Anders Signed-off-by: Wim Van Sebroeck commit afaf5a2d341d33b66b47c2716a263ce593460a08 Author: David Somayajulu Date: Tue Sep 19 10:28:00 2006 -0700 [SCSI] Initial Commit of qla4xxx open-iSCSI driver for Qlogic Corporation's iSCSI HBAs Signed-off-by: Ravi Anand Signed-off-by: David Somayajulu Signed-off-by: Doug Maxey Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ed542bed126caeefc6546b276e4af852d4d34f33 Author: Jeff Garzik Date: Wed Oct 4 07:05:11 2006 -0400 [SCSI] raid class: handle component-add errors Signed-off-by: Jeff Garzik Signed-off-by: James Bottomley commit 83aabc1be551dd1f07266c125ff48ec62a2ce515 Author: Jeff Garzik Date: Wed Oct 4 06:34:03 2006 -0400 [SCSI] SCSI megaraid_sas: handle thrown errors - handle clear_user() error - handle and properly unwind from sysfs errors thrown during mod init - adjust order of calls in megasas_exit() to precisely match registration order in megasas_init() Signed-off-by: Jeff Garzik Updated for extra attribute and Signed-off-by: James Bottomley commit bb0766204c81d6bd01532476aec4e512c960fb4d Author: Jeff Garzik Date: Wed Oct 4 06:19:18 2006 -0400 [SCSI] SCSI aic94xx: handle sysfs errors Handle and unwind from errors returned by driver model functions. Signed-off-by: Jeff Garzik Signed-off-by: James Bottomley commit 13026a6b985b9d1e19330d5656e211f15b5aca3b Author: Jeff Garzik Date: Wed Oct 4 06:00:38 2006 -0400 [SCSI] SCSI st: fix error handling in module init, sysfs - Notice and handle sysfs errors in module init, tape init - Properly unwind errors in module init - Remove bogus st_sysfs_class==NULL test, it is guaranteed !NULL at that point Signed-off-by: Jeff Garzik Signed-off-by: James Bottomley commit 5e4009ba3d5af40f5615fdb4304cc4a9947cca0a Author: Jeff Garzik Date: Wed Oct 4 05:32:54 2006 -0400 [SCSI] SCSI sd: fix module init/exit error handling - Properly handle and unwind errors in init_sd(). Fixes leaks on error, if class_register() or scsi_register_driver() failed. - Ensure that exit_sd() execution order is the perfect inverse of initialization order. FIXME: If some-but-not-all register_blkdev() calls fail, we wind up calling unregister_blkdev() for block devices we did not register. This was a pre-existing bug. Signed-off-by: Jeff Garzik Signed-off-by: James Bottomley commit 37e0333c68ca9cbddfc0108e1889556287563df0 Author: Jeff Garzik Date: Wed Oct 4 05:23:04 2006 -0400 [SCSI] SCSI osst: add error handling to module init, sysfs - check all sysfs-related return codes, and propagate them back to callers - properly unwind errors in osst_probe(), init_osst(). This fixes a leak that occured if scsi driver registration failed, and fixes an oops if sysfs creation returned an error. (unrelated) - kzalloc() cleanup in new_tape_buf() Signed-off-by: Jeff Garzik Signed-off-by: James Bottomley commit de77aaff5f0178f44867f131deb5e2cb1610fe6b Author: Henne Date: Wed Oct 4 10:22:09 2006 +0200 [SCSI] scsi: remove hosts.h Remove the obsolete hosts.h file under drivers/scsi. Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit c1278289363d9976c81b3b2512621fe152280e82 Author: Henne Date: Wed Oct 4 09:33:47 2006 +0200 [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in aic7xxx_old.c. Also replacing lots of whitespaces with tabs in structures and functions which have been changed. Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit 3bdc9d0b408e01c4e556daba0035ba37f603e920 Author: Peter Oberparleiter Date: Wed Oct 4 20:02:30 2006 +0200 [S390] cio: improve unit check handling for internal operations Retry internal operation after unit check instead of aborting them. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 3230015e15d4cf48e1df80fcf70d150f490cffe6 Author: Peter Oberparleiter Date: Wed Oct 4 20:02:26 2006 +0200 [S390] cio: add timeout handler for internal operations. Add timeout handler for common-I/O-layer-internal I/O operations. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 0b2b6e1ddce4696cb7afcbb15a654fe95428a498 Author: Heiko Carstens Date: Wed Oct 4 20:02:23 2006 +0200 [S390] Remove open-coded mem_map usage. Use page_to_phys and pfn_to_page to avoid open-coded mem_map usage. Signed-off-by: Heiko Carstens commit 7676bef9c183fd573822cac9992927ef596d584c Author: Heiko Carstens Date: Wed Oct 4 20:02:19 2006 +0200 [S390] Have s390 use add_active_range() and free_area_init_nodes. Size zones and holes in an architecture independent manner for s390. Signed-off-by: Heiko Carstens commit cb601d41c175b7419efc91075a714d6a157bb0ac Author: Heiko Carstens Date: Wed Oct 4 20:02:15 2006 +0200 [S390] Remove crept in whitespace from head*.S again. Signed-off-by: Heiko Carstens commit 42e47eeb8fb3f9d2abe653cc7f185816068a057d Author: Martin Schwidefsky Date: Wed Oct 4 20:02:12 2006 +0200 [S390] incorrect placement of include. The include of linux/smp.h needs to be done before the #if that checks for the compiler version. Seems like fallout from the inline assembly cleanup patch vs. the directed yield patch. Signed-off-by: Martin Schwidefsky commit 8abfe01dae8c0ed7ca6bfb153a7fcab47df72a52 Author: Heiko Carstens Date: Wed Oct 4 20:02:09 2006 +0200 [S390] Wire up sys_getcpu system call. Signed-off-by: Heiko Carstens commit 4e56296d471a827fdd244cfdb6a1e62fc3af7af0 Author: Ralph Wuerthner Date: Wed Oct 4 20:02:05 2006 +0200 [S390] zcrypt device registration/unregistration race. Fix a race condition during AP device registration and unregistration. Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit f1ee3281bedbbca70a1f53bc715ea6f27c616052 Author: Cornelia Huck Date: Wed Oct 4 20:02:02 2006 +0200 [S390] Add timeouts during sense PGID, path verification and disband PGID. While the machine owns us an interrupt in these cases (and we should get one), reality isn't always like that... Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit b05e37035298148b6c311eccf06ac50fd389f0b2 Author: Martin Schwidefsky Date: Wed Oct 4 20:01:58 2006 +0200 [S390] user-copy optimization fallout. Fix new restore_sigregs function. It copies the user space copy of the old psw without correcting the psw.mask and the psw.addr high order bit. While we are at it, simplify save_sigregs a bit. Signed-off-by: Martin Schwidefsky commit aa97b102527ff94fe04930a660f897ef2bafb2a8 Author: Martin Schwidefsky Date: Wed Oct 4 20:01:52 2006 +0200 [S390] update default configuration Signed-off-by: Martin Schwidefsky commit 2a3681e56e825bce469d2ccf3c85741b5005e1f1 Author: Sumant Patro Date: Tue Oct 3 13:19:21 2006 -0700 [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog This patch sets timeout of max 180 seconds for ioctl completion. It also updates the Changelog and hikes the version to 3.05. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 5d018ad057347995e5c4564b3e43339e6497f839 Author: Sumant Patro Date: Tue Oct 3 13:13:18 2006 -0700 [SCSI] megaraid_sas: adds tasklet for cmd completion This patch adds a tasklet for command completion. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 658dcedb4e35d77f7f6552b5a640d7d82c372053 Author: Sumant Patro Date: Tue Oct 3 13:09:14 2006 -0700 [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error This patch adds function to print the pending frame details before returning failure from the reset routine. It also exposes a new variable megasas_dbg_lvl that allows the user to set the debug level for logging. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit b274cab779219325fd480cc696a456d1c3893bd8 Author: Sumant Patro Date: Tue Oct 3 12:52:12 2006 -0700 [SCSI] megaraid_sas: function pointer for disable interrupt This patch adds function pointer to invoke disable interrupt for xscale and ppc IOP based controllers. Removes old implementation that checks for controller type in megasas_disable_intr. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit b1df99d9434edf3fc26f9e36ee6a443e3611e829 Author: Sumant Patro Date: Tue Oct 3 12:40:47 2006 -0700 [SCSI] megaraid_sas: frame count optimization This patch removes duplicated code in frame calculation & adds megasas_get_frame_count() that also takes into account the number of frames that can be contained in the Main frame. FW uses the frame count to pull sufficient number of frames from host memory. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit e3bbff9f3cf91c84c76cfdd5e80041ad1b487192 Author: Sumant Patro Date: Tue Oct 3 12:28:49 2006 -0700 [SCSI] megaraid_sas: FW transition and q size changes This patch has the following enhancements : a. handles new transition states of FW to support controller hotplug. b. It reduces by 1 the maximum cmds that the driver may send to FW. c. Sends "Stop Processing" cmd to FW before returning failure from reset routine d. Adds print in megasas_transition routine e. Sends "RESET" flag to FW to do a soft reset of controller to move from Operational to Ready state. f. Sending correct pointer (cmd->sense) to pci_pool_free Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 2c2345c2b4fec30d12e1e1a6ee153a80af101e32 Author: Roger Gammans Date: Wed Oct 4 13:37:45 2006 +0200 [PATCH] Document bi_sector and sector_t Signed-Off-By: Roger Gammans Signed-off-by: Jens Axboe commit f583f4924d669d36de677e0cc2422ee95203d444 Author: David C Somayajulu Date: Wed Oct 4 08:27:25 2006 +0200 [PATCH] helper function for retrieving scsi_cmd given host based block layer tag This was necessitated by the need for a function to get back to a scsi_cmnd, when an hba the posts its (corresponding) completion interrupt with a block layer tag as its reference. Signed-off-by: Mike Christie Signed-off-by: David Somayajulu Signed-off-by: Jens Axboe commit 4d5e392c33820dc8861423bb1b8dae205ea0ad3d Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:11 2006 +0200 [PATCH] atmel_serial: Fix roundoff error in atmel_console_get_options The atmel_console_get_options() function initializes the baud, parity and bits settings from the actual hardware setup, in case it has been initialized by a e.g. boot loader. The baud rate, however, is not necessarily exactly equal to one of the standard baud rates (115200, etc.) This means that the baud rate calculated by this function may be slightly higher or slightly lower than one of the standard baud rates. If the baud rate is slightly lower than the target, this causes problems when uart_set_option() tries to match the detected baud rate against the standard baud rate, as it will always select a baud rate that is lower or equal to the target rate. For example if the detected baud rate is slightly lower than 115200, usart_set_options() will select 57600. This patch fixes the problem by subtracting 1 from the value in BRGR when calculating the baud rate. The detected baud rate will thus always be higher than the nearest standard baud rate, and uart_set_options() will end up doing the right thing. Tested on ATSTK1000 and AT91RM9200-EK boards. Both are broken without this patch. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit c194588dba968510b5aa7a1818bd2c8b36a416f7 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:10 2006 +0200 [PATCH] AVR32: Allow renumbering of serial devices Allow the board to remap actual USART peripheral devices to serial devices by calling at32_map_usart(hw_id, serial_line). This ensures that even though ATSTK1002 uses USART1 as the first serial port, it will still have a ttyS0 device. This also adds a board-specific early setup hook and moves the at32_setup_serial_console() call there from the platform code. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit acca9b83acfe89fbb7421d5412176dee2ad2959a Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:09 2006 +0200 [PATCH] atmel_serial: Support AVR32 Make CONFIG_SERIAL_ATMEL selectable on AVR32 and #ifdef out some ARM- specific code in the driver. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 75d35213777e2b278db57a420efbce2bdb61da93 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:08 2006 +0200 [PATCH] atmel_serial: Pass fixed register mappings through platform_data In order to initialize the serial console early, the atmel_serial driver had to do a hack where it compared the physical address of the port with an address known to be permanently mapped, and used it as a virtual address. This got around the limitation that ioremap() isn't always available when the console is being initalized. This patch removes that hack and replaces it with a new "regs" field in struct atmel_uart_data that the board-specific code can initialize to a fixed virtual mapping for platform devices where this is possible. It also initializes the DBGU's regs field with the address the driver used to check against. On AVR32, the "regs" field is initialized from the physical base address when this it can be accessed through a permanently 1:1 mapped segment, i.e. the P4 segment. If regs is NULL, the console initialization is delayed until the "real" driver is up and running and ioremap() can be used. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 71f2e2b8783f7b270b673e31e2322572057b286a Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:07 2006 +0200 [PATCH] atmel_serial: Rename at91_register_uart_fns Rename at91_register_uart_fns and associated structs and variables to make it consistent with the atmel_ prefix used by the rest of the driver. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 9ab4f88b7ffdf338773e7755f923bc6b9e079834 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:06 2006 +0200 [PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL The at91_serial driver can be used with both AT32 and AT91 devices from Atmel and has therefore been renamed atmel_serial. The only thing left is to rename PORT_AT91 PORT_ATMEL. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 7192f92c799e4bf4943e3e233d6e4d786ac4d8a4 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:05 2006 +0200 [PATCH] at91_serial -> atmel_serial: Internal names Prefix all internal functions and variables with atmel_ instead of at91_. The at91_register_uart_fns() stuff is left as is since I can't find any actual users of it. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 73e2798b0f3f4fa8ff7d3e8138027a8352359bb5 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:04 2006 +0200 [PATCH] at91_serial -> atmel_serial: Public definitions Rename the following public definitions: * AT91_NR_UART -> ATMEL_MAX_UART * struct at91_uart_data -> struct atmel_uart_data * at91_default_console_device -> atmel_default_console_device Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 1e8ea80219564c3433dbca7afe075ced9eb8117c Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:03 2006 +0200 [PATCH] at91_serial -> atmel_serial: Platform device name Rename the "at91_usart" platform driver "atmel_usart" and update platform devices accordingly. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 749c4e60334580ee0f1427eb90ad006fecbffd21 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:02 2006 +0200 [PATCH] at91_serial -> atmel_serial: Kconfig symbols Rename the following Kconfig symbols: * CONFIG_SERIAL_AT91 -> CONFIG_SERIAL_ATMEL * CONFIG_SERIAL_AT91_CONSOLE -> CONFIG_SERIAL_ATMEL_CONSOLE * CONFIG_SERIAL_AT91_TTYAT -> CONFIG_SERIAL_ATMEL_TTYAT Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit b6156b4e2e3b725ae3549882f59c82ab5b5048a5 Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:01 2006 +0200 [PATCH] at91_serial -> atmel_serial: at91_serial.c Rename at91_serial.c atmel_serial.c Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit 5b34821a601ea079184efba2f9c7c7af61241bde Author: Haavard Skinnemoen Date: Wed Oct 4 16:02:00 2006 +0200 [PATCH] at91_serial -> atmel_serial: at91rm9200_usart.h Move include/asm/arch/at91rm9200_usart.h into drivers/serial and rename it atmel_usart.h. Also delete AVR32's version of this file. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds commit c4710e65c005339b5979fa258bf89940dc2a700b Author: David Woodhouse Date: Wed Oct 4 17:32:21 2006 +0100 [MIPS] Remove remaining reference to ite_gpio.h from Kbuild Signed-off-by: David Woodhouse Signed-off-by: Ralf Baechle commit 7009af8cd37f7904939aec6bd2325c581abd7cac Author: Vitaly Wool Date: Wed Oct 4 19:19:58 2006 +0400 [MIPS] PNX8550 fixups This patch fixes the compilation errors on PNX8550 and hard-to-track bug in interrupt handling. It also corresponds to the latest changes in PNX8550 serial driver. Signed-off-by: Vitaly Wool Signed-off-by: Ralf Baechle commit a0a00cbf8ae5cea3d72e28982c06f3270420c657 Author: Alan Cox Date: Wed Oct 4 12:47:14 2006 +0100 [PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync This fixes support for rev c8 of the ALi/ULi PATA, and keeps pcmcia in sync so ide_cs and pata_pcmcia are interchangable, both are only changes to constants. Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the field now. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 11966adc33fa1504c2d9a78e6fc129e5c87bdee1 Author: Jeff Garzik Date: Wed Oct 4 04:41:53 2006 -0400 [PATCH] RTC: build fixes Fix obvious build breakage revealed by 'make allyesconfig' in current -git. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 5b9b5572c87b460cd91f7722ac233d1873cfb084 Author: Andrew Morton Date: Wed Oct 4 02:17:32 2006 -0700 [PATCH] git-powerpc: wrapper: don't require execute permissions If you lose the x bit (eg: by using patch(1)), powerpc won't build. Be defensive about it... Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ece7f77b86e53bfe14699fdbcb0f03fdad0a01d6 Author: Adrian Bunk Date: Wed Oct 4 02:17:31 2006 -0700 [PATCH] kill sound/oss/*_syms.c Move all EXPORT_SYMBOL's from sound/oss/*_syms.c to the files with the actual functions. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 Author: Adrian Bunk Date: Wed Oct 4 02:17:22 2006 -0700 [PATCH] The scheduled removal of some OSS drivers This patch contains the scheduled removal of OSS drivers that: - have ALSA drivers for the same hardware without known regressions and - whose Kconfig options have been removed in 2.6.17. [michal.k.k.piotrowski@gmail.com: build fix] Signed-off-by: Adrian Bunk Signed-off-by: Michal Piotrowski Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 595182bcdf64fbfd7ae22c67ea6081b7d387d246 Author: Josh Triplett Date: Wed Oct 4 02:17:21 2006 -0700 [PATCH] RCU: CREDITS and MAINTAINERS Add MAINTAINERS entry for Read-Copy Update (RCU), listing Dipankar Sarma as maintainer, and giving the URL for Paul McKenney's RCU site. Add MAINTAINERS entry for rcutorture, listing myself as maintainer. Add CREDITS entries for developers of RCU, RCU variants, and rcutorture. Use Paul McKenney's preferred email address in include/linux/rcupdate.h . Signed-off-by: Josh Triplett Cc: Paul McKenney Cc: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20e9751bd9dd6b832fd84ada27840360f7e877f1 Author: Oleg Nesterov Date: Wed Oct 4 02:17:17 2006 -0700 [PATCH] rcu: simplify/improve batch tuning Kill a hard-to-calculate 'rsinterval' boot parameter and per-cpu rcu_data.last_rs_qlen. Instead, it adds adds a flag rcu_ctrlblk.signaled, which records the fact that one of CPUs has sent a resched IPI since the last rcu_start_batch(). Roughly speaking, we need two rcu_start_batch()s in order to move callbacks from ->nxtlist to ->donelist. This means that when ->qlen exceeds qhimark and continues to grow, we should send a resched IPI, and then do it again after we gone through a quiescent state. On the other hand, if it was already sent, we don't need to do it again when another CPU detects overflow of the queue. Signed-off-by: Oleg Nesterov Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b6c2cca6eef9cc4a15350bf1c61839e12e08b84 Author: Josh Triplett Date: Wed Oct 4 02:17:16 2006 -0700 [PATCH] rcu: add sched torture type to rcutorture Implement torture testing for the "sched" variant of RCU, which uses preempt_disable, preempt_enable, and synchronize_sched. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11a147013e39ff4cb031395cb78a9d307c4799cd Author: Josh Triplett Date: Wed Oct 4 02:17:16 2006 -0700 [PATCH] rcu: add rcu_bh_sync torture type to rcutorture Use the newly-generic synchronous deferred free function to implement torture testing for rcu_bh using synchronize_rcu_bh rather than the asynchronous call_rcu_bh. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20d2e4283a97665a3db78c60dfa342a0c7c1b180 Author: Josh Triplett Date: Wed Oct 4 02:17:15 2006 -0700 [PATCH] rcu: add rcu_sync torture type to rcutorture Use the newly-generic synchronous deferred free function to implement torture testing for RCU using synchronize_rcu rather than the asynchronous call_rcu. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3033736581f125ba5fd6c0760e0d430d54fb5c0 Author: Josh Triplett Date: Wed Oct 4 02:17:14 2006 -0700 [PATCH] rcu: refactor srcu_torture_deferred_free to work for any implementation Make srcu_torture_deferred_free use cur_ops->sync() so it will work for any implementation. Move and rename it in preparation for use in the ops of other implementations. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b772e1dd4b1e60a7a160f7bd4ea08e28394ceb54 Author: Josh Triplett Date: Wed Oct 4 02:17:13 2006 -0700 [PATCH] RCU: add fake writers to rcutorture rcutorture currently has one writer and an arbitrary number of readers. To better exercise some of the code paths in RCU implementations, add fake writer threads which call the synchronize function for the RCU variant in a loop, with a delay between calls to arrange for different numbers of writers running in parallel. [bunk@stusta.de: cleanup] Acked-by: Paul McKenney Cc: Dipkanar Sarma Signed-off-by: Josh Triplett Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75cfef32f26d03f5d0a0833572d52f94ad858a36 Author: Josh Triplett Date: Wed Oct 4 02:17:12 2006 -0700 [PATCH] rcu: Fix sign bug making rcu_random always return the same sequence rcu_random uses a counter rrs_count to occasionally mix data from get_random_bytes into the state of its pseudorandom generator. However, the rrs_counter gets declared as an unsigned long, and rcu_random checks for --rrs_count < 0, so this code will never mix any real random data into the state, and will thus always return the same sequence of random numbers. Also, change the return value of rcu_random from long to unsigned long, to avoid potential issues caused by the use of the % operator, which can return negative values for negative left operands. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2860aaba4dc87fa43c08724434b87a8650f3bff5 Author: Josh Triplett Date: Wed Oct 4 02:17:11 2006 -0700 [PATCH] rcu: Avoid kthread_stop on invalid pointer if rcutorture reader startup fails rcu_torture_init kmallocs the array of reader threads, then creates each one with kthread_run, cleaning up with rcu_torture_cleanup if this fails. rcu_torture_cleanup calls kthread_stop on any non-NULL pointer in the array; however, any readers after the one that failed to start up will have invalid pointers, not null pointers. Avoid this by using kzalloc instead. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c29e03d9121e07714fb9e5303d9b026800ffd5a Author: Josh Triplett Date: Wed Oct 4 02:17:10 2006 -0700 [PATCH] rcu: Mention rcu_bh in description of rcutorture's torture_type parameter The comment for rcutorture's torture_type parameter only lists the RCU variants rcu and srcu, but not rcu_bh; add rcu_bh to the list. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff2c93a5373f12f86f3281705d11278a9f2334e2 Author: Josh Triplett Date: Wed Oct 4 02:17:09 2006 -0700 [PATCH] rcu: Add MODULE_AUTHOR to rcutorture module Signed-off-by: Josh Triplett Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4dfdbb3c707474a2254c5b4d7e62be31a4b7da9 Author: Alan Stern Date: Wed Oct 4 02:17:06 2006 -0700 [PATCH] cpufreq: make the transition_notifier chain use SRCU This patch (as762) changes the cpufreq_transition_notifier_list from a blocking_notifier_head to an srcu_notifier_head. This will prevent errors caused attempting to call down_read() to access the notifier chain at a time when interrupts must remain disabled, during system suspend. It's not clear to me whether this is really necessary; perhaps the chain could be made into an atomic_notifier. However a couple of the callout routines do use blocking operations, so this approach seems safer. The head of the notifier chain needs to be initialized before use; this is done by an __init routine at core_initcall time. If this turns out not to be a good choice, it can easily be changed. Signed-off-by: Alan Stern Cc: "Paul E. McKenney" Cc: Jesse Brandeburg Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a92013ba458804161c0c5b6d134d82204dc233 Author: Alan Stern Date: Wed Oct 4 02:17:05 2006 -0700 [PATCH] SRCU: report out-of-memory errors Currently the init_srcu_struct() routine has no way to report out-of-memory errors. This patch (as761) makes it return -ENOMEM when the per-cpu data allocation fails. The patch also makes srcu_init_notifier_head() report a BUG if a notifier head can't be initialized. Perhaps it should return -ENOMEM instead, but in the most likely cases where this might occur I don't think any recovery is possible. Notifier chains generally are not created dynamically. [akpm@osdl.org: avoid statement-with-side-effect in macro] Signed-off-by: Alan Stern Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eabc069401bcf45bcc3f19e643017bf761780aa8 Author: Alan Stern Date: Wed Oct 4 02:17:04 2006 -0700 [PATCH] Add SRCU-based notifier chains This patch (as751) adds a new type of notifier chain, based on the SRCU (Sleepable Read-Copy Update) primitives recently added to the kernel. An SRCU notifier chain is much like a blocking notifier chain, in that it must be called in process context and its callout routines are allowed to sleep. The difference is that the chain's links are protected by the SRCU mechanism rather than by an rw-semaphore, so calling the chain has extremely low overhead: no memory barriers and no cache-line bouncing. On the other hand, unregistering from the chain is expensive and the chain head requires special runtime initialization (plus cleanup if it is to be deallocated). SRCU notifiers are appropriate for notifiers that will be called very frequently and for which unregistration occurs very seldom. The proposed "task notifier" scheme qualifies, as may some of the network notifiers. Signed-off-by: Alan Stern Acked-by: Paul E. McKenney Acked-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2896d2e75c87ea6a842c088db730b03c91db737 Author: Paul E. McKenney Date: Wed Oct 4 02:17:03 2006 -0700 [PATCH] srcu-3: add SRCU operations to rcutorture Adds SRCU operations to rcutorture and updates rcutorture documentation. Also increases the stress imposed by the rcutorture test. [bunk@stusta.de: make needlessly global code static] Signed-off-by: Paul E. McKenney Cc: Paul E. McKenney Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621934ee7ed5b073c7fd638b347e632c53572761 Author: Paul E. McKenney Date: Wed Oct 4 02:17:02 2006 -0700 [PATCH] srcu-3: RCU variant permitting read-side blocking Updated patch adding a variant of RCU that permits sleeping in read-side critical sections. SRCU is as follows: o Each use of SRCU creates its own srcu_struct, and each srcu_struct has its own set of grace periods. This is critical, as it prevents one subsystem with a blocking reader from holding up SRCU grace periods for other subsystems. o The SRCU primitives (srcu_read_lock(), srcu_read_unlock(), and synchronize_srcu()) all take a pointer to a srcu_struct. o The SRCU primitives must be called from process context. o srcu_read_lock() returns an int that must be passed to the matching srcu_read_unlock(). Realtime RCU avoids the need for this by storing the state in the task struct, but SRCU needs to allow a given code path to pass through multiple SRCU domains -- storing state in the task struct would therefore require either arbitrary space in the task struct or arbitrary limits on SRCU nesting. So I kicked the state-storage problem up to the caller. Of course, it is not permitted to call synchronize_srcu() while in an SRCU read-side critical section. o There is no call_srcu(). It would not be hard to implement one, but it seems like too easy a way to OOM the system. (Hey, we have enough trouble with call_rcu(), which does -not- permit readers to sleep!!!) So, if you want it, please tell me why... [josht@us.ibm.com: sparse notation] Signed-off-by: Paul E. McKenney Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95d77884c77beed676036d2f74d10b470a483c63 Author: Eric W. Biederman Date: Wed Oct 4 02:17:01 2006 -0700 [PATCH] htirq: tidy up the htirq code This moves the declarations for the architecture helpers into include/linux/htirq.h from the generic include/linux/pci.h. Hopefully this will make this distinction clearer. htirq.h is included where it is needed. The dependency on the msi code is fixed and removed. The Makefile is tidied up. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Tony Luck Cc: Andi Kleen Cc: Thomas Gleixner Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03571e11c4a6d08230657f80970f0a5cc7820471 Author: Eric W. Biederman Date: Wed Oct 4 02:17:00 2006 -0700 [PATCH] msi: move the ia64 code into arch/ia64 This is just a few makefile tweaks and some file renames. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Tony Luck Cc: Andi Kleen Cc: Thomas Gleixner Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b7d1921f4cdd6d6ddb7899ae7a8d413991c5cf4 Author: Eric W. Biederman Date: Wed Oct 4 02:16:59 2006 -0700 [PATCH] msi: refactor and move the msi irq_chip into the arch code It turns out msi_ops was simply not enough to abstract the architecture specific details of msi. So I have moved the resposibility of constructing the struct irq_chip to the architectures, and have two architecture specific functions arch_setup_msi_irq, and arch_teardown_msi_irq. For simple architectures those functions can do all of the work. For architectures with platform dependencies they can call into the appropriate platform code. With this msi.c is finally free of assuming you have an apic, and this actually takes less code. The helpers for the architecture specific code are declared in the linux/msi.h to keep them separate from the msi functions used by drivers in linux/pci.h Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Tony Luck Cc: Andi Kleen Cc: Thomas Gleixner Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 277bc33bc2479707e88b0b2ae6fe56e8e4aabe81 Author: Eric W. Biederman Date: Wed Oct 4 02:16:57 2006 -0700 [PATCH] msi: only use a single irq_chip for msi interrupts The logic works like this. Since we no longer track the state logic by hand in msi.c startup and shutdown are no longer needed. By updating msi_set_mask_bit to work on msi devices that do not implement a mask bit we can always call the mask/unmask functions. What we really have are mask and unmask so we use them to implement the .mask and .unmask functions instead of .enable and .disable. By switching to the handle_edge_irq handler we only need an ack function that moves the irq if necessary. Which removes the old end and ack functions and their peculiar logic of sometimes disabling an irq. This removes the reliance on pre genirq irq handling methods. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Tony Luck Cc: Andi Kleen Cc: Thomas Gleixner Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f80025e624bb14fefadfef7e80fbfb9740d4714 Author: Eric W. Biederman Date: Wed Oct 4 02:16:56 2006 -0700 [PATCH] msi: simplify msi sanity checks by adding with generic irq code Currently msi.c is doing sanity checks that make certain before an irq is destroyed it has no more users. By adding irq_has_action I can perform the test is a generic way, instead of relying on a msi specific data structure. By performing the core check in dynamic_irq_cleanup I ensure every user of dynamic irqs has a test present and we don't free resources that are in use. In msi.c this allows me to kill the attrib.state member of msi_desc and all of the assciated code to maintain it. To keep from freeing data structures when irq cleanup code is called to soon changing dyanamic_irq_cleanup is insufficient because there are msi specific data structures that are also not safe to free. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Tony Luck Cc: Andi Kleen Cc: Thomas Gleixner Cc: Greg KH Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b955b0dddb35e398b07e217a81f8bd49400796f Author: Eric W. Biederman Date: Wed Oct 4 02:16:55 2006 -0700 [PATCH] Initial generic hypertransport interrupt support This patch implements two functions ht_create_irq and ht_destroy_irq for use by drivers. Several other functions are implemented as helpers for arch specific irq_chip handlers. The driver for the card I tested this on isn't yet ready to be merged. However this code is and hypertransport irqs are in use in a few other places in the kernel. Not that any of this will get merged before 2.6.19 Because the ipath-ht400 is slightly out of spec this code will need to be generalized to work there. I think all of the powerpc uses are for a plain interrupt controller in a chipset so support for native hypertransport devices is a little less interesting. However I think this is a half way decent model on how to separate arch specific and generic helper code, and I think this is a functional model of how to get the architecture dependencies out of the msi code. [akpm@osdl.org: Kconfig fix] Signed-off-by: Eric W. Biederman Cc: Greg KH Cc: Andi Kleen Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e78d01693be38bf93dd6bb49b86e143da450de86 Author: Eric W. Biederman Date: Wed Oct 4 02:16:54 2006 -0700 [PATCH] Add Hypertransport capability defines This adds defines for the hypertransport capability subtypes and starts using them a little. [akpm@osdl.org: fix typo] Signed-off-by: Eric W. Biederman Acked-by: Benjamin Herrenschmidt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd1182f56a064d42d10e289ef4018f9c2230247d Author: Eric W. Biederman Date: Wed Oct 4 02:16:53 2006 -0700 [PATCH] genirq: x86_64 irq: Kill irq compression With more irqs in the system we don't need this. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f023d764cc6165eb4f1cad6b2b0882ce0660764a Author: Eric W. Biederman Date: Wed Oct 4 02:16:52 2006 -0700 [PATCH] genirq: x86_64 irq: Kill gsi_irq_sharing After raising the number of irqs the system supports this function is no longer necessary. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 550f2299ac8ffaba943cf211380d3a8d3fa75301 Author: Eric W. Biederman Date: Wed Oct 4 02:16:51 2006 -0700 [PATCH] genirq: x86_64 irq: make vector_irq per cpu This refactors the irq handling code to make the vectors a per cpu resource so the same vector number can be simultaneously used on multiple cpus for different irqs. This should make systems that were hitting limits on the total number of irqs much more livable. [akpm@osdl.org: build fix] [akpm@osdl.org: __target_IO_APIC_irq is unneeded on UP] Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e500f57436b9056a245216c53113613928155eba Author: Eric W. Biederman Date: Wed Oct 4 02:16:50 2006 -0700 [PATCH] genirq: x86_64 irq: Make the external irq handlers report their vector, not the irq number This is a small pessimization but it paves the way for making this information per cpu. Which allows the the maximum number of IRQS to become NR_CPUS*224. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23d0b8b053391afe15c9667d80de77ca88e18b8b Author: Eric W. Biederman Date: Wed Oct 4 02:16:49 2006 -0700 [PATCH] genirq: irq: generalize the check for HARDIRQ_BITS This patch adds support for systems that cannot receive every interrupt on a single cpu simultaneously, in the check to see if we have enough HARDIRQ_BITS. MAX_HARDIRQS_PER_CPU becomes the count of the maximum number of hardare generated interrupts per cpu. On architectures that support per cpu interrupt delivery this can be a significant space savings and scalability bonus. This patch adds support for systems that cannot receive every interrupt on Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 323a01c50832749d23664954f91df6fc43e73975 Author: Eric W. Biederman Date: Wed Oct 4 02:16:48 2006 -0700 [PATCH] genirq: irq: remove msi hacks Because of the nasty way that CONFIG_PCI_MSI was implemented we wound up with set_irq_info and set_native_irq_info, with move_irq and move_native_irq. Both functions did the same thing but they were built and called under different circumstances. Now that the msi hacks are gone we can kill move_irq and set_irq_info. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b Author: Eric W. Biederman Date: Wed Oct 4 02:16:47 2006 -0700 [PATCH] genirq: i386 irq: Remove the msi assumption that irq == vector This patch removes the change in behavior of the irq allocation code when CONFIG_PCI_MSI is defined. Removing all instances of the assumption that irq == vector. create_irq is rewritten to first allocate a free irq and then to assign that irq a vector. assign_irq_vector is made static and the AUTO_ASSIGN case which allocates an vector not bound to an irq is removed. The ioapic vector methods are removed, and everything now works with irqs. The definition of NR_IRQS no longer depends on CONFIG_PCI_MSI [akpm@osdl.org: cleanup] Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04b9267b15206fc902a18de1f78de6c82ca47716 Author: Eric W. Biederman Date: Wed Oct 4 02:16:46 2006 -0700 [PATCH] genirq: x86_64 irq: Remove the msi assumption that irq == vector This patch removes the change in behavior of the irq allocation code when CONFIG_PCI_MSI is defined. Removing all instances of the assumption that irq == vector. create_irq is rewritten to first allocate a free irq and then to assign that irq a vector. assign_irq_vector is made static and the AUTO_ASSIGN case which allocates an vector not bound to an irq is removed. The ioapic vector methods are removed, and everything now works with irqs. The definition of NR_IRQS no longer depends on CONFIG_PCI_MSI Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b2fabb9ec9b3b1cf5cf848a678058fb20c4d552 Author: Eric W. Biederman Date: Wed Oct 4 02:16:45 2006 -0700 [PATCH] genirq: msi: only build msi-apic.c on ia64 After the previous changes ia64 is the only architecture useing msi-apic.c [akpm@osdl.org: unbreak MSI on ia64] Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d3fcc1c54df2f49674e1f7c99d4800ed1d51902 Author: Eric W. Biederman Date: Wed Oct 4 02:16:43 2006 -0700 [PATCH] genirq: i386 irq: Move msi message composition into io_apic.c This removes the hardcoded assumption that irq == vector in the msi composition code, and it allows the msi message composition to setup logical mode, or lowest priorirty delivery mode as we do for other apic interrupts, and with the same selection criteria. Basically this moves the problem of what is in the msi message into the architecture irq management code where it belongs. Not in a generic layer that doesn't have enough information to compose msi messages properly. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 589e367f9b9117b3412da0d4e10ea6882db8da84 Author: Eric W. Biederman Date: Wed Oct 4 02:16:42 2006 -0700 [PATCH] genirq: x86_64 irq: Move msi message composition into io_apic.c This removes the hardcoded assumption that irq == vector in the msi composition code, and it allows the msi message composition to setup logical mode, or lowest priorirty delivery mode as we do for other apic interrupts, and with the same selection criteria. Basically this moves the problem of what is in the msi message into the architecture irq management code where it belongs. Not in a generic layer that doesn't have enough information to compose msi messages properly. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ce03373a7f4b5fa8ca5be02ff35229800a6e12b Author: Eric W. Biederman Date: Wed Oct 4 02:16:41 2006 -0700 [PATCH] genirq: msi: make the msi code irq based and not vector based The msi currently allocates irqs backwards. First it allocates a platform dependent routing value for an interrupt the ``vector'' and then it figures out from the vector which irq you are on. For ia64 this is fine. For x86 and x86_64 this is complete nonsense and makes an enourmous mess of the irq handling code and prevents some pretty significant cleanups in the code for handling large numbers of irqs. This patch refactors msi.c to work in terms of irqs and create_irq/destroy_irq for dynamically managing irqs. Hopefully this is finally a version of msi.c that is useful on more than just x86 derivatives. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4fa0bbf384496ae4acc0a150719d9d8fa8d11b3 Author: Eric W. Biederman Date: Wed Oct 4 02:16:40 2006 -0700 [PATCH] genirq: x86_64 irq: Dynamic irq support The current implementation of create_irq() is a hack but it is the current hack that msi.c uses, and unfortunately the ``generic'' apic msi ops depend on this hack. Thus we are this hack of assuming irq == vector until the depencencies in the generic irq code are removed. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fc471ede99579211c44b6a64829c4318976990f Author: Eric W. Biederman Date: Wed Oct 4 02:16:39 2006 -0700 [PATCH] genirq: i386 irq: Dynamic irq support The current implementation of create_irq() is a hack but it is the current hack that msi.c uses, and unfortunately the ``generic'' apic msi ops depend on this hack. Thus we are stuck this hack of assuming irq == vector until the depencencies in the generic msi code are removed. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6cf2583ba026ca563ff8b15805fcf30b8e192a7 Author: Eric W. Biederman Date: Wed Oct 4 02:16:38 2006 -0700 [PATCH] genirq: ia64 irq: Dynamic irq support [akpm@osdl.org: build fix] Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a16d713626735f3016da0521b7bf251cd78e836 Author: Eric W. Biederman Date: Wed Oct 4 02:16:37 2006 -0700 [PATCH] genirq: irq: add a dynamic irq creation API With the msi support comes a new concept in irq handling, irqs that are created dynamically at run time. Currently the msi code allocates irqs backwards. First it allocates a platform dependent routing value for an interrupt the ``vector'' and then it figures out from the vector which irq you are on. This msi backwards allocator suffers from two basic problems. The allocator suffers because it is trying to do something that is architecture specific in a generic way making it brittle, inflexible, and tied to tightly to the architecture implementation. The alloctor also suffers from it's very backwards nature as it has tied things together that should have no dependencies. To solve the basic dynamic irq allocation problem two new architecture specific functions are added: create_irq and destroy_irq. create_irq takes no input and returns an unused irq number, that won't be reused until it is returned to the free poll with destroy_irq. The irq then can be used for any purpose although the only initial consumer is the msi code. destroy_irq takes an irq number allocated with create_irq and returns it to the free pool. Making this functionality per architecture increases the simplicity of the irq allocation code and increases it's flexibility. dynamic_irq_init() and dynamic_irq_cleanup() are added to automate the irq_desc initializtion that should happen for dynamic irqs. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92db6d10bc1bc43330a4c540fa5b64c83d9d865f Author: Eric W. Biederman Date: Wed Oct 4 02:16:35 2006 -0700 [PATCH] genirq: msi: simplify the msi irq limit policy Currently we attempt to predict how many irqs we will be able to allocate with msi using pci_vector_resources and some complicated accounting, and then we only allow each device as many irqs as we think are available on average. Only the s2io driver even takes advantage of this feature all other drivers have a fixed number of irqs they need and bail if they can't get them. pci_vector_resources is inaccurate if anyone ever frees an irq. The whole implmentation is racy. The current irq limit policy does not appear to make sense with current drivers. So I have simplified things. We can revisit this we we need a more sophisticated policy. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38bc0361303535c86f6b67b151a541728d7bdae6 Author: Eric W. Biederman Date: Wed Oct 4 02:16:34 2006 -0700 [PATCH] genirq: msi: refactor the msi_ops The current msi_ops are short sighted in a number of ways, this patch attempts to fix the glaring deficiences. - Report in msi_ops if a 64bit address is needed in the msi message, so we can fail 32bit only msi structures. - Send and receive a full struct msi_msg in both setup and target. This is a little cleaner and allows for architectures that need to modify the data to retarget the msi interrupt to a different cpu. - In target pass in the full cpu mask instead of just the first cpu in case we can make use of the full cpu mask. - Operate in terms of irqs and not vectors, currently there is still a 1-1 relationship but on architectures other than ia64 I expect this will change. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0366f8f7137deb072991e4c50769c6da31f8940c Author: Eric W. Biederman Date: Wed Oct 4 02:16:33 2006 -0700 [PATCH] genirq: msi: implement helper functions read_msi_msg and write_msi_msg In support of this I also add a struct msi_msg that captures the the two address and one data field ina typical msi message, and I remember the pos and if the address is 64bit in struct msi_desc. This makes the code a little more readable and easier to maintain, and paves the way to further simplfications. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd159eeca971d594fa30176733b66d37acda82a3 Author: Eric W. Biederman Date: Wed Oct 4 02:16:32 2006 -0700 [PATCH] genirq: msi: make the msi boolean tests return either 0 or 1 This allows the output of the msi tests to be stored directly in a bit field. If you don't do this a value greater than one will be truncated and become 0. Changing true to false with bizare consequences. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bd007e480672c99d8656c7b7b12ef0549432c37 Author: Eric W. Biederman Date: Wed Oct 4 02:16:31 2006 -0700 [PATCH] genirq: msi: simplify msi enable and disable The problem. Because the disable routines leave the msi interrupts in all sorts of half enabled states the enable routines become impossible to implement correctly, and almost impossible to understand. Simplifing this allows me to simply kill the buggy reroute_msix_table, and generally makes the code more maintainable. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Cc: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0be6652f1e61b647f738eb25af057bf9551a9841 Author: Eric W. Biederman Date: Wed Oct 4 02:16:30 2006 -0700 [PATCH] genirq: x86_64 irq: Reenable migrating irqs to other cpus In the latest changes the code for migrating x86_64 irqs was dropped. This reads it in a fashion that will work even if we change the vector on level triggered irqs when we migrate them. [akpm@osdl.org: build fix] Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7b946e98a456077dd6897f726f3d6197bd7e3b9 Author: Eric W. Biederman Date: Wed Oct 4 02:16:29 2006 -0700 [PATCH] genirq: irq: add moved_masked_irq Currently move_native_irq disables and renables the irq we are migrating to ensure we don't take that irq when we are actually doing the migration operation. Disabling the irq needs to happen but sometimes doing the work is move_native_irq is too late. On x86 with ioapics the irq move sequences needs to be: edge_triggered: mask irq. move irq. unmask irq. ack irq. level_triggered: mask irq. ack irq. move irq. unmask irq. We can easily perform the edge triggered sequence, with the current defintion of move_native_irq. However the level triggered case does not map well. For that I have added move_masked_irq, to allow me to disable the irqs around both the ack and the move. Q: Why have we not seen this problem earlier? A: The only symptom I have been able to reproduce is that if we change the vector before acknowleding an irq the wrong irq is acknowledged. Since we currently are not reprogramming the irq vector during migration no problems show up. We have to mask the irq before we acknowledge the irq or else we could hit a window where an irq is asserted just before we acknowledge it. Edge triggered irqs do not have this problem because acknowledgements do not propogate in the same way. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a24ceab4f44f21749aa0b6bd38bee37c775e036f Author: Eric W. Biederman Date: Wed Oct 4 02:16:27 2006 -0700 [PATCH] genirq: irq: convert the move_irq flag from a 32bit word to a single bit The primary aim of this patchset is to remove maintenances problems caused by the irq infrastructure. The two big issues I address are an artificially small cap on the number of irqs, and that MSI assumes vector == irq. My primary focus is on x86_64 but I have touched other architectures where necessary to keep them from breaking. - To increase the number of irqs I modify the code to look at the (cpu, vector) pair instead of just looking at the vector. With a large number of irqs available systems with a large irq count no longer need to compress their irq numbers to fit. Removing a lot of brittle special cases. For acpi guys the result is that irq == gsi. - Addressing the fact that MSI assumes irq == vector takes a few more patches. But suffice it to say when I am done none of the generic irq code even knows what a vector is. In quick testing on a large Unisys x86_64 machine we stumbled over at least one driver that assumed that NR_IRQS could always fit into an 8 bit number. This driver is clearly buggy today. But this has become a class of bugs that it is now much easier to hit. This patch: This is a minor space optimization. In practice I don't think this has any affect because of our alignment constraints and the other fields but there is not point in chewing up an uncessary word and since we already read the flag field this should improve the cache hit ratio of the irq handler. Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5b9ed7acdcfea4bf73a70dececa7483787503ed Author: Ingo Molnar Date: Wed Oct 4 02:16:26 2006 -0700 [PATCH] genirq: convert the i386 architecture to irq-chips This patch converts all the i386 PIC controllers (except VisWS and Voyager, which I could not test - but which should still work as old-style IRQ layers) to the new and simpler irq-chip interrupt handling layer. [akpm@osdl.org: build fix] [mingo@elte.hu: enable fasteoi handler for i386 level-triggered IO-APIC irqs] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f29bd1ba68c8c6a0f50bd678bbd5a26674018f7c Author: Ingo Molnar Date: Wed Oct 4 02:16:25 2006 -0700 [PATCH] genirq: convert the x86_64 architecture to irq-chips This patch converts all the x86_64 PIC controllers layers to the new and simpler irq-chip interrupt handling layer. [mingo@elte.hu: The patch also enables the fasteoi handler for x86_64] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Roland Dreier Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0271eb947db2704a0ff8be68d72915ab021d1ead Author: Andrew Morton Date: Wed Oct 4 02:16:24 2006 -0700 [PATCH] fbdev: riva warning fix drivers/video/riva/fbdev.c: In function `riva_get_EDID_OF': drivers/video/riva/fbdev.c:1846: warning: assignment discards qualifiers from pointer target type This code is being bad: copying a pointer to read-only OF data into a non-const pointer. Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 237fead619984cc48818fe12ee0ceada3f55b012 Author: Michael Halcrow Date: Wed Oct 4 02:16:22 2006 -0700 [PATCH] ecryptfs: fs/Makefile and fs/Kconfig eCryptfs is a stacked cryptographic filesystem for Linux. It is derived from Erez Zadok's Cryptfs, implemented through the FiST framework for generating stacked filesystems. eCryptfs extends Cryptfs to provide advanced key management and policy features. eCryptfs stores cryptographic metadata in the header of each file written, so that encrypted files can be copied between hosts; the file will be decryptable with the proper key, and there is no need to keep track of any additional information aside from what is already in the encrypted file itself. [akpm@osdl.org: updates for ongoing API changes] [bunk@stusta.de: cleanups] [akpm@osdl.org: alpha build fix] [akpm@osdl.org: cleanups] [tytso@mit.edu: inode-diet updates] [pbadari@us.ibm.com: generic_file_*_read/write() interface updates] [rdunlap@xenotime.net: printk format fixes] [akpm@osdl.org: make slab creation and teardown table-driven] Signed-off-by: Phillip Hellewell Signed-off-by: Michael Halcrow Signed-off-by: Erez Zadok Signed-off-by: Adrian Bunk Signed-off-by: Stephan Mueller Signed-off-by: "Theodore Ts'o" Signed-off-by: Badari Pulavarty Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7aa2638f288f4c67acdb55947472740bd27d27a Author: Cedric Le Goater Date: Wed Oct 4 02:16:21 2006 -0700 [PATCH] Fix linux/nfsd/const.h for make headers_check make headers_check fails on linux/nfsd/const.h. Since linux/sunrpc/msg_prot.h does not seem to export anything interesting for userspace, this patch moves it in the __KERNEL__ protected section. Signed-off-by: Cedric Le Goater Cc: David Woodhouse Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ca09938157105c1f573c831a35e9c3e02eb354 Author: J.Bruce Fields Date: Wed Oct 4 02:16:20 2006 -0700 [PATCH] knfsd: nfsd4: actually use all the pieces to implement referrals Use all the pieces set up so far to implement referral support, allowing return of NFS4ERR_MOVED and fs_locations attribute. Signed-off-by: Manoj Naik Signed-off-by: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81c3f4130202a1dcb2b28ab56684eb5e9d43d8c1 Author: J.Bruce Fields Date: Wed Oct 4 02:16:19 2006 -0700 [PATCH] knfsd: nfsd4: xdr encoding for fs_locations Encode fs_locations attribute. Signed-off-by: Manoj Naik Signed-off-by: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 933469190ed5915b0568bc564346bb8db718f460 Author: Manoj Naik Date: Wed Oct 4 02:16:18 2006 -0700 [PATCH] knfsd: nfsd4: fslocations data structures Define FS locations structures, some functions to manipulate them, and add code to parse FS locations in downcall and add to the exports structure. [bfields@fieldses.org: bunch of fixes and cleanups] Signed-off-by: Manoj Naik Signed-off-by: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b009a873de05c6e0d7613df3584b6dcb2e4280ee Author: J.Bruce Fields Date: Wed Oct 4 02:16:17 2006 -0700 [PATCH] knfsd: nfsd: store export path in export Store the export path in the svc_export structure instead of storing only the dentry. This will prevent the need for additional d_path calls to provide NFSv4 fs_locations support. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21c0d8fdd95024ffa708a938099148b8f1078d46 Author: NeilBrown Date: Wed Oct 4 02:16:16 2006 -0700 [PATCH] knfsd: close a race-opportunity in d_splice_alias There is a possible race in d_splice_alias. Though __d_find_alias(inode, 1) will only return a dentry with DCACHE_DISCONNECTED set, it is possible for it to get cleared before the BUG_ON, and it is is not possible to lock against that. There are a couple of problems here. Firstly, the code doesn't match the comment. The comment describes a 'disconnected' dentry as being IS_ROOT as well as DCACHE_DISCONNECTED, however there is not testing of IS_ROOT anythere. A dentry is marked DCACHE_DISCONNECTED when allocated with d_alloc_anon, and remains DCACHE_DISCONNECTED while a path is built up towards the root. So a dentry can have a valid name and a valid parent and even grandparent, but will still be DCACHE_DISCONNECTED until a path to the root is created. Once the path to the root is complete, everything in the path gets DCACHE_DISCONNECTED cleared. So the fact that DCACHE_DISCONNECTED isn't enough to say that a dentry is free to be spliced in with a given name. This can only be allowed if the dentry does not yet have a name, so the IS_ROOT test is needed too. However even adding that test to __d_find_alias isn't enough. As d_splice_alias drops dcache_lock before calling d_move to perform the splice, it could race with another thread calling d_splice_alias to splice the inode in with a different name in a different part of the tree (in the case where a file has hard links). So that splicing code is only really safe for directories (as we know that directories only have one link). For directories, the caller of d_splice_alias will be holding i_mutex on the (unique) parent so there is no room for a race. A consequence of this is that a non-directory will never benefit from being spliced into a pre-exisiting dentry, but that isn't a problem. It is perfectly OK for a non-directory to have multiple dentries, some anonymous, some not. And the comment for d_splice_alias says that it only happens for directories anyway. Signed-off-by: Neil Brown Cc: Christoph Hellwig Cc: Al Viro Cc: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44c556000a31e8079cfbb9a42a7edb93ca6b589a Author: NeilBrown Date: Wed Oct 4 02:16:15 2006 -0700 [PATCH] knfsd: fix auto-sizing of nfsd request/reply buffers totalram is measured in pages, not bytes, so PAGE_SHIFT must be used when trying to find 1/4096 of RAM. Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b54dae2b0defb30babb0fe87b13463b9f4b2907 Author: NeilBrown Date: Wed Oct 4 02:16:15 2006 -0700 [PATCH] knfsd: lockd: fix refount on nsm If nlm_lookup_host finds what it is looking for it exits with an extra reference on the matching 'nsm' structure. So don't actually count the reference until we are (fairly) sure it is going to be used. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b66285cee3f9abad26cca6c9b848e1ad6b792d94 Author: J.Bruce Fields Date: Wed Oct 4 02:16:14 2006 -0700 [PATCH] knfsd: nfsd4: acls: fix handling of zero-length acls It is legal to have zero-length NFSv4 acls; they just deny everything. Also, nfs4_acl_nfsv4_to_posix will always return with pacl and dpacl set on success, so the caller doesn't need to check this. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3b64eb6efb1ef46f6629b66a429e7f2b5955003 Author: J.Bruce Fields Date: Wed Oct 4 02:16:13 2006 -0700 [PATCH] knfsd: nfsd4: acls: simplify nfs4_acl_nfsv4_to_posix interface There's no need to handle the case where the caller passes in null for pacl or dpacl; no caller does that, because it would be a dumb thing to do. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b548edc2dd9440c561f3302cb9f212ef2d06a8ef Author: J.Bruce Fields Date: Wed Oct 4 02:16:12 2006 -0700 [PATCH] knfsd: nfsd4: acls: fix inheritance We can be a little more flexible about the flags allowed for inheritance (in particular, we can deal with either the presence or the absence of INHERIT_ONLY), but we should probably reject other combinations that we don't understand. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09229edb68a3961db54174a2725055bd1589b4b8 Author: J.Bruce Fields Date: Wed Oct 4 02:16:11 2006 -0700 [PATCH] knfsd: nfsd4: acls: relax the nfsv4->posix mapping Use a different nfsv4->(draft posix) acl mapping which is 1. completely backwards compatible, 2. accepts any nfsv4 acl, and 3. errs on the side of restricting permissions. In detail: 1. completely backwards compatible: The new mapping produces the same result on any acl produced by the existing (draft posix)->nfsv4 mapping; the one exception is that we no longer attempt to guess the value of the mask by assuming certain denies represent the mask. Since the server still keeps track of the mask locally, sequences of chmod's will still be handled fine; the only thing this will change is sequences of chmod's with intervening read-modify-writes of the acl. That last case just isn't worth the trouble and the possible misrepresentations of the user's intent (if we guess that a certain deny indicates masking is in effect when it really isn't). 2. accepts any nfsv4 acl: That's not quite true: we still reject acls that use combinations of inheritance flags that we don't support. We also reject acls that attempt to explicitly deny read_acl or read_attributes permissions, or that attempt to deny write_acl or write_attributes permissions to the owner of the file. 3. errs on the side of restricting permissions: one exception to this last rule: we totally ignore some bits (write_owner, synchronize, read_named_attributes, etc.) that are completely alien to our filesystem semantics, in some cases even if that would mean ignoring an explicit deny that we have no intention of enforcing. Excepting that, the posix acl produced should be the most permissive acl that is not more permissive than the given nfsv4 acl. And the new code's shorter, too. Neato. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6 Author: J.Bruce Fields Date: Wed Oct 4 02:16:10 2006 -0700 [PATCH] knfsd: nfsd4: clean up exp_pseudoroot The previous patch enables some minor simplification here. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f38b20c64519bb812a49b9ef4e10d90367a5af5c Author: J.Bruce Fields Date: Wed Oct 4 02:16:09 2006 -0700 [PATCH] knfsd: nfsd4: refactor exp_pseudoroot We could be using more common code in exp_pseudoroot(). This will also simplify some changes we need to make later. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f8e05c5708d7e9017c47f395f8b1498f7f52922 Author: J.Bruce Fields Date: Wed Oct 4 02:16:08 2006 -0700 [PATCH] knfsd: svcrpc: use consistent variable name for the reply state The rpc reply has multiple levels of error returns. The code here contributes to the confusion by using "accept_statp" for a pointer to what the rfc (and wireshark, etc.) refer to as the "reply_stat". (The confusion is compounded by the fact that the rfc also has an "accept_stat" which follows the reply_stat in the succesful case.) Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b304bc5bfccc82b856e876e829c260df8e67ff2 Author: J.Bruce Fields Date: Wed Oct 4 02:16:07 2006 -0700 [PATCH] knfsd: svcrpc: gss: fix failure on SVC_DENIED in integrity case If the request is denied after gss_accept was called, we shouldn't try to wrap the reply. We were checking the accept_stat but not the reply_stat. To check the reply_stat in _release, we need a pointer to before (rather than after) the verifier, so modify body_start appropriately. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c15a486643a103eaf068e5fb3b7f9d720d579a7 Author: J.Bruce Fields Date: Wed Oct 4 02:16:06 2006 -0700 [PATCH] knfsd: svcrpc: gss: factor out some common wrapping code Factor out some common code from the integrity and privacy cases. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89e63ef609fb0064a47281e31e38010159c32d57 Author: Neil Brown Date: Wed Oct 4 02:16:06 2006 -0700 [PATCH] Convert lockd to use the newer mutex instead of the older semaphore Both the (recently introduces) nsm_sema and the older f_sema are converted over. Cc: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc5fea4299b8bda5f73c6f79dc35d388caf8bced Author: Olaf Kirch Date: Wed Oct 4 02:16:05 2006 -0700 [PATCH] knfsd: register all RPC programs with portmapper by default The NFSACL patches introduced support for multiple RPC services listening on the same transport. However, only the first of these services was registered with portmapper. This was perfectly fine for nfsacl, as you traditionally do not want these to show up in a portmapper listing. The patch below changes the default behavior to always register all services listening on a given transport, but retains the old behavior for nfsacl services. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ade060ee51b9b6cf18d580405dc9ab90067f69f Author: Olaf Kirch Date: Wed Oct 4 02:16:04 2006 -0700 [PATCH] knfsd: lockd: fix use of h_nextrebind nlmclnt_recovery would try to force a portmap rebind by setting host->h_nextrebind to 0. The right thing to do here is to set it to the current time. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 460f5cac1e24e947509b6112c99c5bc9ff687b45 Author: Olaf Kirch Date: Wed Oct 4 02:16:03 2006 -0700 [PATCH] knfsd: export nsm_local_state to user space via sysctl Every NLM call includes the client's NSM state. Currently, the Linux client always reports 0 - which seems not to cause any problems, but is not what the protocol says. This patch exposes the kernel's internal variable to user space via a sysctl, which can be set at system boot time by statd. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39be4502cb75dc26007fe1659735b26c8e63fcc6 Author: Olaf Kirch Date: Wed Oct 4 02:16:03 2006 -0700 [PATCH] knfsd: match GRANTED_RES replies using cookies When we send a GRANTED_MSG call, we current copy the NLM cookie provided in the original LOCK call - because in 1996, some broken clients seemed to rely on this bug. However, this means the cookies are not unique, so that when the client's GRANTED_RES message comes back, we cannot simply match it based on the cookie, but have to use the client's IP address in addition. Which breaks when you have a multi-homed NFS client. The X/Open spec explicitly mentions that clients should not expect the same cookie; so one may hope that any clients that were broken in 1996 have either been fixed or rendered obsolete. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 031d869d0e0be18cfe35526be5608225b8f0a7be Author: Olaf Kirch Date: Wed Oct 4 02:16:02 2006 -0700 [PATCH] knfsd: make nlmclnt_next_cookie SMP safe The way we incremented the NLM cookie in nlmclnt_next_cookie was not thread safe. This patch changes the counter to an atomic_t Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abd1f50094cad9dff6d68ada98b495549f52fc30 Author: Olaf Kirch Date: Wed Oct 4 02:16:01 2006 -0700 [PATCH] knfsd: lockd: optionally use hostnames for identifying peers This patch adds the nsm_use_hostnames sysctl and module param. If set, lockd will use the client's name (as given in the NLM arguments) to find the NSM handle. This makes recovery work when the NFS peer is multi-homed, and the reboot notification arrives from a different IP than the original lock calls. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 350fce8dbf43f7d441b77366851c9ce3cd28d6dc Author: NeilBrown Date: Wed Oct 4 02:16:00 2006 -0700 [PATCH] knfsd: simplify nlmsvc_invalidate_all As a result of previous patches, the loop in nlmsvc_invalidate_all just sets h_expires for all client/hosts to 0 (though does it in a very complicated way). This was possibly meant to trigger early garbage collection but half the time '0' is in the future and so it infact delays garbage collection. Pre-aging the 'hosts' is not really needed at this point anyway so we throw out the loop and nlm_find_client which is no longer needed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c53c1bb94f30cecee79ca0a8e9977640338283be Author: Olaf Kirch Date: Wed Oct 4 02:16:00 2006 -0700 [PATCH] knfsd: lockd: Add nlm_destroy_host This patch moves the host destruction code out of nlm_host_gc into a function of its own. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2af793db02d2c2f677bdb5bf8e0efdcbf9c0256 Author: Olaf Kirch Date: Wed Oct 4 02:15:59 2006 -0700 [PATCH] knfsd: lockd: make nlm_traverse_* more flexible This patch makes nlm_traverse{locks,blocks,shares} and friends use a function pointer rather than a "action" enum. This function pointer is given two nlm_hosts (one given by the caller, the other taken from the lock/block/share currently visited), and is free to do with them as it wants. If it returns a non-zero value, the lockd/block/share is released. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07ba80635117c136714084e019375aa508365375 Author: Olaf Kirch Date: Wed Oct 4 02:15:58 2006 -0700 [PATCH] knfsd: change nlm_file to use a hlist This changes struct nlm_file and the nlm_files hash table to use a hlist instead of the home-grown lists. This allows us to remove f_hash which was only used to find the right hash chain to delete an entry from. It also increases the size of the nlm_files hash table from 32 to 128. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68a2d76cea4234bc027df23085d9df4f2171f7fc Author: Olaf Kirch Date: Wed Oct 4 02:15:57 2006 -0700 [PATCH] knfsd: lockd: Change list of blocked list to list_node This patch changes the nlm_blocked list to use a list_node instead of homegrown linked list handling. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cea32761a2f954c6d42ca79d7d1e6b9663b1e4a Author: Olaf Kirch Date: Wed Oct 4 02:15:56 2006 -0700 [PATCH] knfsd: lockd: make the hash chains use a hlist_node Get rid of the home-grown singly linked lists for the nlm_host hash table. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9502c52259f7038b6c1e31532e22884716a56b1a Author: Olaf Kirch Date: Wed Oct 4 02:15:56 2006 -0700 [PATCH] knfsd: lockd: make the nsm upcalls use the nsm_handle This converts the statd upcalls to use the nsm_handle This means that we only register each host once with statd, rather than registering each host/vers/protocol triple. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c8dd29ca7fc7483690cef4306549742d534f2a2 Author: Olaf Kirch Date: Wed Oct 4 02:15:55 2006 -0700 [PATCH] knfsd: lockd: Make nlm_host_rebooted use the nsm_handle This patch makes the SM_NOTIFY handling understand and use the nsm_handle. To make it a bit clear what is happening: nlmclent_prepare_reclaim and nlmclnt_finish_reclaim get open-coded into 'reclaimer' The result is tidied up. Then some of that functionality is moved out into nlm_host_rebooted (which calls nlmclnt_recovery which starts a thread which runs reclaimer). Also host_rebooted now finds an nsm_handle rather than a host, then then iterates over all hosts and deals with each host that shares that nsm_handle. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0737a39a64a9df32bb045c54e1cdf6cecdcbdd7 Author: Olaf Kirch Date: Wed Oct 4 02:15:54 2006 -0700 [PATCH] knfsd: misc minor fixes, indentation changes cleans up some code in lockd/host.c, fixes an error printk and makes it a fatal BUG if nlmsvc_free_host_resources fails. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dead0dbd478f35fd943f3719591e5af1ac0950d Author: Olaf Kirch Date: Wed Oct 4 02:15:53 2006 -0700 [PATCH] knfsd: lockd: introduce nsm_handle This patch introduces the nsm_handle, which is shared by all nlm_host objects referring to the same client. With this patch applied, all nlm_hosts from the same address will share the same nsm_handle. A future patch will add sharing by name. Note: this patch changes h_name so that it is no longer guaranteed to be an IP address of the host. When the host represents an NFS server, h_name will be the name passed in the mount call. When the host represents a client, h_name will be the name presented in the lock request received from the client. A h_name is only used for printing informational messages, this change should not be significant. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db4e4c9a9e741ee812e1febf5e386d6a24218a71 Author: Olaf Kirch Date: Wed Oct 4 02:15:52 2006 -0700 [PATCH] knfsd: when looking up a lockd host, pass hostname & length This patch adds the peer's hostname (and name length) to all calls to nlm*_lookup_host functions. A subsequent patch will make use of these (is requested by a sysctl). Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf712c24d72341effcfd28330b83b49f77cb627b Author: Olaf Kirch Date: Wed Oct 4 02:15:52 2006 -0700 [PATCH] knfsd: consolidate common code for statd->lockd notification Common code from nlm4svc_proc_sm_notify and nlmsvc_proc_sm_notify is moved into a new nlm_host_rebooted. This is in preparation of a patch that will change the reboot notification handling entirely. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 977faf392fc898407554bbe7338d57b29e3660cf Author: Olaf Kirch Date: Wed Oct 4 02:15:51 2006 -0700 [PATCH] knfsd: hide use of lockd's h_monitored flag This patch moves all checks of the h_monitored flag into the nsm_monitor/unmonitor functions. A subsequent patch will replace the mechanism by which we mark a host as being monitored. There is still one occurence of h_monitored outside of mon.c and that is in clntlock.c where we respond to a reboot. The subsequent patch will modify this too. Signed-off-by: Olaf Kirch Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b2b1fee30df7e2165525cd03f7d1d01a3a56794 Author: Greg Banks Date: Wed Oct 4 02:15:50 2006 -0700 [PATCH] knfsd: knfsd: cache ipmap per TCP socket Speed up high call-rate workloads by caching the struct ip_map for the peer on the connected struct svc_sock instead of looking it up in the ip_map cache hashtable on every call. This helps workloads using AUTH_SYS authentication over TCP. Testing was on a 4 CPU 4 NIC Altix using 4 IRIX clients, each with 16 synthetic client threads simulating an rsync (i.e. recursive directory listing) workload reading from an i386 RH9 install image (161480 regular files in 10841 directories) on the server. That tree is small enough to fill in the server's RAM so no disk traffic was involved. This setup gives a sustained call rate in excess of 60000 calls/sec before being CPU-bound on the server. Profiling showed strcmp(), called from ip_map_match(), was taking 4.8% of each CPU, and ip_map_lookup() was taking 2.9%. This patch drops both contribution into the profile noise. Note that the above result overstates this value of this patch for most workloads. The synthetic clients are all using separate IP addresses, so there are 64 entries in the ip_map cache hash. Because the kernel measured contained the bug fixed in commit commit 1f1e030bf75774b6a283518e1534d598e14147d4 and was running on 64bit little-endian machine, probably all of those 64 entries were on a single chain, thus increasing the cost of ip_map_lookup(). With a modern kernel you would need more clients to see the same amount of performance improvement. This patch has helped to scale knfsd to handle a deployment with 2000 NFS clients. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fce1456a19f5c08b688c29f00ef90fdfa074c79b Author: Greg Banks Date: Wed Oct 4 02:15:49 2006 -0700 [PATCH] knfsd: make nfsd readahead params cache SMP-friendly Make the nfsd read-ahead params cache more SMP-friendly by changing the single global list and lock into a fixed 16-bucket hashtable with per-bucket locks. This reduces spinlock contention in nfsd_read() on read-heavy workloads on multiprocessor servers. Testing was on a 4 CPU 4 NIC Altix using 4 IRIX clients each doing 1K streaming reads at full line rate. The server had 128 nfsd threads, which sizes the RA cache at 256 entries, of which only a handful were used. Flat profiling shows nfsd_read(), including the inlined nfsd_get_raparms(), taking 10.4% of each CPU. This patch drops the contribution from nfsd() to 1.71% for each CPU. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 596bbe53eb3abfe7326b2f5e8afd614265c319c8 Author: NeilBrown Date: Wed Oct 4 02:15:48 2006 -0700 [PATCH] knfsd: Allow max size of NFSd payload to be configured The max possible is the maximum RPC payload. The default depends on amount of total memory. The value can be set within reason as long as no nfsd threads are currently running. The value can also be ready, allowing the default to be determined after nfsd has started. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7adae489fe794e3e203ff168595f635d0b845e59 Author: Greg Banks Date: Wed Oct 4 02:15:47 2006 -0700 [PATCH] knfsd: Prepare knfsd for support of rsize/wsize of up to 1MB, over TCP The limit over UDP remains at 32K. Also, make some of the apparently arbitrary sizing constants clearer. The biggest change here involves replacing NFSSVC_MAXBLKSIZE by a function of the rqstp. This allows it to be different for different protocols (udp/tcp) and also allows it to depend on the servers declared sv_bufsiz. Note that we don't actually increase sv_bufsz for nfs yet. That comes next. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cc03b164cf01c6f36e64720b58610d292fb26f7 Author: NeilBrown Date: Wed Oct 4 02:15:47 2006 -0700 [PATCH] knfsd: Avoid excess stack usage in svc_tcp_recvfrom .. by allocating the array of 'kvec' in 'struct svc_rqst'. As we plan to increase RPCSVC_MAXPAGES from 8 upto 256, we can no longer allocate an array of this size on the stack. So we allocate it in 'struct svc_rqst'. However svc_rqst contains (indirectly) an array of the same type and size (actually several, but they are in a union). So rather than waste space, we move those arrays out of the separately allocated union and into svc_rqst to share with the kvec moved out of svc_tcp_recvfrom (various arrays are used at different times, so there is no conflict). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4452435948424e5322c2a2fefbdc2cf3732cc45d Author: NeilBrown Date: Wed Oct 4 02:15:46 2006 -0700 [PATCH] knfsd: Replace two page lists in struct svc_rqst with one We are planning to increase RPCSVC_MAXPAGES from about 8 to about 256. This means we need to be a bit careful about arrays of size RPCSVC_MAXPAGES. struct svc_rqst contains two such arrays. However the there are never more that RPCSVC_MAXPAGES pages in the two arrays together, so only one array is needed. The two arrays are for the pages holding the request, and the pages holding the reply. Instead of two arrays, we can simply keep an index into where the first reply page is. This patch also removes a number of small inline functions that probably server to obscure what is going on rather than clarify it, and opencode the needed functionality. Also remove the 'rq_restailpage' variable as it is *always* 0. i.e. if the response 'xdr' structure has a non-empty tail it is always in the same pages as the head. check counters are initilised and incr properly check for consistant usage of ++ etc maybe extra some inlines for common approach general review Signed-off-by: Neil Brown Cc: Magnus Maatta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5680c44632053a6c9464bca43083f01776d318da Author: NeilBrown Date: Wed Oct 4 02:15:45 2006 -0700 [PATCH] knfsd: Fixed handling of lockd fail when adding nfsd socket Arrgg.. We cannot 'lockd_up' before 'svc_addsock' as we don't know the protocol yet.... So switch it around again and save the name of the created sockets so that it can be closed if lock_up fails. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda9e0cd8a6b30ccc32edced066c378fbd87003d Author: NeilBrown Date: Wed Oct 4 02:15:44 2006 -0700 [PATCH] knfsd: Protect update to sn_nrthreads with lock_kernel Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37a034729ae611295bbb8e925333d4d54d7c1ebc Author: NeilBrown Date: Wed Oct 4 02:15:44 2006 -0700 [PATCH] knfsd: call lockd_down when closing a socket via a write to nfsd/portlist The refcount that nfsd holds on lockd is based on the number of open sockets. So when we close a socket, we should decrement the ref (with lockd_down). Currently when a socket is closed via writing to the portlist file, that doesn't happen. So: make sure we get an error return if the socket that was requested does is not found, and call lockd_down if it was. Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ed94296a660a61989b5d54f0c4bb804f30567d3 Author: NeilBrown Date: Wed Oct 4 02:15:43 2006 -0700 [PATCH] knfsd: nfsd: lockdep annotation fix nfsv2 needs the I_MUTEX_PARENT on the directory when creating a file too. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d02a030b01443f1cb81f22750113fe9a98109d9 Author: Jiri Slaby Date: Wed Oct 4 02:15:42 2006 -0700 [PATCH] hisax niccy cleanup Whitespace cleanup, delete unnecesasry parenthesis and braces. Signed-off-by: Jiri Slaby Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 176f00ffed3ef94a198326fbf6a5db64f1cf73ad Author: Pierre Ossman Date: Wed Oct 4 02:15:41 2006 -0700 [PATCH] mmc: properly use the new multi block-write error handling Use the new multi block-write error reporting flag and properly tell the block layer how much data was transferred before the error. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7104e2d5a85b4b786d6a63568beffe1e185547bb Author: Pierre Ossman Date: Wed Oct 4 02:15:41 2006 -0700 [PATCH] mmc: use own work queue The MMC layer uses the standard work queue for doing card detection. As this queue is shared with other crucial subsystems, the effects of a long (and perhaps buggy) detection can cause the system to be unusable. E.g. the keyboard stops working while the detection routine is running. The solution is to add a specific mmc work queue to run the detection code in. This is similar to how other subsystems handle detection (a full kernel thread is the most common theme). Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a4da1430f7f2a16df3be9c7b5d55ba4e75b708c Author: Pierre Ossman Date: Wed Oct 4 02:15:40 2006 -0700 [PATCH] mmc: avoid some resets without card Some Ricoh controllers only respect a full reset when there is no card in the slot. As we wait for the reset to complete, we must avoid even requesting those resets on the buggy controllers. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f25a66f6bbac563c94af94f03491b3ae43c40af Author: Pierre Ossman Date: Wed Oct 4 02:15:39 2006 -0700 [PATCH] mmc: fix MMIO vs memory races in sdhci Sprinkle some mmiowb() where needed (writeX() before unlock()). Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9565129993446e16678cfc4d9c7f3b7e75eecbd Author: Alex Dubov Date: Wed Oct 4 02:15:38 2006 -0700 [PATCH] mmc: driver for TI FlashMedia card reader - Kconfig/Makefile Signed-off-by: Alex Dubov Cc: Daniel Qarras Acked-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4020f2d7f0b0e68b92bec9a3e1f4a54a7a9dc672 Author: Alex Dubov Date: Wed Oct 4 02:15:37 2006 -0700 [PATCH] mmc: driver for TI FlashMedia card reader - source Driver for TI Flash Media card reader. At present, only MMC/SD cards are supported. [akpm@osdl.org: cleanups, build fixes] Signed-off-by: Alex Dubov Cc: Daniel Qarras Acked-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 856fe98f168e5b80b053979769af2514aab96d6b Author: Jim Cromie Date: Wed Oct 4 02:15:35 2006 -0700 [PATCH] scx200_hrt: fix precedence bug manifesting as 27x clock in 1 MHz mode Fix paren-placement / precedence bug breaking initialization for 1 MHz clock mode. Also fix comment spelling error, and fence-post (off-by-one) error on symbol used in request_region. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=7242 Thanks alexander.krause@erazor-zone.de, dzpost@dedekind.net, for the reports and patch test, and phelps@mantara.com for the independent patch and verification. Signed-off-by: Jim Cromie Cc: Cc: Cc: Acked-by: John Stultz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bded00bf62090ebc9d6e8be640cdb69e8497db6 Author: Kenji Kaneshige Date: Wed Oct 4 02:15:34 2006 -0700 [PATCH] fix "PCI: assign ioapic resource at hotplug" Roland Dreier wrote: > The change "PCI: assign ioapic resource at hotplug" (commit > 23186279658cea6d42a050400d3e79c56cb459b4 in Linus's tree) makes > networking stop working on my system (SuperMicro H8QC8 with four > dual-core Opteron 885 CPUs). In particular, the on-board NIC stops > working, probably because it gets assigned the wrong IRQ (225 in the > non-working case, 217 in the working case) > > With that patch applied, e1000 doesn't work. Reverting just that > patch (shown below) from Linus's latest tree fixes things for me. > The cause of this problem might be an wrong assumption that the 'start' member of resource structure for ioapic device has non-zero value if the resources are assigned by firmware. The 'start' member of ioapic device seems not to be set even though the resources were actually assigned to ioapic devices by firmware. Cc: Kenji Kaneshige Cc: MUNEDA Takahiro Cc: Satoru Takeuchi Cc: Kristen Carlson Accardi Cc: Greg Kroah-Hartman Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18e39913d41ca4d63e9e94a2ad25b5ea31caaa7f Author: David Gibson Date: Wed Oct 4 02:15:32 2006 -0700 [PATCH] Fix spurious error on TAGS target when missing defconfig Not all architectures have a file named 'defconfig' (e.g. powerpc). However the make TAGS and make tags targets search such files for tags, causing an error message when they don't exist. This patch addresses the problem by instructing xargs not to run the tags program if there are no matching files. Signed-off-by: David Gibson Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 585b7747d63e3a5f65628d21c1745edd926d7897 Author: Eric Sesterhenn Date: Wed Oct 4 02:15:30 2006 -0700 [PATCH] Remove unnecessary check in fs/reiserfs/inode.c Since all callers dereference dir, we dont need this check. Coverity id #337. Signed-off-by: Eric Sesterhenn Cc: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit add216608a63713b8a2c4545698d5ae02e27ac3b Author: Thomas Maier Date: Wed Oct 4 02:15:30 2006 -0700 [PATCH] pktcdvd: rename a variable for better readability pktcdvd: Rename a variable for better readability. Signed-off-by: Thomas Maier Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7822082d4e054fbdec8cf26590a350e3496c5cc9 Author: Thomas Maier Date: Wed Oct 4 02:15:28 2006 -0700 [PATCH] pktcdvd: Replace pktcdvd strings with macro DRIVER_NAME. pktcdvd: Replace pktcdvd strings with macro DRIVER_NAME. Signed-off-by: Thomas Maier Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d321765f7cbc2dc0683374c91bb3720d57331d37 Author: Jiri Slaby Date: Wed Oct 4 02:15:28 2006 -0700 [PATCH] Char: serial167, remove useless tty check serial167, remove useless tty check tty is dereferenced before it is checked to be non-NULL. Remove such check. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3218a79aa3d58b975b066c300153a8520f7051c Author: Jiri Slaby Date: Wed Oct 4 02:15:27 2006 -0700 [PATCH] char: kill unneeded memsets char, another tmp_buf cleanup No need to allocate one page as a side buffer. It's no more used. Clean this (de)allocs of this useless memory pages in char subtree. Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d2c8eea698514cfaa53fc991b960791d09508e1 Author: Christoph Hellwig Date: Wed Oct 4 02:15:25 2006 -0700 [PATCH] slab: clean up leak tracking ifdefs a little bit - rename ____kmalloc to kmalloc_track_caller so that people have a chance to guess what it does just from it's name. Add a comment describing it for those who don't. Also move it after kmalloc in slab.h so people get less confused when they are just looking for kmalloc - move things around in slab.c a little to reduce the ifdef mess. [penberg@cs.helsinki.fi: Fix up reversed #ifdef] Signed-off-by: Christoph Hellwig Signed-off-by: Pekka Enberg Cc: Christoph Lameter Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88ca3b94e82e763ef90c8e57cacd51a3c143ea62 Author: Randy Dunlap Date: Wed Oct 4 02:15:25 2006 -0700 [PATCH] page_alloc: fix kernel-doc and func. declaration Fix kernel-doc and function declaration (missing "void") in mm/page_alloc.c. Add mm/page_alloc.c to kernel-api.tmpl in DocBook. mm/page_alloc.c:2589:38: warning: non-ANSI function declaration of function 'remove_all_active_ranges' Signed-off-by: Randy Dunlap Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe1668ae5bf0145014c71797febd9ad5670d5d05 Author: Chen, Kenneth W Date: Wed Oct 4 02:15:24 2006 -0700 [PATCH] enforce proper tlb flush in unmap_hugepage_range Spotted by Hugh that hugetlb page is free'ed back to global pool before performing any TLB flush in unmap_hugepage_range(). This potentially allow threads to abuse free-alloc race condition. The generic tlb gather code is unsuitable to use by hugetlb, I just open coded a page gathering list and delayed put_page until tlb flush is performed. Cc: Hugh Dickins Signed-off-by: Ken Chen Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e80ee884ae0e3794ef2b65a18a767d502ad712ee Author: Nick Piggin Date: Wed Oct 4 02:15:23 2006 -0700 [PATCH] mm: micro optimise zone_watermark_ok Having min be a signed quantity means gcc can't turn high latency divides into shifts. There happen to be two such divides for GFP_ATOMIC (ie. networking, ie. important) allocations, one of which depends on the other. Fixing this makes code smaller as a bonus. Shame on somebody (probably me). Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2abacf3a2699a8020829c85c16f358ba85cecaf Author: Henrik Kretzschmar Date: Wed Oct 4 02:15:22 2006 -0700 [PATCH] mm: fix in kerneldoc Fixes an kerneldoc error. Signed-off-by: Henrik Kretzschmar Cc: "Randy.Dunlap" Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e95be9a5326f0f6d314a7aa04a3c0c0e67fa976b Author: Daniel Walker Date: Wed Oct 4 02:15:21 2006 -0700 [PATCH] docs: small kbuild cleanup While reading this I noticed that the contents of this document list section "3.8 Command line dependency" but it doesn't exist in the document. Signed-off-by: Daniel Walker Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e776b1d5e976d6bb2aafb177dde7d5f8d2bf37f Author: Andrew Morton Date: Wed Oct 4 02:15:20 2006 -0700 [PATCH] hdrcheck permission fix Don't require that scripts/hdrcheck.sh be executable - shit happens... Cc: Sam Ravnborg Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b119f13f56a7a47915278ab5eb3c666ca5dbb067 Author: Cedric Le Goater Date: Wed Oct 4 02:15:19 2006 -0700 [PATCH] ipc: headers_check fix Fix headers_check #ifdef __KERNEL__ stuff. Signed-off-by: Cedric Le Goater All-the-fault-of: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f024a251f0b3b179bbc8fc62f3a650e49359db5 Author: Andrew Morton Date: Sun Oct 1 16:17:13 2006 -0400 [PARISC] Kill wall_jiffies use wall_jiffies and jiffies are now equal, so this is a noop... Signed-off-by: Andrew Morton Signed-off-by: Kyle McMartin commit 22fced881122f7fc6f5f259dca03ac6d5c601404 Author: Helge Deller Date: Sat Sep 30 15:45:58 2006 +0200 [PARISC] Honour "panic_on_oops" sysctl Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit dc02747da7897cb89b62bb08aeb06fa0bb1e7319 Author: Matthew Wilcox Date: Sun Sep 24 13:35:50 2006 -0600 [PARISC] Fix fs/binfmt_som.c Fix compilation (missing include of a.out.h) Fix security hole (need to call unshare_files) Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 8d0b7d1055bedca784b143b0af9b37bd971b7cd2 Author: Matthew Wilcox Date: Wed Sep 20 21:44:09 2006 -0600 [PARISC] Export clear_user_page to modules Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 99b6e9be71b9ad2c50c0d160b5af18848fee466d Author: Matthew Wilcox Date: Wed Sep 20 20:36:42 2006 -0600 [PARISC] Make DMA routines more stubby We were pretending to use the GENERIC_ISA_DMA routines, but never selected that symbol. Since ISA DMA is known to not work right now, just remove the attempts to acquire the dma_spin_lock to fix compile warnings. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit f312094556619aed849862089938c14aa6a5b84b Author: Matthew Wilcox Date: Tue Sep 19 19:37:09 2006 -0600 [PARISC] Define pci_get_legacy_ide_irq We can compile at least one IDE driver that refers to this. We can't use the asm-generic file because we have our own definitions of pcibios_resource_to_bus etc. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit d207ac0f7c9736782bfa51cff2109b74d26c3622 Author: Matthew Wilcox Date: Tue Sep 19 19:32:42 2006 -0600 [PARISC] Fix CONFIG_DEBUG_SPINLOCK Joel Soete points out that we refer to pa_tlb_lock but only define it if CONFIG_SMP which breaks a uniprocessor build with CONFIG_DEBUG_SPINLOCK enabled. No module refers to pa_tlb_lock, so we can delete the export. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 32f468139209459c3293a0895cf5b8e66ccc30a5 Author: Matthew Wilcox Date: Tue Sep 19 16:44:38 2006 -0600 [PARISC] Fix HPUX compat compile with current GCC GCC no longer allows a cast as lvalue; fix the same way fs/readdir.c was Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 01232e932988fcf6ad87be49f69e633dd652a46d Author: Matthew Wilcox Date: Tue Sep 19 16:37:01 2006 -0600 [PARISC] Fix iounmap compile warning iounmap's argument needs to be both const and volatile, otherwise we'll get warnings that we're discarding pointer qualifiers Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 08a6436816f7a16113c73be767ee8d50440e494e Author: Kyle McMartin Date: Thu Aug 24 21:33:40 2006 -0400 [PARISC] Add support for Quicksilver AGPGART Signed-off-by: Kyle McMartin commit 983daeec99f07fca0a8a9180ba1ca65bbd40c820 Author: Kyle McMartin Date: Fri Aug 25 12:28:24 2006 -0400 [PARISC] Move LBA and SBA register defines to the common ropes.h header. This will allow the use of more constants in the agpgart driver. Signed-off-by: Kyle McMartin commit 1790cf9111f61d360d861901b97eba4de3b5414c Author: Kyle McMartin Date: Thu Aug 24 21:32:49 2006 -0400 [PARISC] Create shared header Pull out struct sba_device and struct lba_device into a common ropes.h header. Also fold the parisc portion of iosapic.h into this file. (Then delete the useless portion of iosapic.h) Signed-off-by: Kyle McMartin commit b0eecc4da9c0a5261711e0d83280fd5d1e3db742 Author: Kyle McMartin Date: Thu Aug 24 21:31:41 2006 -0400 [PARISC] Stash the lba_device in its struct device drvdata Signed-off-by: Kyle McMartin commit 1b240f415f42204ff5a885c1c552b26a2ee780a1 Author: Kyle McMartin Date: Thu Aug 24 21:30:19 2006 -0400 [PARISC] Generalize IS_ASTRO et al to take a parisc_device like IS_ELROY. Also remove the useless caching of the parisc_device_id in struct sba_device. Signed-off-by: Kyle McMartin commit ba9877b6734fb0313bca99ae2077613f24ff5b5c Author: Kyle McMartin Date: Thu Aug 24 21:28:58 2006 -0400 [PARISC] Pretty print the name of the lba type on kernel boot (it's pretty useless telling a user they have a whole bunch of TR%d.%d LBAs) Signed-off-by: Kyle McMartin commit 7886089e3c06518c5e65675a932922f915e20e77 Author: Matthew Wilcox Date: Tue Sep 12 05:19:15 2006 -0600 [PARISC] Remove some obsolete comments and I checked that Reo is similar to Ike Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 8a63674f70ac443d166b746d6c04154f8ee9de7b Author: Matthew Wilcox Date: Tue Sep 12 05:17:59 2006 -0600 [PARISC] Add hardware found in the rp8400 Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 7085689ed135f94108e46c372015c6f5cd3372a3 Author: James Bottomley Date: Sat Sep 9 12:36:25 2006 -0700 [PARISC] Allow nested interrupts Our prior mode of operation didn't allow nested interrupts because it makes the interrupt code much simpler. However, nested interrupts are better for latency. This code uses the EIEM register to simulate level interrupts and thus achieve nesting. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 6e5dc42b5add25c94ce0e95da87122f91b4bfdb3 Author: Grant Grundler Date: Sun Sep 10 12:57:55 2006 -0700 [PARISC] Further updates to timer_interrupt() This version (relative to the current tree): o eliminates "while (ticks_elapsed)" loop. It's not needed. o drop "ticks_elapsed" completely from timer_interrupt(). o Estimates elapsed cycles (based on HZ) to see which kind of math we want to use to calculate "cycles_remainder". o Fixes a bug where we would loose a tick if we decided we wanted to skip one interrupt. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 6b799d9222fef265802b0b6dcc4fb982cc8f55ca Author: Grant Grundler Date: Mon Sep 4 13:56:11 2006 -0700 [PARISC] remove halftick and copy clocktick to local var (gcc can optimize usage) Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit bed583f76e1d5fbb5a6fdf27a0f7b2ae235f7e99 Author: Grant Grundler Date: Fri Sep 8 23:29:22 2006 -0700 [PARISC] Rewrite timer_interrupt() and gettimeoffset() using "unsigned" math. It's just a bit easier to follow and timer code is complex enough. So far, only tested on A500-5x (64-bit SMP), ie: gettimeoffset() code hasn't been tested at all. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 65ee8f0a7fc2f2267b983f1f0349acb8f19db6e6 Author: Matthew Wilcox Date: Fri Sep 8 05:43:44 2006 -0600 [PARISC] Enable interrupts while spinning Use the __raw_spin_lock_flags routine so we can take an interrupt while spinning. This re-fixes a bug jejb found on 2005-10-20: CPU0 does a flush_tlb_all holding the vmlist_lock for write. CPU1 tries a cat of /proc/meminfo which tries to acquire vmlist_lock for read CPU1 is now spinning with interrupts disabled CPU0 tries to execute a smp_call_function to flush the local tlb caches This is now a deadlock because CPU1 is spinning with interrupts disabled and can never receive the IPI Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 56f335c89e28c488b1bfea3e5e697fce805c784d Author: Grant Grundler Date: Sun Sep 3 00:02:16 2006 -0700 [PARISC] Add new function to start local Interval Timer, start_cpu_itimer() I couldn't find where the itimer was getting started for slave CPUs. CPU 0 (master) itimer was started in time_init() (arch/parisc/kernel/time.c). start_cpu_itimer() code was striped from time_init(). Slaves now start their itimer in smp_cpu_init(). This is a first step towards making gettimeoffset() work for SMP. Next step will be to determine the CR16 (cycle counter) offsets for each CPU relative to the master (CPU 0). Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 7908a0c72ee78ba5476c2a773d808c77593719c6 Author: Grant Grundler Date: Fri Sep 1 14:18:39 2006 -0700 [PARISC] Prevent processor_probe() from clobbering cpu_data[0] processor_probe() shouldn't clobber cpu_data[0] cpu_data[0].it_value (used by timer_interrupt()) is already set. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 9cf8f370f0777a24808b3485f3b5abb8e736d3e8 Author: Grant Grundler Date: Fri Sep 1 14:50:25 2006 -0700 [PARISC] Use CONFIG_HZ to determine interval timer rate (aka clock ticks) This isn't likely to be causing problems for other bits of kernel code. I can't find any other user of CONFIG_HZ outside of arch specific code. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 342a0497c23c278633f8674ab62f71e5049b7080 Author: Carlos O'Donell Date: Thu Sep 7 13:05:17 2006 -0400 [PARISC] Implement futex_atomic_cmpxchg_inatomic Implement trivial futex_atomic_cmpxchg_inatomic for testing. Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit 6e071852a10ec02570c472052f07b5facb5ad857 Author: Matthew Wilcox Date: Sat Sep 2 07:54:58 2006 -0600 [PARISC] Improve rwlock implementation Rewrite rwlock implementation to avoid various deadlocks in the current scheme. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 9c2c54574e724589858ad656a507be29f9034943 Author: Kyle McMartin Date: Mon Aug 28 15:42:07 2006 -0400 [PARISC] [BUGFIX] nullify branch delay slot of the jump back to intr_restore in intr_do_preempt. This prevents the execution of an unwanted insn... Signed-off-by: Kyle McMartin commit 136ce40e9f1f24ca1dbf7714c669a7bca56440ea Author: Matthew Wilcox Date: Mon Aug 28 11:53:30 2006 -0600 [PARISC] Clean up asm-parisc/serial.h Russell King pointed out that asm/serial.h is anachronistic and we were misusing BASE_BAUD. So fix BASE_BAUD for PCI 16550 UARTs, move LASI_BASE_BAUD into 8250_gsc, and fix the obsolete comment about reserving serial port slots. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 75a4958154f5d0028d5464f2479b4297d55cf4a3 Author: Kyle McMartin Date: Sun Aug 27 11:12:13 2006 -0400 [PARISC] Allow overriding personality with sys_personality And now suddenly, linux32 works on parisc... Signed-off-by: Kyle McMartin commit df570b9c284701d08b22aa00cbfcf870b7f1b7c1 Author: Kyle McMartin Date: Sun Aug 27 11:04:26 2006 -0400 [PARISC] Switch is_compat_task to use TIF_32BIT Stop using PER_LINUX32 to designate processes needing compaterizing. Convert is_compat_task to use TIF_32BIT and set TIF_32BIT in binfmt_elf32.c Signed-off-by: Kyle McMartin commit 8f611c453c6a41eee73645c80ccb10493e74b630 Author: Kyle McMartin Date: Sat Sep 16 14:38:22 2006 -0400 [PARISC] Prevent multiple includes of asm-parisc/parisc-device.h Signed-off-by: Kyle McMartin commit 20f4d3cb9b94ce3fec9a6135b9ad075b82b24f41 Author: James Bottomley Date: Wed Aug 23 09:00:04 2006 -0700 [PARISC] parisc specific kmap API implementation for pa8800 This patch fixes the pa8800 at a gross level (there are still other subtle incoherency issues which can still cause crashes and HPMCs). What it does is try to force eject inequivalent aliases before they become visible to the L2 cache (which is where we get the incoherence problems). A new function (parisc_requires_coherency) is introduced in asm/processor.h to identify the pa8x00 processors (8800 and 8900) which have the issue. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit e45da35e180a4fc91307648d021a598495742c32 Author: Carlos O'Donell Date: Sat Sep 16 14:35:51 2006 -0400 [PARISC] Document that D-class can also use serial_mux Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit 5cfe87d3f543d05a84a509d232330261f1b7bccf Author: Kyle McMartin Date: Sun Aug 13 22:25:45 2006 -0400 [PARISC] Fix up parisc irq handling for genirq changes Clean up enough to get things compiling again in the interim. Signed-off-by: Kyle McMartin commit 6f03495d65db4cecc8dc8f2266768f83af0c2710 Author: Kyle McMartin Date: Sun Aug 13 22:18:57 2006 -0400 [PARISC] Add asm-parisc/mckinley.h bus header Add header for McKinley bus related code. Remove extern decl of proc_mckinley_root in drivers/parisc/sba_iommu.c Signed-off-by: Kyle McMartin commit 3d73cf5e18c47d416db4d0734245d3fb087603d9 Author: Kyle McMartin Date: Sun Aug 13 22:17:19 2006 -0400 [PARISC] Abstract shift register left in .S Abstract existing shift register left macros as shift register right are. This lends itself to a nice clean up of some #ifdef blocks in entry.S Signed-off-by: Kyle McMartin commit f86e45131f9d41b1617fbaac7aa1ef23e8d0ab48 Author: Kyle McMartin Date: Sun Aug 13 21:09:31 2006 -0400 [PATCH] Need forward decl of task_struct in linux/debug_locks.h Signed-off-by: Kyle McMartin commit c51d476af36d1e9634e77afccc4d48e344acf243 Author: Kyle McMartin Date: Sun Aug 13 20:39:48 2006 -0400 [PARISC] Remove variables decls duplicated from asm-generic/sections.h Signed-off-by: Kyle McMartin commit 32104b29cdf93f78ac37e681bd4547413466d13c Author: Kyle McMartin Date: Sun Aug 13 20:37:26 2006 -0400 [PARISC] PA7200 also supports prefetch for read It seems PA7200 processors also suppress traps on loads to %r0. This means we can prefetch for read on these cpus. Of course, we can't support prefetch for write, since that requires LOAD DOUBLEWORD which was added with PA2.0 Signed-off-by: Kyle McMartin commit 4068d93cd17561bcbfc821c831cb048385320bd6 Author: Kyle McMartin Date: Sun Aug 13 22:15:47 2006 -0400 [PARISC] Untangle header include mess asm/processor.h on parisc wants spinlocks for cpuinfo, but linux/spinlock_types.h needs lockdep, and lockdep wants prefetch. This leads to a horrible circular dependancy, because is including something which depends on things which are not defined until the end of the file. Kludge around this by moving prefetch related code into and including it before , however this is just a temporary solution until this mess can be cleaned up. Signed-off-by: Kyle McMartin commit c8e649ba908954447e9a095677f6a6c8e50a37b2 Author: Steve Grubb Date: Fri Sep 29 11:56:49 2006 -0400 [PATCH] message types updated Hi, This patch adds a new type for 3rd party module use and cleans up a deprecated message type. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit ac9910ce017ff5f86f3a25e969b2c4f5d6ac438f Author: Steve Grubb Date: Thu Sep 28 14:31:32 2006 -0400 [PATCH] name_count array overrun Hi, This patch removes the rdev logging from the previous patch The below patch closes an unbounded use of name_count. This can lead to oopses in some new file systems. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 419c58f11fb732cc8bd1335fa43e0decb34e0be3 Author: Alexander Viro Date: Fri Sep 29 00:08:50 2006 -0400 [PATCH] PPID filtering fix On Thu, Sep 28, 2006 at 04:03:06PM -0400, Eric Paris wrote: > After some looking I did not see a way to get into audit_log_exit > without having set the ppid. So I am dropping the set from there and > only doing it at the beginning. > > Please comment/ack/nak as soon as possible. Ehh... That's one hell of an overhead to be had ;-/ Let's be lazy. Signed-off-by: Al Viro commit 4b8a311bb161a3bd2ab44311f42c526b6dc76270 Author: Eric Paris Date: Thu Sep 28 17:46:21 2006 -0400 [PATCH] arch filter lists with < or > should not be accepted Currently the kernel audit system represents arch's as numbers and will gladly accept comparisons between archs using >, <, >=, <= when the only thing that makes sense is = or !=. I'm told that the next revision of auditctl will do this checking but this will provide enforcement in the kernel even for old userspace. A simple command to show the issue would be to run auditctl -d entry,always -F arch>i686 -S chmod with this patch the kernel will reject this with -EINVAL Please comment/ack/nak as soon as possible. -Eric kernel/auditfilter.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Signed-off-by: Al Viro commit e1634208b77872ac0884da6d92f0d46f9a61eaa7 Author: Mauro Carvalho Chehab Date: Wed Oct 4 08:13:14 2006 -0300 V4L/DVB (4712): Fix warning when compiling on x86_i64 drivers/media/dvb/dvb-usb/usb-urb.c: In function 'usb_allocate_stream_buffers': drivers/media/dvb/dvb-usb/usb-urb.c:125: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'long long unsigned int' Signed-off-by: Mauro Carvalho Chehab commit 13962753190a43fcc2b4a38d064f05d667691cc8 Author: Tobias Klauser Date: Wed Oct 4 08:09:10 2006 -0300 V4L/DVB (4711): Radio: 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: Mauro Carvalho Chehab commit 003138cf52bd1eec59cb468334b0396fbfbf66cd Author: Hans Verkuil Date: Tue Oct 3 19:10:33 2006 -0300 V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5 Add new Philips tuners: Philips FM1236 MK5 and Philips FM1216ME MK5. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e491cbc8b2eabc8856bf890006604edd91b1cce2 Author: Alan Cox Date: Tue Oct 3 20:44:12 2006 -0300 V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API Signed-off-by: Alan Cox Signed-off-by: Mauro Carvalho Chehab commit a868b45dad04854e07bb1c7c81a73930098bc370 Author: Maciej W. Rozycki Date: Tue Oct 3 16:01:17 2006 -0300 V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally The VIDEO_V4L2 config setting is enabled unconditionally, even for configurations with no support for this subsystem whatsoever. The following patch adds the necessary dependency. Signed-off-by: Maciej W. Rozycki Signed-off-by: Mauro Carvalho Chehab commit 9448025be057f6b64c4bab01894c8e6b1a406e6e Author: Hartmut Hackmann Date: Mon Oct 2 21:00:32 2006 -0300 V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit cf146ca4c2d56f275235526d9ada6c007313c7c7 Author: Hartmut Hackmann Date: Mon Oct 2 20:49:24 2006 -0300 V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board This is a analog DVB-T hybrid board Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 6b14ff9e901935a685ac430828452b53936dcbad Author: Hermann Pitton Date: Mon Oct 2 20:18:26 2006 -0300 V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid This patch forces the correct antenna input input in DVB-T mode for this card. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 17b10a73e697da71faa3e54e35421aca4531aa9b Author: Hartmut Hackmann Date: Mon Oct 2 19:55:07 2006 -0300 V4L/DVB (4701): Saa713x audio fixes This change fixes the following issues: - resolve the SECAM D/K vs SECAM-L sound conflict It is now possible to select the SECAM version either by the VIDEOIOC_S_STD IO control or by the new secam= insmod option. The driver now adapts its audio standard search list to the selected standard. - don't trigger a sound standard search when a LINE input is selected. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 39666962a3c598f221bc99e835d9d6046a700d85 Author: Mauro Carvalho Chehab Date: Wed Oct 4 08:01:59 2006 -0300 V4L/DVB (4676a): Remove Kconfig item for DiB7000M support Support for DiB7000M frontend were not included on 2.6.19, since still not completed. Removing Kconfig item. Signed-off-by: Mauro Carvalho Chehab commit 038b0a6d8d32db934bba6a24e74e76e4e327a94f Author: Dave Jones Date: Wed Oct 4 03:38:54 2006 -0400 Remove all inclusions of kbuild explicitly includes this at build time. Signed-off-by: Dave Jones commit 0a69452cb45add0841c2bc1e75c25f6bd4f1d8d9 Author: Diego Beltrami Date: Tue Oct 3 23:47:05 2006 -0700 [XFRM]: BEET mode This patch introduces the BEET mode (Bound End-to-End Tunnel) with as specified by the ietf draft at the following link: http://www.ietf.org/internet-drafts/draft-nikander-esp-beet-mode-06.txt The patch provides only single family support (i.e. inner family = outer family). Signed-off-by: Diego Beltrami Signed-off-by: Miika Komu Signed-off-by: Herbert Xu Signed-off-by: Abhinav Pathak Signed-off-by: Jeff Ahrenholz Signed-off-by: David S. Miller commit 80246ab36ec8baf7d107254adb166baa555a59f8 Author: David S. Miller Date: Tue Oct 3 16:49:53 2006 -0700 [TCP]: Kill warning in tcp_clean_rtx_queue(). GCC can't tell we always initialize 'tv' in all the cases we actually use it, so explicitly set it up with zeros. Signed-off-by: David S. Miller commit 2473ffe3cae0f86341958e3cf962bb4fc261d028 Author: Patrick McHardy Date: Tue Oct 3 16:29:52 2006 -0700 [NET_SCHED]: Remove old estimator implementation Remove unused file, estimators live in net/core/gen_estimator.c now. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3e0c0ac84c01f41fb266bcdd2802708409901bed Author: Chas Williams Date: Tue Oct 3 16:28:31 2006 -0700 [ATM]: [zatm] always *pcr in alloc_shaper() Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 3a4e5e2033eb7558ebe307e46f5fb6e63b92cab8 Author: Jeff Garzik Date: Tue Oct 3 16:27:55 2006 -0700 [ATM]: [ambassador] Change the return type to reflect reality Signed-off-by: Jeff Garzik Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 0c1cca1d8e0d58775dad43374f925e6cddf1bebc Author: Om Narasimhan Date: Tue Oct 3 16:27:18 2006 -0700 [ATM]: kmalloc to kzalloc patches for drivers/atm Signed-off-by: Om Narasimhan Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 617dbeaa3f2987acc83c1149409685005e9dd740 Author: Jeff Garzik Date: Tue Oct 3 16:25:34 2006 -0700 [TIPC]: fix printk warning gcc spits out this warning: net/tipc/link.c: In function ‘link_retransmit_failure’: net/tipc/link.c:1669: warning: cast from pointer to integer of different size More than a little bit ugly, storing integers in void*, but at least the code is correct, unlike some of the more crufty Linux kernel code found elsewhere. Rather than having two casts to massage the value into u32, it's easier just to have a single cast and use "%lu", since it's just a printk. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit ae8c05779ac2f286b872db9ebea0c3c0a031ad1e Author: David S. Miller Date: Tue Oct 3 16:00:26 2006 -0700 [XFRM]: Clearing xfrm_policy_count[] to zero during flush is incorrect. When we flush policies, we do a type match so we might not actually delete all policies matching a certain direction. So keep track of how many policies we actually kill and subtract that number from xfrm_policy_count[dir] at the end. Based upon a patch by Masahide NAKAMURA. Signed-off-by: David S. Miller commit 667bbcb6c099d1b74f95c6963ddf37a32e7afc29 Author: Masahide NAKAMURA Date: Tue Oct 3 15:56:09 2006 -0700 [XFRM] STATE: Use destination address for src hash. Src hash is introduced for Mobile IPv6 route optimization usage. On current kenrel code it is calculated with source address only. It results we uses the same hash value for outbound state (when the node has only one address for Mobile IPv6). This patch use also destination address as peer information for src hash to be dispersed. Signed-off-by: Masahide NAKAMURA Signed-off-by: David S. Miller commit c5e29460f5f9eb189cab5d9fdaa137e64f7734b6 Author: Julian Anastasov Date: Tue Oct 3 15:49:46 2006 -0700 [NEIGH]: always use hash_mask under tbl lock Make sure hash_mask is protected with tbl->lock in all cases just like the hash_buckets. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 1e0c14f49d6b393179f423abbac47f85618d3d46 Author: Herbert Xu Date: Tue Oct 3 14:35:49 2006 -0700 [UDP]: Fix MSG_PROBE crash UDP tracks corking status through the pending variable. The IP layer also tracks it through the socket write queue. It is possible for the two to get out of sync when MSG_PROBE is used. This patch changes UDP to check the write queue to ensure that the two stay in sync. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 132a55f3c5c0b1a364d32f65595ad8838c30a60e Author: Herbert Xu Date: Tue Oct 3 14:34:00 2006 -0700 [UDP6]: Fix flowi clobbering The udp6_sendmsg function uses a shared buffer to store the flow without taking any locks. This leads to races with SMP. This patch moves the flowi object onto the stack. Signed-off-by: Herbert Xu Acked-by: James Morris Signed-off-by: David S. Miller commit 81771b3b20fb4e98c6f2b2aac2bc10ed41a8f006 Author: Ismail Donmez Date: Tue Oct 3 13:49:10 2006 -0700 [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE" With commit 10fd48f2376db52f08bf0420d2c4f580e39269e1 [1] , RB_EMPTY_NODE changed behaviour so it returns true when the node is empty as expected. Hence Patrick McHardy's fix for sched_htb.c should be reverted. Signed-off-by: Ismail Donmez ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit b18dfa90c008850e0f3bfd63638dd8fbe8e08701 Author: Bart De Schuymer Date: Mon Oct 2 16:12:52 2006 -0700 [NETFILTER]: ebt_mark: add or/and/xor action support to mark target The following patch adds or/and/xor functionality for the mark target, while staying backwards compatible. Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9d02002d2dc2c7423e5891b97727fde4d667adf1 Author: Patrick McHardy Date: Mon Oct 2 16:12:20 2006 -0700 [NETFILTER]: ipt_REJECT: remove largely duplicate route_reverse function Use ip_route_me_harder instead, which now allows to specify how we wish the packet to be routed. Based on patch by Simon Horman . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 901eaf6c8f997f18ebc8fcbb85411c79161ab3b2 Author: Simon Horman Date: Mon Oct 2 16:11:51 2006 -0700 [NETFILTER]: Honour source routing for LVS-NAT For policy routing, packets originating from this machine itself may be routed differently to packets passing through. We want this packet to be routed as if it came from this machine itself. So re-compute the routing information using ip_route_me_harder(). This patch is derived from work by Ken Brownfield Cc: Ken Brownfield Signed-off-by: Simon Horman Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b4c4ed175ff0ee816df48571cfa9b73f521964b6 Author: Simon Horman Date: Mon Oct 2 16:11:13 2006 -0700 [NETFILTER]: add type parameter to ip_route_me_harder By adding a type parameter to ip_route_me_harder() the expensive call to inet_addr_type() can be avoided in some cases. A followup patch where ip_route_me_harder() is called from within ip_vs_out() is one such example. Signed-off-By: Simon Horman Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f1da70632fa0875f80fc60991a010c31f40983ff Author: Patrick McHardy Date: Mon Oct 2 16:10:47 2006 -0700 [NETFILTER]: Kconfig: fix xt_physdev dependencies xt_physdev depends on bridge netfilter, which is a boolean, but can still be built modular because of special handling in the bridge makefile. Add a dependency on BRIDGE to prevent XT_MATCH_PHYSDEV=y, BRIDGE=m. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9020fc960b8f5fbca0de6e4d11881ddc827aa61d Author: Kim Phillips Date: Mon Oct 2 20:10:30 2006 -0500 [POWERPC] Add support for the mpc832x mds board Add support for MPC832x MDS evaluation board. This patch depends on the 8360+QE lib patches by Leo. The MPC832x processors (MPC8323E, MPC8323, MPC8321E, MPC8321) sport the e300c2 core plus a QUICC Engine (QE). This patch adds support for the 832x MDS evaluation board. The 832x MDS dts and defconfig files are pending more tests. Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 6c4a2501d0b9fe90882efea5541275a46cda2a1a Author: Kim Phillips Date: Mon Oct 2 20:10:24 2006 -0500 [POWERPC] Add initial support for the e300c2 core Add support for the Freescale e300c2 core found in the MPC832x processor line. As far as initial kernel support is concerned, the e300c2 core is identical to the e300c1 found in the mpc834x, except that it's had its floating point unit chopped off. Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 7a234d03774a2949d0ce73e3aef56cfdb6856404 Author: Li Yang Date: Mon Oct 2 20:10:10 2006 -0500 [POWERPC] Add MPC8360EMDS default dts file Add MPC8360EMDS default device-tree source file Signed-off-by: Li Yang Signed-off-by: Jiang Bo Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit bc141deafb81f2efa453081e9d52d602a8cec766 Author: Li Yang Date: Tue Oct 3 23:17:51 2006 -0500 [POWERPC] Add MPC8360EMDS board support The patch adds MPC8360EMDS board support. Signed-off-by: Li Yang Signed-off-by: Yin Olivia Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 9865853851313e0d94a4acde42d6f9d8070bb376 Author: Li Yang Date: Tue Oct 3 23:10:46 2006 -0500 [POWERPC] Add QUICC Engine (QE) infrastructure Add QUICC Engine (QE) configuration, header files, and QE management and library code that are used by QE devices drivers. Includes Leo's modifications up to, and including, the platform_device to of_device adaptation: "The series of patches add generic QE infrastructure called qe_lib, and MPC8360EMDS board support. Qe_lib is used by QE device drivers such as ucc_geth driver. This version updates QE interrupt controller to use new irq mapping mechanism, addresses all the comments received with last submission and includes some style fixes. v2: Change to use device tree for BCSR and MURAM; Remove I/O port interrupt handling code as it is not generic enough. v3: Address comments from Kumar; Update definition of several device tree nodes; Copyright style change." In addition, the following changes have been made: o removed typedefs o uint -> u32 conversions o removed following defines: QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER, BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET because they hid sizeof/in_be32/out_be32 operations from the reader. o fixed qe_snums_init() serial num assignment to use a const array o made CONFIG_UCC_FAST select UCC_SLOW o reduced NR_QE_IC_INTS from 128 to 64 o remove _IO_BASE, etc. defines (not used) o removed irrelevant comments, added others to resemble removed BD_ defines o realigned struct definitions in headers o various other style fixes including things like pinMask -> pin_mask o fixed a ton of whitespace issues o marked ioregs as __be32/__be16 o removed platform_device code and redundant get_qe_base() o removed redundant comments o added cpu_relax() to qe_reset o uncasted all get_property() assignments o eliminated unneeded casts o eliminated immrbar_phys_to_virt (not used) Signed-off-by: Li Yang Signed-off-by: Shlomi Gridish Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 9a1ab883c04e43f9f9819c40eb435bcdc4136193 Author: Li Yang Date: Mon Oct 2 20:08:59 2006 -0500 [POWERPC] Add QE device tree node definition OF device tree node spec used in QE/8360 support patches. Signed-off-by: Li Yang Signed-off-by: Jiang Bo Signed-off-by: Kim Phillips Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 0a730ae59960165ae50de3284fb50316d1755d98 Author: Paul Mackerras Date: Tue Oct 3 21:32:49 2006 +1000 [POWERPC] Don't try to just continue if xmon has no input device Currently, if xmon has no input device (as is generally the case on G5 powermacs), and we drop into xmon as a result of a fatal exception, it will return 1, which die() interprets as "continue without causing an oops". This fixes it by making xmon() return 0 in the case where it has no input device. Signed-off-by: Paul Mackerras commit 586da2cc78131d194ecacaf4de26b49691de5fd3 Author: Michael Ellerman Date: Tue Oct 3 14:48:43 2006 +1000 [POWERPC] Fix a printk in pseries_mpic_init_IRQ This should probably say "mpic" to save confusion. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 2ec6ef1034632c67896955d52bf8efb99195b742 Author: Benjamin Herrenschmidt Date: Tue Oct 3 14:47:58 2006 +1000 [POWERPC] Get default baud rate in udbg_scc On powermac, when open firmware is set to use the SCC for console, this causes the low level udbg early console to read back the speed and re-use it instead of hard coding 57600 bps. This doesn't (yet) pass the detected speed all the way to pmac_zilog though. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 54c9941288e86fad983e307e540808e155b16b34 Author: Benjamin Herrenschmidt Date: Tue Oct 3 14:27:16 2006 +1000 [POWERPC] Fix zImage.coff on oldworld PowerMac Recent changes to the PowerPC zImage wrapper broke zImage.coff due to the addition of new ELF sections that aren't very well converted to xcoff and not supported by old OpenFirmware. This fixes it by putting those sections in the xcoff .data. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 476792839467c08ddeedd8b44a7423d415b68259 Author: Michael Ellerman Date: Tue Oct 3 14:12:08 2006 +1000 [POWERPC] Fix xmon=off and cleanup xmon initialisation My patch to make the early xmon logic work with earlier early param parsing (480f6f35a149802a94ad5c1a2673ed6ec8d2c158) breaks xmon=off. No one does this obviously as xmon rocks, but it should really work as documented. While fixing that it struck me that we could move the xmon param handling into xmon.c, and also consolidate the xmon_init()/do_early_xmon logic into xmon_setup(). This means xmon=early drops into xmon a little earlier on 32-bit, but it seems to work just fine. Tested on PSERIES and CLASSIC32. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 23b8acb1cf49fea74a9d431de258787384951eac Author: Michael Ellerman Date: Tue Oct 3 14:12:07 2006 +1000 [POWERPC] Cleanup include/asm-powerpc/xmon.h For some reason we have two prototypes for xmon_init(), remove the one in system.h. No one calls xmon() anymore, debugger() is preferable, so we don't need the prototype. And similarly no one calls xmon_printf(). Also update the include guards on xmon.h to match the standard format, add copyright and license, and add comments to #endifs. Built for pseries_defconfig and pmac32_defconfig. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 14b1ffb577a8678e228683bd015302cfe964040c Author: Olaf Hering Date: Mon Oct 2 22:57:23 2006 +0200 [POWERPC] Update swim3 printk after blkdev.h change drivers/block/swim3.c: In function 'swim3_interrupt': drivers/block/swim3.c:640: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int' drivers/block/swim3.c:746: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int' Update printk format string after blkdev.h change: Split struct request ->flags into two parts Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 2e194583125bfea94d1ceaa6a32e891643befa7d Author: Benjamin Herrenschmidt Date: Fri Sep 29 15:00:29 2006 +1000 [POWERPC] Cell interrupt rework This patch reworks the cell iic interrupt handling so that: - Node ID is back in the interrupt number (only one IRQ host is created for all nodes). This allows interrupts from sources on another node to be routed non-locally. This will allow possibly one day to fix maxcpus=1 or 2 and still get interrupts from devices on BE 1. (A bit more fixing is needed for that) and it will allow us to implement actual affinity control of external interrupts. - Added handling of the IO exceptions interrupts (badly named, but I re-used the name initially used by STI). Those are the interrupts exposed by IIC_ISR and IIC_IRR, such as the IOC translation exception, performance monitor, etc... Those get their special numbers in the IRQ number space and are internally implemented as a cascade on unit 0xe, class 1 of each node. Signed-off-by: Benjamin Herrenschmidt Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 78b656b8bf933101b42409b4492734b23427bfc3 Author: Keith Mannthey Date: Tue Oct 3 18:25:52 2006 -0700 [PATCH] i383 numa: fix numaq/summit apicid conflict This allows numaq to properly align cpus to their given node during boot. Pass logical apicid to apicid_to_node and allow the summit sub-arch to use physical apicid (hard_smp_processor_id()). Tested against numaq and summit based systems with no issues. Signed-off-by: Keith Mannthey Signed-off-by: Linus Torvalds commit 7ecdb70a0ea436c06540140242bfac6ac3babfc0 Author: Steven Whitehouse Date: Tue Oct 3 21:03:35 2006 -0400 [GFS2] Fix endian bug for de_type Missing endian conversion for the de_type field. Signed-off-by: Steven Whitehouse commit 65935ff95cfda67c7b2bf228d6f7083a46f832a1 Author: Andrew Vasquez Date: Mon Oct 2 12:00:50 2006 -0700 [SCSI] qla2xxx: Update version number to 8.01.07-k2. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 07db51831371f2875ef234b1535a15afdb381b6c Author: Andrew Vasquez Date: Mon Oct 2 12:00:49 2006 -0700 [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked. Stall error handler if attempting recovery while an rport is blocked. This avoids device offline scenarios due to errors in the error handler. Reference implementation from lpfc/mptfc. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit bb8ee4998498e15b5c8ed94cd7dd8d07e586c0ab Author: Andrew Vasquez Date: Mon Oct 2 12:00:48 2006 -0700 [SCSI] qla2xxx: Add MODULE_FIRMWARE tags. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7047fcddb1bc96a80fc54ac3a88ea18ca3ae77f6 Author: Andrew Vasquez Date: Mon Oct 2 12:00:47 2006 -0700 [SCSI] qla2xxx: Add support for host port state FC transport attribute. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 90991c85d398fd46b2b07440b5639eb50dfacb2b Author: Andrew Vasquez Date: Mon Oct 2 12:00:46 2006 -0700 [SCSI] qla2xxx: Add support for fabric name FC transport attribute. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit a740a3f0407ed3344b28b05926b0ce61768e9893 Author: Andrew Vasquez Date: Mon Oct 2 12:00:45 2006 -0700 [SCSI] qla2xxx: Add support for system hostname FC transport attribute. The system hostname will be used during a subsequent FDMI registration with the fabric. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 1620f7c2d8e3fdd7dba04bfe5f9c42201eef1188 Author: Andrew Vasquez Date: Mon Oct 2 12:00:44 2006 -0700 [SCSI] qla2xxx: Add support for symbolic nodename FC transport attribute. Refactored original code from qla_gs.c:qla2x00_rsnn_nn(). Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d8b4521349274ab610d0b29384c704444e55cbca Author: Andrew Vasquez Date: Mon Oct 2 12:00:43 2006 -0700 [SCSI] qla2xxx: Add iIDMA support. iIDMA (Intelligent Interleaved Direct Memory Access) allows for the HBA hardware to send FC frames at the rate at which they can be received by a target device. By taking advantage of the higher link rate, the HBA can maximize bandwidth utilization in a heterogeneous multi-speed SAN. Within a fabric topology, port speed detection is done via a Name Server command (GFPN_ID) followed by a Fabric Management command (GPSC). In an FCAL/N2N topology, port speed is based on the HBA link-rate. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ee0ca6bab394fe41a2b4de58c4532b09a41c9165 Author: Henne Date: Sun Oct 1 13:18:37 2006 +0200 [SCSI] scsi: Scsi_Cmnd convertion in arm subtree Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in the arm subdir of the scsi-subsys. Signed-off-by: Henrik Kretzschmar Acked-by: Russell King Signed-off-by: James Bottomley commit 1516b55d903a5d370859d9013e48db5caea95204 Author: Henne Date: Mon Oct 2 14:56:23 2006 +0200 [SCSI] scsi: Convertion to struct scsi_cmnd in ips-driver Converts the obsolete Scsi_Cmnd to struct scsi_cmnd in the ips-driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit a847825970e741e20a09c659978baa34016b63bc Author: Samuel Tardieu Date: Tue Oct 3 23:41:34 2006 +0200 Add missing maintainer countries in CREDITS Add missing maintainer countries. Signed-off-by: Samuel Tardieu Signed-off-by: Adrian Bunk commit 73cf9630683e8b9f58485b75a13a21ac9ff33aef Author: Christian Borntraeger Date: Tue Oct 3 23:40:34 2006 +0200 Fix bytes <-> kilobytes typo in Kconfig for ramdisk This is a small fix for a typo in Kconfig. The default value for the block size is 1024 bytes not 1024 kilobytes. Signed-off-by: Christian Borntraeger Signed-off-by: Adrian Bunk commit 96016cfae5739902944aaec9c3cbbbdeabc7a38b Author: Riccardo Magliocchetti Date: Tue Oct 3 23:39:02 2006 +0200 fix a typo in Documentation/pi-futex.txt Signed-off-by: Riccardo Magliocchetti Signed-off-by: Adrian Bunk commit 9ab5aa911a5b5d7c721436bce8709202b707a361 Author: Eric Sesterhenn Date: Tue Oct 3 23:37:55 2006 +0200 BUG_ON conversion for fs/xfs/ This patch converts two if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 73dff8be9ea89df26bfb6a0443ad912de6e7bd00 Author: Eric Sesterhenn Date: Tue Oct 3 23:37:14 2006 +0200 BUG_ON() conversion in fs/nfsd/ This patch converts an if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 14a61442c2203d2a49f2f954bfa9259c0ddac1aa Author: Eric Sesterhenn Date: Tue Oct 3 23:36:38 2006 +0200 BUG_ON conversion for fs/reiserfs This patch converts several if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. S_ISREG() has no side effects, so the conversion is safe. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 8d8f3cbe777e014123bfa63f2cebd6eb29032225 Author: Eric Sesterhenn Date: Tue Oct 3 23:34:58 2006 +0200 BUG_ON cleanups in arch/i386 This changes a couple of if() BUG(); constructs to BUG_ON(); so it can be safely optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 644c12d7f695c0a30662ac781b0f06f79d7f9bab Author: Eric Sesterhenn Date: Tue Oct 3 23:34:11 2006 +0200 BUG_ON cleanup in drivers/net/tokenring/ This patch converts one if() BUG(); to BUG_ON(); so it can be safely optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 52e5f9d1cf0b10b24317037dcd1c9be38ca7011c Author: Eric Sesterhenn Date: Tue Oct 3 23:33:23 2006 +0200 BUG_ON cleanup for drivers/md/ This changes two if() BUG(); usages to BUG_ON(); so people can disable it safely. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 70d63ccc71fe1a413ce82b88aa175b1dcf28654e Author: Henrik Kretzschmar Date: Tue Oct 3 23:31:30 2006 +0200 kerneldoc-typo in led-class.c Fixes a typo in led-class.c kerneldoc. Signed-off-by: Henrik Kretzschmar Signed-off-by: Adrian Bunk commit 5a65980ec5edfb3acee293c541b392e4146a30f6 Author: Komal Shah Date: Tue Oct 3 23:28:36 2006 +0200 debugfs: spelling fix Change debufs_create_file() to debugfs_create_file(). Signed-off-by: Komal Shah Signed-off-by: Adrian Bunk commit 4802211cfd68e44c8401a8fe3657e9c2522ec517 Author: Josh Triplett Date: Tue Oct 3 23:26:16 2006 +0200 rcutorture: Fix incorrect description of default for nreaders parameter The comment for the nreaders parameter of rcutorture gives the default as 4*ncpus, but the value actually defaults to 2*ncpus; fix the comment. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Adrian Bunk commit d32ccc431b2247535ce1114d7e31cc136c89262a Author: Matthew Martin Date: Tue Oct 3 23:25:14 2006 +0200 parport: Remove space in function calls This removes the space in function calls in drivers/parport/daisy.c Signed-off-by: Matthew Martin Signed-off-by: Adrian Bunk commit f66e928b96b717c6bb0cefba338d687dd86e6a9b Author: Michal Wronski Date: Tue Oct 3 23:23:27 2006 +0200 Michal Wronski: update contact info My email has changed. Signed-Off-By: Michal Wronski Signed-off-by: Adrian Bunk commit c1c8897f830c66649b6866a0cbe21c263466295e Author: Michael Opdenacker Date: Tue Oct 3 23:21:02 2006 +0200 Spelling fix: "control" instead of "cotrol" This patch against fixes a spelling mistake ("control" instead of "cotrol"). Signed-off-by: Michael Opdenacker Acked-by: Alan Cox Signed-off-by: Adrian Bunk commit f3e299fe3d53a0d78fea4e46ec3e0cadf375246c Author: Michael Opdenacker Date: Tue Oct 3 23:19:24 2006 +0200 reboot parameter in Documentation/kernel-parameters.txt Documentation fix for the arm and arm26 architectures, in which the reboot kernel parameter is set in arch/*/kernel/process.c Signed-off-by: Michael Opdenacker Signed-off-by: Adrian Bunk commit a073a8bde49b2c90777c526110488f4d0c52ea47 Author: Rolf Eike Beer Date: Tue Oct 3 23:13:02 2006 +0200 Fix copy&waste bug in comment in scripts/kernel-doc This is obviously copied from some lines before without proper fixing. Signed-off-by: Rolf Eike Beer Acked-by: Alan Cox Signed-off-by: Adrian Bunk commit 9f5d785e93f7c68c37582ddea848de23689fdd76 Author: Rolf Eike Beer Date: Tue Oct 3 23:07:31 2006 +0200 remove duplicate "until" from kernel/workqueue.c s/until until/until/ Signed-off-by: Rolf Eike Beer Signed-off-by: Adrian Bunk commit c98acc5865c1217195217444cc6c6d317fddda50 Author: Jim Cromie Date: Tue Oct 3 23:04:37 2006 +0200 ite_gpio fix tabbage caught some leading spaces in passing. Signed-off-by: Adrian Bunk commit f30c2269544bffc7bf1b0d7c0abe5be1be83b8cb Author: Uwe Zeisberger Date: Tue Oct 3 23:01:26 2006 +0200 fix file specification in comments Many files include the filename at the beginning, serveral used a wrong one. Signed-off-by: Uwe Zeisberger Signed-off-by: Adrian Bunk commit 670e9f34ee3c7e052514c85014d2fdd99b672cdc Author: Paolo Ornati Date: Tue Oct 3 22:57:56 2006 +0200 Documentation: remove duplicated words Remove many duplicated words under Documentation/ and do other small cleanups. Examples: "and and" --> "and" "in in" --> "in" "the the" --> "the" "the the" --> "to the" ... Signed-off-by: Paolo Ornati Signed-off-by: Adrian Bunk commit 53cb47268e6b38180d9f253527135e1c69c5d310 Author: Matt LaPlante Date: Tue Oct 3 22:55:17 2006 +0200 Fix typos in Documentation/: 'S' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letter 'S'. Signed-off-by: Matt LaPlante Acked-by: Alan Cox Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk commit d6bc8ac9e13e466e844313b590fbc49f7f1abdea Author: Matt LaPlante Date: Tue Oct 3 22:54:15 2006 +0200 Fix typos in Documentation/: 'Q'-'R' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'Q'-'R'. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk commit 84eb8d0608af1576175307ed8fb3c8fde329e579 Author: Matt LaPlante Date: Tue Oct 3 22:53:09 2006 +0200 Fix "can not" in Documentation and Kconfig Randy brought it to my attention that in proper english "can not" should always be written "cannot". I donot see any reason to argue, even if I mightnot understand why this rule exists. This patch fixes "can not" in several Documentation files as well as three Kconfigs. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk commit 992caacf1141b31e94540eb31e0540e3da3a5e25 Author: Matt LaPlante Date: Tue Oct 3 22:52:05 2006 +0200 Fix typos in Documentation/: 'N'-'P' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'N'-'P'. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk commit f311896a990a0b766e279defe9adff29160ada03 Author: Wim Van Sebroeck Date: Wed Sep 13 21:27:29 2006 +0200 [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl() Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands. ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck Acked-by: Alan Cox Signed-off-by: Andrew Morton commit 2fe0ae78c6975d6fa2fc0c84f2b8944543054105 Author: Matt LaPlante Date: Tue Oct 3 22:50:39 2006 +0200 Fix typos in Documentation/: 'H'-'M' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'H'-'M'. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk commit a2ffd2751683f4275d4d1aa5ce37e5a6a1ae21df Author: Matt LaPlante Date: Tue Oct 3 22:49:15 2006 +0200 Fix typos in Documentation/: 'F'-'G' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'F'-'G'. Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk commit 353cefdb33929bd5d925d59060be11759cee8f52 Author: Russell King Date: Tue Oct 3 17:36:11 2006 +0100 [PATCH] Remove me from maintainers for serial and mmc As advertised earlier. I invite interested parties to take over and add their own entries as they see fit. Signed-off-by: Russell King Signed-off-by: Linus Torvalds commit fff9289b219f48cb2296714fea3d71f516991f9f Author: Matt LaPlante Date: Tue Oct 3 22:47:42 2006 +0200 Fix typos in Documentation/: 'D'-'E' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'D'-'E'. Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk commit 6c28f2c0f2054865d82b5a6b2164eac956f15c94 Author: Matt LaPlante Date: Tue Oct 3 22:46:31 2006 +0200 Fix typos in Documentation/: 'B'-'C' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'B'-'C'. There are also a few grammar fixes thrown in for Randy. ;) Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk commit 3f6dee9b2a22cc66050682287a77d5fccadb9733 Author: Matt LaPlante Date: Tue Oct 3 22:45:33 2006 +0200 Fix some typos in Documentation/: 'A' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letter 'A'. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Acked-by: Alan Cox Signed-off-by: Adrian Bunk commit cab00891c5489cb6d0cde0a55d39bd5f2871fa70 Author: Matt LaPlante Date: Tue Oct 3 22:36:44 2006 +0200 Still more typo fixes Signed-off-by: Adrian Bunk commit 44c09201a4178e08ed1c8cc37e7aea0683888f0a Author: Matt LaPlante Date: Tue Oct 3 22:34:14 2006 +0200 more misc typo fixes Signed-off-by: Adrian Bunk commit 095096038d637c477ef3c1b674612bcbc4d60c2d Author: Matt LaPlante Date: Tue Oct 3 22:31:37 2006 +0200 Fix several typos in drivers/ Signed-off-by: Adrian Bunk commit c73a668c096fe3dd23c1062018e82eb85f5c7043 Author: Matt LaPlante Date: Tue Oct 3 22:24:43 2006 +0200 fix drivers/acpi/Kconfig typos Signed-off-by: Adrian Bunk commit fc31e838162c60ed81659da677d7f72917576269 Author: Matt LaPlante Date: Tue Oct 3 22:23:47 2006 +0200 fix an arch/alpha/Kconfig typo Signed-off-by: Adrian Bunk commit cc2e2767f172fb2f38ca72e22ac98e452550437f Author: Matt LaPlante Date: Tue Oct 3 22:22:29 2006 +0200 Typos in fs/Kconfig Signed-off-by: Adrian Bunk commit 4b3f686d4aa8ad815dc68a4e8fabd05b1ebb9f2c Author: Matt LaPlante Date: Tue Oct 3 22:21:02 2006 +0200 Attack of "the the"s in arch The patch below corrects multiple occurances of "the the" typos across several files, both in source comments and KConfig files. There is no actual code changed, only text. Note this only affects the /arch directory, and I believe I could find many more elsewhere. :) Signed-off-by: Adrian Bunk commit bf6ee0ae494596aaf311e8430684db85d1d2f25c Author: Adrian Bunk Date: Tue Oct 3 22:17:48 2006 +0200 remove mentionings of devfs in documentation Now that devfs is removed, there's no longer any need to document how to do this or that with devfs. This patch includes some improvements by Joe Perches. Signed-off-by: Adrian Bunk commit 0a8fe0d756fba2953462cec6db09c81dd732d0b5 Author: Adrian Bunk Date: Tue Oct 3 22:11:20 2006 +0200 input: remove obsolete contact information This patch removes some obsolete contact information from Documentation/input/input.txt Signed-off-by: Adrian Bunk commit 1bef84bea273f40486936ae97cda70ee8b252cd0 Author: Wim Van Sebroeck Date: Sat Aug 5 20:59:01 2006 +0200 [WATCHDOG] iTCO_wdt.c shutdown patch Since we are using the device driver model, we don't need to arrange the shutdown via a reboot_notifier. Signed-off-by: Wim Van Sebroeck commit 4802c6533af3223f43b9e4a1bb8a2a1c51f398b1 Author: Wim Van Sebroeck Date: Wed Jul 19 22:39:13 2006 +0200 [WATCHDOG] iTCO_wdt.c - pci_dev_put fix for_each_pci_dev calls pci_get_device (and thus it calls pci_dev_get). So we need to do a pci_dev_put to keep the refcounting correct. (Thanks to Jiri Slaby ) Signed-off-by: Wim Van Sebroeck commit 3836cc0ff8c875e21a8119e7a4f0227f6e227650 Author: Wim Van Sebroeck Date: Fri Jun 30 08:44:53 2006 +0200 [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver Convert the iTCO_wdt driver to a platform device driver. Signed-off-by: Wim Van Sebroeck commit 9e0ea345ff542320882caa21ec2248e6c02d8b91 Author: Wim Van Sebroeck Date: Sun May 21 14:37:44 2006 +0200 [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O Controller Hub family (from ICH0 up to ICH7) and in the Intel 6300ESB controller hub. This driver will replace the i8xx_tco.c driver. Signed-off-by: Wim Van Sebroeck commit 9b5a4a676a4d6126664c3df5a11f6fe87da63133 Author: Steven Toth Date: Mon Oct 2 21:35:40 2006 -0300 V4L/DVB (4699): CX24109 patch to eliminate the weird mis-tunings A number of people have been reporting wierd tuning problems with various cards. Yeasah tracked down the problem to a miss-read datasheet. This resolves the problems. Signed-off-by: Yeasah Pell Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit d2be893616c45e4ea4403d1ba501b7ee2f32b0ec Author: Mauro Carvalho Chehab Date: Mon Oct 2 23:52:48 2006 -0300 V4L/DVB (4698): Fix S-Video configuration for Pinnacle PCTV-Sat Thanks to Edgar Toernig for pointing this. Signed-off-by: Mauro Carvalho Chehab commit 3979ecc7324973cf90d8ea4a2ba3fe79c7150d56 Author: Steven Toth Date: Fri Sep 29 22:37:07 2006 -0300 V4L/DVB (4689): Adding support for Nova-T-PCI PCI ID 0070:9000 Adding support for Nova-T-PCI PCI ID 0070:9000 Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit de98cdaf7ead419fe8b0a0a636ffb175489958fe Author: Hans Verkuil Date: Sun Oct 1 17:56:32 2006 -0300 V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16) The msp3430G and msp3435G models cannot do Automatic Standard Detection. So these should be forced to BTSC. These chips are early production versions for the msp34xxG series and are quite rare. The workaround for kernel 2.6.18 is to use 'standard=32' as msp3400 module option. Due to broken handling of the 'standard' option in 2.6.17 there is no workaround possible for that kernel. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 587c03d104c418a7958f24a03ac6239ac3f2e608 Author: Michael Krufky Date: Thu Sep 28 02:16:01 2006 -0300 V4L/DVB (4686): Cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 2 Add support for DViCO FusionHDTV DVB-T Dual Digital 2 USB, which is identical to the usb portion of DViCO FusionHDTV DVB-T Dual Digital 1. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6eb32a792ec19816d68529805f8169ce3ba1b1a2 Author: Sujoy Gupta Date: Sat Sep 30 06:55:29 2006 -0300 V4L/DVB (4685): Fix compiler warning in drivers/media/video/video-buf.c Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer. Signed-off-by: Martin J. Bligh Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit f1db955acbda253051a3256708d0dbfec2781de2 Author: Richard Knutsson Date: Fri Sep 29 16:15:37 2006 -0300 V4L/DVB (4684): Drivers/media/video/cx88: Remove unused defined FALSE/TRUE Remove defines of FALSE/TRUE because they are not used. Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit ccbf64b1d434b78dad491993b57a9619503ab35f Author: Mauro Carvalho Chehab Date: Fri Sep 29 12:39:36 2006 -0300 V4L/DVB (4683): Norm_notchfilter is used on just one point and argument is bogus Removed norm_notchfilter function. All the code is bound to 4 x FSC, so, any other filter won't work fine. Signed-off-by: Mauro Carvalho Chehab commit 4f43ac0cb228064cf6a253275ec1ecdab30c62f0 Author: Lars Gjesse Kjellberg Date: Mon Sep 25 23:44:06 2006 -0300 V4L/DVB (4681): Cx88: fix analog capture notch filter This patch changes the setting of the cx2388x notch filter to match that of the video capture sample frequency, removing some annoying interference lines THAT would appear when capturing composite video. This has been tested in PAL and NTSC TV norms. It sets the Y/C separation luma notch filter, which removes the chroma signal from the luma signal when using a composite input. The luma notch filter operates at the video decoder's frequency, not the ADC's frequency or at the frequency of the scaled video. Y/C separation happens after the sample rate converter, before video scaling. The datasheet provides plots of the filter response for three _video decoder_ frequencies, 4x Fsc, square pixel, and ccir601. These are the same three frequencies for the notch filter control. It seems pretty clear that this filter should be set based on the video decoder frequency. The cx88 driver always uses a video decoder frequency of 4xFsc. Signed-off-by: Lars Gjesse Kjellberg Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 76ac5dd6c055101ef9f8c6349cae4ef571039e93 Author: Steven Toth Date: Wed Sep 27 01:16:50 2006 -0300 V4L/DVB (4679): Fix for NULL pointer dereference oops during boot. A fix for intermittent oops's during boot which occurs in cx88_call_i2c_clients when dvb_attach is bringing up the frontend. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 6d98816fbe2b0a6887de0237021d6d900fbaff84 Author: Mike Isely Date: Thu Sep 28 17:53:49 2006 -0300 V4L/DVB (4675): Pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works now Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit ab9caf9e221ee1b13186a9144da26ac358f2a6f4 Author: Randy Dunlap Date: Thu Sep 28 14:03:26 2006 -0300 V4L/DVB (4674): Use NULL instead of 0 for ptrs Use NULL instead of 0 for pointer value, eliminate sparse warnings. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit dcc29cbcec8c8482eea249030e0aa65b7451073d Author: Mauro Carvalho Chehab Date: Thu Sep 28 13:48:26 2006 -0300 V4L/DVB (4673): Mark the two newer ioctls as experimental VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls are meant to be used to provide better support for webcams. Currently, it is not yet used on kernel drivers. Better to keep it marked as experimental, until we have several kernel drivers supporting those features. Signed-off-by: Mauro Carvalho Chehab commit 92b2db08b1150576d295ba9440e172675095c3ae Author: Laurent Pinchart Date: Thu Sep 28 13:42:05 2006 -0300 V4L/DVB (4672): Frame format enumeration (1/2) Add VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls to enumerate supported frame sizes and frame intervals. Signed-off-by: Martin Rubli Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 515c208db869459e4f2a58021df5aecf21c9a19f Author: Petr Baudis Date: Tue Sep 26 16:53:53 2006 -0300 V4L/DVB (4671): Support for SAA7134-based AVerTV Hybrid A16AR This adds support for a hybrid PAL/DVB/FM card. Unfortunately I tested only the DVB since I don't have any proper antenna available and I can receive even the DVB just barely so; I can hear noise in the FM part but I couldn't catch any station, then again I don't have an FM antenna either. The PAL/FM and IR control data are based on what I harvested on the 'net. Perhaps I or someone else will fix them if they turn out to be wrong. Signed-off-by: Petr Baudis Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit cc7093df3cf7ace678284c0ad3a6cfb3a1d5efd9 Author: David Hardeman Date: Tue Sep 26 16:39:00 2006 -0300 V4L/DVB (4670): Allow RC5 codes 64 - 127 in ir-kbd-i2c.c The RC5 coding has for a long time supported commands 64-127 in addition to 0-63. This is controlled by the second bit of the RC5 packet (see The attached patch modifies ir-kbd-i2c.c to allow for commands 64-127, tested with a PVR350 card in combination with a programmable remote. Signed-off-by: David Hardeman Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 4508f59826b81ad562912887e72caff392da18d1 Author: Michael Krufky Date: Mon Sep 25 14:14:24 2006 -0300 V4L/DVB (4669): Cx88: autodetect Club3D Zap TV2100 by subsystem id 12ab:2300 The Club3D Zap TV2100 has been reported to be a clone of the Yuan PG300 and KWorld/VStream XPert DVB-T with cx22702 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 48d5e8031e45545d353cb81a8f52c727deea88c0 Author: Michael Krufky Date: Mon Sep 25 14:09:10 2006 -0300 V4L/DVB (4668): Cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOO The flags for mpeg capabilities are sub-optimally named as CX88_BOARD_DVB and CX88_BOARD_BLACKBIRD, which creates some confusion. This patch renames the above to CX88_MPEG_DVB and CX88_MPEG_BLACKBIRD. Signed-off-by: Michael Krufky Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 3a5ba52a1a1981c51af8f3559c16feaa238b2fec Author: Steven Toth Date: Mon Sep 25 12:43:45 2006 -0300 V4L/DVB (4667): Changed cx88_board .dvb and .register to an enum. Some basic cleanup in preperation for a future patch where the cx88-mpeg functions have to deal with the port being used by multiple frontends in (mpeg2 hw encoder and dvb demod). Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 3057906df5c9be9c99a181eccac3bc40cf07ad9f Author: Steven Toth Date: Mon Sep 25 12:43:42 2006 -0300 V4L/DVB (4666): Ensure the WM8775 driver is loaded generically for any board. A generic change to cards to allow any board to specify whether it needs the wm8775 module loaded (by the core) or not. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit ba7e6f3e3e639de2597afffaae3fda75f6e6082d Author: Steven Toth Date: Mon Sep 25 12:41:53 2006 -0300 V4L/DVB (4665): Add frontend structure callback for bus acquisition. This patch enables generic bus arbitration callbacks enabling dvbcore frontend_open and frontend_release to pass 'acquire' and 'release' hardware messages back into the DVB bridge frameworks. Frameworks like cx88 can then implement single bus multiple demod card sharing features, which would prohibit two frontends from attempting to use a single transport bus at the same time. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 43e0602222e861957c82a7ddc7c4c2062c1aebbb Author: Mike Isely Date: Sat Sep 23 23:47:50 2006 -0300 V4L/DVB (4664): Pvrusb2: Don't use videodev.h; use v4l2-dev.h in its place The function prototype needed in pvrusb2-v4l2.c has been moved to v4l2-dev.h. Track that change. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 759100531d76f36714dde0f05a09245e9e921e4c Author: Mike Isely Date: Sat Sep 23 22:30:50 2006 -0300 V4L/DVB (4663): Pvrusb2: Get rid of private global context array brain damage A previous attempt to deal with the upcoming loss of video_set_drvdata() and video_get_drvdata() resulted in logic which causes a circular locking dependency - also known as a deadlock. This changeset attacks the problem in a different manner, using a technique that no longer requires the problematic mutex (or that private global array either). Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 32ffa9ae03c529df4208b63b4b17c6d84141faa3 Author: Mike Isely Date: Sat Sep 23 22:26:52 2006 -0300 V4L/DVB (4662): Pvrusb2: Implement VIDIOC_INT_[G|S]_REGISTER Implement VIDIOC_INT_SET_REGISTER and VIDIOC_INT_GET_REGISTER for the pvrusb2 driver. This is a debugging aid which will not be enabled unless CONFIG_VIDEO_ADV_DEBUG has been enabled. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 59753950a67edf386413c7b18039b89de56b40fb Author: Mike Isely Date: Sat Sep 23 22:19:29 2006 -0300 V4L/DVB (4661): Pvrusb2: improve 24XXX config option description The CONFIG_VIDEO_PVRUSB2_24XXX is not nearly as "experimental" as the description suggests. So refine the description to better match reality. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 06afc0ffe0023c4a378e255883c83eb996d1a8e6 Author: Mauro Carvalho Chehab Date: Sat Sep 30 06:54:14 2006 -0300 V4L/DVB (4660): Some cleanups at helper chips menu Rearranged itens, so that decoders came first; cx25840 is, in fact, an audio and video decoder; Fixed some incorrect upercases; Removed the word "chip" for some audio processors at item name; Removed the word "driver" for some item names; Signed-off-by: Mauro Carvalho Chehab commit 025c5d66ad43bb53651379d0fb257daca568d3f9 Author: Patrick Boettcher Date: Wed Sep 20 06:06:58 2006 -0300 V4L/DVB (4658): Another fix because of dvb_attach Fixed mt2060-usage with dvb_attach Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit a37ddced86b092f8f4fd8dc20d4f5dce2e7cc6d3 Author: Patrick Boettcher Date: Wed Sep 20 06:06:11 2006 -0300 V4L/DVB (4657): Power control of the device for dual board Corrected power control of the device for dual boards Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 1d57436040a7ff486fb90a82b6f542fbe275f624 Author: Patrick Boettcher Date: Wed Sep 20 04:42:23 2006 -0300 V4L/DVB (4656): Fixed dvb_attach for dib3000mc in dibusb When converting the dib3000mc-driver to dvb_attach I forgot to invert the check for NULL. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b97c5c7e6cc9ab1d2bb590db094b8534410deca3 Author: Patrick Boettcher Date: Wed Sep 20 04:40:14 2006 -0300 V4L/DVB (4655): Removed compilation warnings Removed compilation warnings for unused statics and locals Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 7fb3fc0c30a8bb8831da9d74b0c5f574962044f1 Author: Patrick Boettcher Date: Wed Sep 20 04:37:18 2006 -0300 V4L/DVB (4654): Added module parameter force_lna_activation Added a module parameter for force the activation of any LNA on a board. Suggest by Steve Toth. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 9d0bc7047fc7a3f0e3bdc9ccc53ab6c487d4e189 Author: Patrick Boettcher Date: Tue Sep 26 04:10:14 2006 -0300 V4L/DVB (4654a): dib700m is not yet ready. Removing include for kernel 2.6.19 Signed-off-by: Mauro Carvalho Chehab commit 303cbeaaacd449545d259f82b966d070418c58af Author: Patrick Boettcher Date: Tue Sep 19 12:51:56 2006 -0300 V4L/DVB (4653): Misc fixes for Nova-T 500 - forward the clock to the slave undivided - when sleeping the 3000 do not shutdown the clock Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 01b4bf31ce6ca6c1de31c773fa281a34fd98ff87 Author: Patrick Boettcher Date: Tue Sep 19 12:51:53 2006 -0300 V4L/DVB (4652): Misc fixes for DiB3000MC and Nova-T 500 - make the timing frequency update work. - fix AGC calibration for Nova-T 500 Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit d535cfa776b091a95ca88ba560a9d296cb1570fd Author: Patrick Boettcher Date: Tue Sep 19 12:51:49 2006 -0300 V4L/DVB (4651): Adding another USB product ID for Nova-T 500 Adding another USB product ID for the Nova-T 500. Reported by Jose Alberto Reguero. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 5bc636072d708287c106af15a4cd11c434c8329a Author: Patrick Boettcher Date: Tue Sep 19 12:51:46 2006 -0300 V4L/DVB (4650): Misc fixes for dib0700 download Several fixes for dib0700-module. (Firmware error checking, dependency) Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 0540c4961fcc6d69b8a3314c330c376890715eee Author: Patrick Boettcher Date: Tue Sep 19 12:51:43 2006 -0300 V4L/DVB (4649): Merged VP702x support to dvb-usb multi input The fixed support for the VP70x (supports only StarBox2) is now in sync with latest changes in the dvb-usb framework. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 6958effedb0dc709966c22e7fd0e8210b5401b84 Author: Patrick Boettcher Date: Tue Sep 19 12:51:40 2006 -0300 V4L/DVB (4648): Hauppauge Nova-T 500 support added This changeset finalizes the support of the Hauppauge Nova-T 500 (Dual DVB-T). It adds correct AGC setting for the 3000P, correct firmware download state detection. Additionally it fixes the mt2060-driver to be able to be used with dvb_attach. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b7f54910ce018f93a74211136be46c09cefd80e2 Author: Patrick Boettcher Date: Tue Sep 19 12:51:37 2006 -0300 V4L/DVB (4647): Added module for DiB0700 based devices Added module for DiB0700 based USB devices. This module is preliminary and untested (because of a lack of test devices) but should work. Further commits will be necessary to make it work properly. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 136cafbf4a024b52ba0a10627217f03cea9ff9f8 Author: Patrick Boettcher Date: Tue Sep 19 12:51:33 2006 -0300 V4L/DVB (4646): Misc. changes, DiB3000MC, MT2060 Changed the attach-function of the dib3000mc-driver to return only one frontend. In case of multiple dib3000-chips on one board, one has to call the i2c-enumeration manually before. Added a field to Microtune 2060 config to output the clock to other tuners/device on a board. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 6870ab576c86a496869fbd5bb339da7e442ee7f5 Author: Patrick Boettcher Date: Tue Sep 19 12:51:30 2006 -0300 V4L/DVB (4645): Added new file for multiple input rewrite Forgot to add usb-urb.c which is new after adding support for multiple inputs Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit c19da7efb34fc4b9ef672073ff0890ded7bc821a Author: Patrick Boettcher Date: Tue Sep 19 12:51:27 2006 -0300 V4L/DVB (4644): Multi-input fix for dtt200u Small fix for multi input for dtt200u module. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 4d43e13f723e12734257277cc38497fab1efc605 Author: Patrick Boettcher Date: Sat Sep 30 06:53:48 2006 -0300 V4L/DVB (4643): Multi-input patch for DVB-USB device This patch is the first commit of the Multiple Input Patch for the DVB-USB frame work. It changes the DVB-USB-device to be able to have more than one streaming input (e.g. multiple DVB-T sources) on one device. This is a necessary feature for the upcoming DiB7700 driven devices. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 91bd61099defb28a442db358dd9c1693c6589cee Author: Vitaly Bordug Date: Mon Oct 2 22:45:17 2006 +0400 POWERPC: mpc82xx merge: board-specific/platform stuff(resend) This intruduces 82xx family in arch/powerpc/platforms, and has all the board-specific code to represent regression-less transaction from ppc. The functionality is apparently the same, including PCI controller. Signed-off-by: Vitaly Bordug commit ed943c1faba53d9a0bde56007ee27762b29dccbd Author: Vitaly Bordug Date: Mon Oct 2 22:41:50 2006 +0400 POWERPC: 8272ads merge to powerpc: common stuff This has modules of common directories related to the mpc8272ADS board, mainly common cpm2 changes and fsl_soc.c portions related to the bitbang MDIO and other mechanisms specific for this family. Signed-off-by: Vitaly Bordug commit e02f73e9fd69f1c6d16c207f7a91ce721fe8beab Author: Vitaly Bordug Date: Mon Oct 2 22:22:36 2006 +0400 POWERPC: Added devicetree for mpc8272ads board This adds current dts file used with MPC8272ADS, introducing new mdio bitbang defines, as well as fully-CPM2-SoC board design. Signed-off-by: Vitaly Bordug commit 8db0201026fbb45c383176f539dc8af2a6871ab8 Author: Ralf Baechle Date: Mon Oct 2 16:54:48 2006 +0100 [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME. Signed-off-by: Ralf Baechle commit 3f821640341b86e47b79122d92af365fc99b5d65 Author: Maciej W. Rozycki Date: Tue Oct 3 12:27:38 2006 +0100 [MIPS] DECstation defconfig update Sanitise a number of settings for the DECstation. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit b58e5d050ff60335b106a895a87a59a8f5475db4 Author: Atsushi Nemoto Date: Sat Sep 30 03:34:06 2006 +0900 [MIPS] Fix size of zones_size and zholes_size array Commit f06a96844a577c43249fce25809a4fae07407f46 broke MIPS. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 34c2dd01fd10268fb8f362c8275f75517770e286 Author: Ralf Baechle Date: Tue Oct 3 14:42:02 2006 +0100 [MIPS] BCM1480: Mask pending interrupts against c0_status.im. Signed-off-by: Ralf Baechle commit d599def5cd81439e7da04dc6754b257043f5e584 Author: Maciej W. Rozycki Date: Tue Oct 3 12:42:02 2006 +0100 [MIPS] SB1250: Interrupt handler fixes Mask cp0.status against cp0.cause. Additionally, spurious interrupts are not recorded. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit af8b128719f5248e542036ea994610a29d0642a6 Author: Yoichi Yuasa Date: Mon Oct 2 23:19:00 2006 +0900 [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support. As per feature-removal-schedule.txt. Signed-off-by: Yoichi Yuasa Acked-by: Alan Cox Signed-off-by: Ralf Baechle commit 08dfcee84c5c747ca1cecbd04c3a7e65cc9ce26b Author: Ralf Baechle Date: Mon Oct 2 16:36:51 2006 +0100 [MIPS] Remove Atlas and SEAD from feature-removal-schedule. Maciej has started fixing the code for these platforms. Signed-off-by: Ralf Baechle commit 33a1943cb49e4049530624399e70ee3be82cb635 Author: Ralf Baechle Date: Mon Oct 2 16:32:43 2006 +0100 [MIPS] Remove Jaguar and Ocelot family from feature list. There are remaining users with interest in the platform after all. Signed-off-by: Ralf Baechle commit 15a1c5140436c5be7673a4709c5d7e1f3cd7bdd9 Author: Maciej W. Rozycki Date: Mon Oct 2 12:55:09 2006 +0100 [MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems It was obesrved that at least one older PCI card predating the requirement for the TRDY signal to respond within 16 clock ticks actually does not meet this rule nor even the power-on defaults of the PCI bridges found in development systems built around the Broadcom SiByte SOCs. Here is a patch that bumps up the timeout to the highest finite value supported by these chips, which is 255 clock ticks. The bridges affected are the SiByte SOC itself and the SP1011. This change does not effectively affect systems only having PCI option cards installed that meet the TRDY requirement of the current PCI spec. The rule was introduced with PCI 2.1, so any older card may make the system affected. If this is the case, performance of the system will suffer in return for the card working at all. If this is a concern, then the solution is not to use such cards. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle --- commit 3a42aa934856bfe3f28946f66ea8a5f056445747 Author: Maciej W. Rozycki Date: Fri Sep 29 19:06:38 2006 +0100 [MIPS] Remove dead DECstation boot code Code in arch/mips/dec/boot/ has been dead for long. Let's get rid of it before some epidemic spreads. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit 0e90f49b112e4c91dee7d61eccc06bcd25b9c534 Author: Franck Bui-Huu Date: Fri Sep 29 11:08:59 2006 +0200 [MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary The stack pointer in MIPS/gcc should always 8 bytes aligned on entry to any routines. Therefore pt_regs structure must be aligned to 8-byte boundary too. Instead of creating dummy fields to achieve this alignment, this patch let gcc doing it. Therefore 'smtc_pad' field can be safely removed. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 8ccb3dcd1f8e80e8702642e1de26541b52f6bb7c Author: Linus Torvalds Date: Tue Oct 3 09:45:46 2006 -0700 x86: Fix booting with "no387 nofxsr" Jesper Juhl reported that testing the software math-emulation by forcing "no387" doesn't work on modern CPU's. The reason was two-fold: - you also need to pass in "nofxsr" to make sure that we not only don't touch the old i387 legacy hardware, it also needs to disable the modern XMM/FXSR sequences - "nofxsr" didn't actually clear the capability bits immediately, leaving the early boot sequence still using FXSR until we got to the identify_cpu() stage. This fixes the "nofxsr" flag to take effect immediately on the boot CPU. Debugging by Randy Dunlap Acked-by: Randy Dunlap Cc: Jesper Juhl Cc: Andi Kleen Signed-off-by: Linus Torvalds commit fcb47e0bd279cab5ba8299c0a1e3364d15413a6b Author: Ryan O'Hara Date: Tue Oct 3 11:57:35 2006 -0400 [GFS2] Initialize SELinux extended attributes at inode creation time. This patch has gfs2_security_init declared as a static function, which is correct. As a result, the declaration of this function in inode.h is removed (and thus inode.h is unchanged). Also removed #include eaops.h, which is not needed. Signed-Off-By: Ryan O'Hara Signed-off-by: Steven Whitehouse commit ddacfaf76dd620af9b73343a975749778321b51c Author: Steven Whitehouse Date: Tue Oct 3 11:10:41 2006 -0400 [GFS2] Move logging code into log.c (mostly) This moves the logging code from meta_io.c into log.c and glops.c. As a result the routines can now be static and all the logging code is together in log.c, leaving meta_io.c with just metadata i/o code in it. Signed-off-by: Steven Whitehouse commit 8b2a1fd1b394c60eaa2587716102dd5e9b4e5990 Author: Zach Brown Date: Tue Oct 3 01:16:15 2006 -0700 [PATCH] pr_debug: check pr_debug() arguments check pr_debug() arguments When DEBUG isn't defined pr_debug() is defined away as an empty macro. By throwing away the arguments we allow completely incorrect code to build. Instead let's make it an empty inline which checks arguments and mark it so gcc can check the format specification. This results in a seemingly insignificant code size increase. A x86-64 allyesconfig: text data bss dec hex filename 25354768 7191098 4854720 37400586 23ab00a vmlinux.before 25354945 7191138 4854720 37400803 23ab0e3 vmlinux Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3879b6b6a8ee39b50559b2c2dd083c557d39e0f8 Author: Andrew Morton Date: Tue Oct 3 01:16:15 2006 -0700 [PATCH] isdn: more pr_debug() fixes drivers/isdn/sc/event.c: In function 'indicate_status': drivers/isdn/sc/event.c:49: error: 'events' undeclared (first use in this function) drivers/isdn/sc/event.c:49: error: (Each undeclared identifier is reported only once drivers/isdn/sc/event.c:49: error: for each function it appears in.) drivers/isdn/sc/event.c:49: warning: format '%d' expects type 'int', but argument 4 has type 'ulong' drivers/isdn/sc/interrupt.c: In function 'interrupt_handler': drivers/isdn/sc/interrupt.c:97: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' drivers/isdn/sc/timer.c: In function 'check_reset': drivers/isdn/sc/timer.c:80: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Acked-by: Karsten Keil Cc: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20f43535694bb19e1bb45917b73b7e5cd5d74818 Author: Andrew Morton Date: Tue Oct 3 01:16:14 2006 -0700 [PATCH] isdn-debug-build-fix When pr_debug() is enabled: drivers/isdn/sc/command.c: In function 'command': drivers/isdn/sc/command.c:107: error: 'commands' undeclared (first use in this function) drivers/isdn/sc/command.c:107: error: (Each undeclared identifier is reported only once drivers/isdn/sc/command.c:107: error: for each function it appears in.) drivers/isdn/sc/command.c:122: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'dial': drivers/isdn/sc/command.c:199: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'answer': drivers/isdn/sc/command.c:221: warning: format '%s' expects type 'char *', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'hangup': drivers/isdn/sc/command.c:244: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'setl2': drivers/isdn/sc/command.c:265: error: 'l2protos' undeclared (first use in this function) drivers/isdn/sc/command.c: In function 'setl3': drivers/isdn/sc/command.c:297: error: 'l3protos' undeclared (first use in this function) drivers/isdn/sc/command.c:297: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'acceptb': drivers/isdn/sc/command.c:315: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'clreaz': drivers/isdn/sc/command.c:330: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' drivers/isdn/sc/command.c: In function 'seteaz': drivers/isdn/sc/command.c:345: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Cc: Zach Brown Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42d3fb5a8771b840e0bd6dbcd0c734883dd90b6f Author: Frederik Deweerdt Date: Tue Oct 3 01:16:11 2006 -0700 [PATCH] arm build fail: vfpsingle.c It looks like Zach Brown's patch pr_debug-check-pr_debug-arguments worked as inteded. That is, it doesn't "allow completely incorrect code to build." :). The arm build fails with the following message: CC arch/arm/vfp/vfpsingle.o arch/arm/vfp/vfpsingle.c: In function `__vfp_single_normaliseround': arch/arm/vfp/vfpsingle.c:201: error: `func' undeclared (first use in this function) arch/arm/vfp/vfpsingle.c:201: error: (Each undeclared identifier is reported only once arch/arm/vfp/vfpsingle.c:201: error: for each function it appears in.) make[1]: *** [arch/arm/vfp/vfpsingle.o] Error 1 make: *** [arch/arm/vfp] Error 2 The following patch fixes the issue by using func only when DEBUG is defined. Signed-off-by: Frederik Deweerdt Cc: Russell King Cc: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8c94b11399b1dc7f08f7b28ec4289a727f0daee Author: Zach Brown Date: Tue Oct 3 01:16:10 2006 -0700 [PATCH] pr_debug: trident: use size_t length modifier in pr_debug format arguments trident: use size_t length modifier in pr_debug format arguments Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8057de64fd4734ae3e70cf76deb77f1c19958494 Author: Zach Brown Date: Tue Oct 3 01:16:10 2006 -0700 [PATCH] pr_debug: ifb: replace missing comma to separate pr_debug arguments ifb: replace missing comma to separate pr_debug arguments Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb7cf57a6196a4b27e5d2f71debefc80a2fa1725 Author: Zach Brown Date: Tue Oct 3 01:16:09 2006 -0700 [PATCH] pr_debug: dell_rbu: fix pr_debug argument warnings dell_rbu: fix pr_debug argument warnings Use size_t length modifier when outputting size_t and use %p instead of %lu for 'u8 *'. Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5df0a29d9c2239c28b5864037b51ac3d747439a9 Author: Zach Brown Date: Tue Oct 3 01:16:08 2006 -0700 [PATCH] pr_debug: tipar: repair nonexistant pr_debug argument use tipar: repair nonexistant pr_debug argument use I guessed what the pr_debug meant by 'data'. Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2b9ecc41654256ae8829193d3380935833ae976 Author: Zach Brown Date: Tue Oct 3 01:16:07 2006 -0700 [PATCH] pr_debug: umem: repair nonexistant bh pr_debug reference umem: repair nonexistant bh pr_debug reference Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c1fdf4150c3b4e486020d0ada787469900d66ed Author: Zach Brown Date: Tue Oct 3 01:16:06 2006 -0700 [PATCH] pr_debug: sysfs: use size_t length modifier in pr_debug format arguments sysfs: use size_t length modifier in pr_debug format arguments Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4779efca147475a708e84d902e096bbd20e613b7 Author: Zach Brown Date: Tue Oct 3 01:16:05 2006 -0700 [PATCH] pr_debug: configfs: use size_t length modifier in pr_debug format argument configfs: use size_t length modifier in pr_debug format argument Signed-off-by: Zach Brown Acked-by: Joel Becker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 691578cd558e647dd89ae5bc74a2307bce821186 Author: Zach Brown Date: Tue Oct 3 01:16:04 2006 -0700 [PATCH] pr_debug: aio: use size_t length modifier in pr_debug format arguments aio: use size_t length modifier in pr_debug format arguments Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a0f5bbb1a36ed113065099d3dc69a66e1c8d567 Author: NeilBrown Date: Tue Oct 3 01:16:03 2006 -0700 [PATCH] md: add error reporting to superblock write failure Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d19c2ee0b8d1cd83f8bc0f1f5e94e6b6ec71ea10 Author: Paul Clements Date: Tue Oct 3 01:16:02 2006 -0700 [PATCH] md: allow SET_BITMAP_FILE to work on 64bit kernel with 32bit userspace Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a638b2dc951c4cafea31b34a1db1c3d94809649e Author: Paul Clements Date: Tue Oct 3 01:16:01 2006 -0700 [PATCH] md: use ffz instead of find_first_set to convert multiplier to shift find_first_set doesn't find the least-significant bit on bigendian machines, so it is really wrong to use it. ffs is closer, but takes an 'int' and we have a 'unsigned long'. So use ffz(~X) to convert a chunksize into a chunkshift. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14f50b49fdab8f4c9fc87b55d3631e3bf1ffd385 Author: NeilBrown Date: Tue Oct 3 01:16:00 2006 -0700 [PATCH] md: remove 'experimental' classification from raid5 reshape I have had enough success reports not to believe that this is safe for 2.6.19. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8703fe1f5cdcff686f7eb0a46487b5a04a9324a Author: NeilBrown Date: Tue Oct 3 01:15:59 2006 -0700 [PATCH] md: remove MAX_MD_DEVS which is an arbitrary limit Once upon a time we needed to fixed limit to the number of md devices, probably because we preallocated some array. This need no longer exists, but we still have an arbitrary limit. So remove MAX_MD_DEVS and allow as many devices as we can fit into the 'minor' part of a device number. Also remove some useless noise at init time (which reports MAX_MD_DEVS) and remove MD_THREAD_NAME_MAX which hasn't been used for a while. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d33a56d3639eba077489c937943a32ef6237b1b8 Author: NeilBrown Date: Tue Oct 3 01:15:58 2006 -0700 [PATCH] md: fix duplicity of levels in md.txt md.txt has two sections describing the 'level' sysfs attribute, and some of the text is out-of-date. So make just one section, and make it right. Cc: Christian Kujau Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61df9d91e986f1314af482e7ea5f2312a6cd0d14 Author: NeilBrown Date: Tue Oct 3 01:15:57 2006 -0700 [PATCH] md: make messages about resync/recovery etc more specific It is possible to request a 'check' of an md/raid array where the whole array is read and consistancies are reported. This uses the same mechanisms as 'resync' and so reports in the kernel logs that a resync is being started. This understandably confuses/worries people. Also the text in /proc/mdstat suggests a 'resync' is happen when it is just a check. This patch changes those messages to be more specific about what is happening. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f022b2fddd97795bc9333ffb6862eacfa95c6a95 Author: NeilBrown Date: Tue Oct 3 01:15:56 2006 -0700 [PATCH] md: add a ->congested_fn function for raid5/6 This is very different from other raid levels and all requests go through a 'stripe cache', and it has congestion management already. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d12922823408b26f83b15cae4a4feff4bd22f28 Author: NeilBrown Date: Tue Oct 3 01:15:54 2006 -0700 [PATCH] md: define ->congested_fn for raid1, raid10, and multipath raid1, raid10 and multipath don't report their 'congested' status through bdi_*_congested, but should. This patch adds the appropriate functions which just check the 'congested' status of all active members (with appropriate locking). raid1 read_balance should be modified to prefer devices where bdi_read_congested returns false. Then we could use the '&' branch rather than the '|' branch. However that should would need some benchmarking first to make sure it is actually a good idea. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26be34dc3a46be983352dd89683db374b0cb73fa Author: NeilBrown Date: Tue Oct 3 01:15:53 2006 -0700 [PATCH] md: define backing_dev_info.congested_fn for raid0 and linear Each backing_dev needs to be able to report whether it is congested, either by modulating BDI_*_congested in ->state, or by defining a ->congested_fn. md/raid did neither of these. This patch add a congested_fn which simply checks all component devices to see if they are congested. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c04be0aa82ff535e3676ab3e573957bdeef41879 Author: NeilBrown Date: Tue Oct 3 01:15:53 2006 -0700 [PATCH] md: Improve locking around error handling The error handling routines don't use proper locking, and so two concurrent errors could trigger a problem. So: - use test-and-set and test-and-clear to synchonise the In_sync bits with the ->degraded count - use the spinlock to protect updates to the degraded count (could use an atomic_t but that would be a bigger change in code, and isn't really justified) - remove un-necessary locking in raid5 Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11ce99e625fe2718ad2682bfdd99070b337e6252 Author: NeilBrown Date: Tue Oct 3 01:15:52 2006 -0700 [PATCH] md: Remove working_disks from raid1 state data It is equivalent to conf->raid_disks - conf->mddev->degraded. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 867868fb557eb2a2120b80779468fa372584ddb0 Author: NeilBrown Date: Tue Oct 3 01:15:51 2006 -0700 [PATCH] md: Factor out part of raid1d into a separate function raid1d has toooo many nested block, so take the fix_read_error functionality out into a separate function. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d2063ceae73660d5142f4754d50a75b655fd1f9 Author: Coywolf Qi Hunt Date: Tue Oct 3 01:15:50 2006 -0700 [PATCH] md: remove unnecessary variable x in stripe_to_pdidx() Signed-off-by: Coywolf Qi Hunt Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b1d1dac181d8c1b9492e05cee660a985d035a06 Author: Paul Clements Date: Tue Oct 3 01:15:49 2006 -0700 [PATCH] md: new sysfs interface for setting bits in the write-intent-bitmap Add a new sysfs interface that allows the bitmap of an array to be dirtied. The interface is write-only, and is used as follows: echo "1000" > /sys/block/md2/md/bitmap (dirty the bit for chunk 1000 [offset 0] in the in-memory and on-disk bitmaps of array md2) echo "1000-2000" > /sys/block/md1/md/bitmap (dirty the bits for chunks 1000-2000 in md1's bitmap) This is useful, for example, in cluster environments where you may need to combine two disjoint bitmaps into one (following a server failure, after a secondary server has taken over the array). By combining the bitmaps on the two servers, a full resync can be avoided (This was discussed on the list back on March 18, 2005, "[PATCH 1/2] md bitmap bug fixes" thread). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76186dd8b73d2b7b9b4c8629b89c845e97009801 Author: NeilBrown Date: Tue Oct 3 01:15:48 2006 -0700 [PATCH] md: remove 'working_disks' from raid10 state It isn't needed as mddev->degraded contains equivalent info. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02c2de8cc835885bdff51a8bfd6c0b659b969f50 Author: NeilBrown Date: Tue Oct 3 01:15:47 2006 -0700 [PATCH] md: remove the working_disks and failed_disks from raid5 state data. They are not needed. conf->failed_disks is the same as mddev->degraded and conf->working_disks is conf->raid_disks - mddev->degraded. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 850b2b420cd5b363ed4cf48a8816d656c8b5251b Author: NeilBrown Date: Tue Oct 3 01:15:46 2006 -0700 [PATCH] md: replace magic numbers in sb_dirty with well defined bit flags Instead of magic numbers (0,1,2,3) in sb_dirty, we have some flags instead: MD_CHANGE_DEVS Some device state has changed requiring superblock update on all devices. MD_CHANGE_CLEAN The array has transitions from 'clean' to 'dirty' or back, requiring a superblock update on active devices, but possibly not on spares MD_CHANGE_PENDING A superblock update is underway. We wait for an update to complete by waiting for all flags to be clear. A flag can be set at any time, even during an update, without risk that the change will be lost. Stop exporting md_update_sb - isn't needed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6814d5368d68341ec6b5e4ecd10ea5947130775a Author: NeilBrown Date: Tue Oct 3 01:15:45 2006 -0700 [PATCH] md: factor out part of raid10d into a separate function. raid10d has toooo many nested block, so take the fix_read_error functionality out into a separate function. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5c124af69119c1b5c1e728bd2e7b5b1fad9b7be Author: NeilBrown Date: Tue Oct 3 01:15:45 2006 -0700 [PATCH] md: fix a comment that is wrong in raid5.h Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbedac04fa11d7f9f9f425c7ec253f55becaae57 Author: Adrian Bunk Date: Tue Oct 3 01:15:44 2006 -0700 [PATCH] md: the scheduled removal of the START_ARRAY ioctl for md This patch contains the scheduled removal of the START_ARRAY ioctl for md. Signed-off-by: Adrian Bunk Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 999d816851c3e080412a19558f111d01852d2f04 Author: Bryn Reeves Date: Tue Oct 3 01:15:43 2006 -0700 [PATCH] dm table: add target flush This patch adds support for a per-target dm_flush_fn method. This is needed to allow dm-loop to invalidate page cache mappings in response to BLKFLSBUF ioctl commands. Signed-off-by: Bryn Reeves Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cb4021453a69585e458ec2177677c0c1300dccf Author: Bryn Reeves Date: Tue Oct 3 01:15:42 2006 -0700 [PATCH] dm: extract device limit setting Separate the setting of device I/O limits from dm_get_device(). dm-loop will use this. Signed-off-by: Bryn Reeves Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9faf400f7e51e56ec76b2fc481c3191c01cb3a57 Author: Stefan Bader Date: Tue Oct 3 01:15:41 2006 -0700 [PATCH] dm: use private biosets I found a problem within device-mapper that occurs in low-mem situations. It was found using a mirror target but I think in theory it would hit any setup that stacks device-mapper devices (like LVM on top of multipath). Since device-mapper core uses the common fs_bioset in clone_bio(), and a private, but still global, bio_set in split_bvec() it is possible that the filesystem and the first level target successfully get bios but the lower level target doesn't because there is no more memory and the pool was drained by upper layers. So the remapping will be stuck forever. To solve this device-mapper core needs to use a private bio_set for each device. Signed-off-by: Stefan Bader Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a24c71843de1354d3bcc2ce47fd0b3bee936399 Author: Milan Broz Date: Tue Oct 3 01:15:40 2006 -0700 [PATCH] dm crypt: use private biosets In the low memory situation dm-crypt needs to use a private mempool of bios to avoid blocking. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23541d2d288cdb54f417ba1001dacc7f3ea10a97 Author: Milan Broz Date: Tue Oct 3 01:15:39 2006 -0700 [PATCH] dm crypt: move io to workqueue This patch is designed to help dm-crypt comply with the new constraints imposed by the following patch in -mm: md-dm-reduce-stack-usage-with-stacked-block-devices.patch Under low memory the existing implementation relies upon waiting for I/O submitted recursively to generic_make_request() completing before the original generic_make_request() call can return. This patch moves the I/O submission to a workqueue so the original generic_make_request() can return immediately. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93e605c237a61f5a0ea37b12353392f01d596628 Author: Milan Broz Date: Tue Oct 3 01:15:38 2006 -0700 [PATCH] dm crypt: restructure write processing Restructure the dm-crypt write processing in preparation for workqueue changes in the next patches. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b004457168995f2ae2a35327f885183a9e74141 Author: Milan Broz Date: Tue Oct 3 01:15:37 2006 -0700 [PATCH] dm crypt: restructure for workqueue change Restructure part of the dm-crypt code in preparation for workqueue changes. Use 'base_bio' or 'clone' variable names consistently throughout. No functional changes are included in this patch. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e48d4bbf9697f4fee4f4e48c5e2586b332809519 Author: Milan Broz Date: Tue Oct 3 01:15:37 2006 -0700 [PATCH] dm crypt: add key msg Add the facility to wipe the encryption key from memory (for example while a laptop is suspended) and reinstate it later (when the laptop gets resumed). Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8757b7764f13e336f3c0eb1f634440d4ee4c3a67 Author: Milan Broz Date: Tue Oct 3 01:15:36 2006 -0700 [PATCH] dm table: add target preresume This patch adds a target preresume hook. It is called before the targets are resumed and if it returns an error the resume gets cancelled. The crypt target will use this to indicate that it is unable to process I/O because no encryption key has been supplied. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc1092019ce3d9b3e85a285b41e852ff94a6b590 Author: Bryn Reeves Date: Tue Oct 3 01:15:35 2006 -0700 [PATCH] dm: add debug macro Add CONFIG_DM_DEBUG and DMDEBUG() macro. Signed-off-by: Bryn Reeves Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8560ed6fa8d43537af558514fa48f670b3349f08 Author: Hannes Reinecke Date: Tue Oct 3 01:15:35 2006 -0700 [PATCH] dm: add uevent change event on resume Device-mapper devices are not accessible until a 'resume' ioctl has been issued. For userspace to find out when this happens we need to generate an uevent for udev to take appropriate action. As discussed at OLS we should send 'change' events for 'resume'. We can think of no useful purpose served by also having 'suspend' events. Signed-off-by: Hannes Reinecke Signed-off-by: Kay Sievers Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69fae561f422f7f9dbda19f448633aa6564663e Author: Micha³ Miros³aw Date: Tue Oct 3 01:15:34 2006 -0700 [PATCH] dm mpath: use kzalloc Use kzalloc() instead of kmalloc() + memset(). Signed-off-by: Micha³ Miros³aw Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28f16c2039b4eefdc09c99b12f310afb44de5536 Author: Micha³ Miros³aw Date: Tue Oct 3 01:15:33 2006 -0700 [PATCH] dm mpath: tidy ctr After initialising m->ti, there's no need to pass it in subsequent calls to static functions used for parsing parameters. Signed-off-by: Micha³ Miros³aw Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e52b8f6dbe18c879ad2b5013f991ec9e46813043 Author: Jonathan Brassow Date: Tue Oct 3 01:15:32 2006 -0700 [PATCH] dm mirror: remove trailing space from table Remove trailing space from 'dmsetup table' output. Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 695368ac3302174531429a90d55c3f7f9b83906e Author: Alasdair G Kergon Date: Tue Oct 3 01:15:31 2006 -0700 [PATCH] dm snapshot: fix freeing pending exception If a snapshot became invalid while there are outstanding pending_exceptions, when pending_complete() processes each one it forgets to remove the corresponding exception from its exception table before freeing it. Fix this by moving the 'out:' label up one statement so that remove_exception() is always called. Then __invalidate_exception() no longer needs to call it and its 'pe' argument become superfluous. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b832e8de22726206eb886f6dbff47a0f3fe5168 Author: Alasdair G Kergon Date: Tue Oct 3 01:15:30 2006 -0700 [PATCH] dm snapshot: tidy pe ref counting Rename sibling_count to ref_count and introduce get and put functions. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca3a931fd33b841cbcc5932f8eac7c43e0909242 Author: Alasdair G Kergon Date: Tue Oct 3 01:15:30 2006 -0700 [PATCH] dm snapshot: add workqueue Add a workqueue so that I/O can be queued up to be flushed from a separate thread (e.g. if local interrupts are disabled). A new per-snapshot spinlock pe_lock is introduced to protect queued_bios. Signed-off-by: Alasdair G Kergon Signed-off-by: Mark McLoughlin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d493fa8c943ed4ec6e42b7ebfd8f0b7657d54f8 Author: Alasdair G Kergon Date: Tue Oct 3 01:15:29 2006 -0700 [PATCH] dm snapshot: tidy pending_complete This patch rearranges the pending_complete() code so that the functional changes in subsequent patches are clearer. By consolidating the error and the non-error paths, we can move error_snapshot_bios() and __flush_bios() in line. Signed-off-by: Alasdair G Kergon Signed-off-by: Mark McLoughlin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba40a2aa6e6f3d084cf35c8b872fc9f18f91231f Author: Alasdair G Kergon Date: Tue Oct 3 01:15:28 2006 -0700 [PATCH] dm snapshot: tidy snapshot_map This patch rearranges the snapshot_map code so that the functional changes in subsequent patches are clearer. The only functional change is to replace the existing read lock with a write lock which the next patch needs. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 927ffe7c9a156e259aae31c07dd76072c459ec57 Author: Mark McLoughlin Date: Tue Oct 3 01:15:27 2006 -0700 [PATCH] dm snapshot: fix metadata writing when suspending When suspending a device-mapper device, dm_suspend() sleeps until all necessary I/O is completed. This state is triggered by a callback from persistent_commit(). But some I/O can still be issued *after* the callback (to prepare the next metadata area for use if the current one is full). This patch delays the callback until after that I/O is complete. Signed-off-by: Mark McLoughlin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4ff496db72473949ddfe29a37471969d2f1d4ee Author: Mark McLoughlin Date: Tue Oct 3 01:15:26 2006 -0700 [PATCH] dm snapshot: make read and write exception functions void read_exception() and write_exception() only return an error if supplied with an out-of-range index. If this ever happens it's the result of a bug in the calling code so we handle this with an assertion and remove the error handling in the callers. Signed-off-by: Mark McLoughlin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9cea4f70734f743e0beb55552a9794fa5032645 Author: Mark McLoughlin Date: Tue Oct 3 01:15:25 2006 -0700 [PATCH] dm snapshot: fix metadata error handling Fix the error handling when store.read_metadata is called: the error should be returned immediately. Signed-off-by: Mark McLoughlin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7e3bf44d0ae227ea1ee87c2197212e65d043d7 Author: Mark McLoughlin Date: Tue Oct 3 01:15:25 2006 -0700 [PATCH] dm snapshot: allow zero chunk_size The chunk size of snapshots cannot be changed so it is redundant to require it as a parameter when activating an existing snapshot. Allow a value of zero in this case and ignore it. For a new snapshot, use a default value if zero is specified. Signed-off-by: Mark McLoughlin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92c060a692a0c3482cdfcaf346cb2f7572368895 Author: Milan Broz Date: Tue Oct 3 01:15:24 2006 -0700 [PATCH] dm snapshot: fix invalidation ENOMEM Fix ENOMEM error sign. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3f6ac6123be6f4ba14d71af0da0e8d3d39c33ed Author: Ishai Rabinovitz Date: Tue Oct 3 01:15:22 2006 -0700 [PATCH] dm: fix alloc_dev error path While reading the code I found a bug in the error path in alloc_dev in dm.c When blk_alloc_queue fails there is no call to free_minor. This patch fixes the problem. Signed-off-by: Ishai Rabinovitz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e90dae1f58d475b71bcc4eebf6d4fd5217ed85c7 Author: Milan Broz Date: Tue Oct 3 01:15:22 2006 -0700 [PATCH] dm: support ioctls on mapped devices: fix with fake file The new ioctl code passes the wrong file pointer to the underlying device. No file pointer is available so make a temporary fake one. ioctl_by_bdev() does set_fs(KERNEL_DS) so it's for ioctls originating within the kernel and unsuitable here. We are processing ioctls that originated in userspace and mapping them to different devices. Fixing the existing callers that pass a NULL file struct and consolidating the fake_file users are separate matters to solve in later patches. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7006f6eca874cd44d37ccb8cfeb8bed04e3bff22 Author: Alasdair G Kergon Date: Tue Oct 3 01:15:21 2006 -0700 [PATCH] dm: export blkdev_driver_ioctl Export blkdev_driver_ioctl for device-mapper. If we get as far as the device-mapper ioctl handler, we know the ioctl is not a standard block layer BLK* one, so we don't need to check for them a second time and can call blkdev_driver_ioctl() directly. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af4aa30b713a58e5952045f52c41a6e3baa2fdc Author: Milan Broz Date: Tue Oct 3 01:15:20 2006 -0700 [PATCH] dm mpath: support ioctls When an ioctl is performed on a multipath device simply pass it on to the underlying block device through current_path. If current path is not yet selected, select it. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab17ffa440cb54ca64111fa4922ba12496fcc8af Author: Milan Broz Date: Tue Oct 3 01:15:18 2006 -0700 [PATCH] dm linear: support ioctls When an ioctl is performed on a device with a linear target, simply pass it on to the underlying block device. Note that the ioctl will pass through the filtering in blkdev_ioctl() twice. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa129a2247b164173d45da8ad43cca5de9211403 Author: Milan Broz Date: Tue Oct 3 01:15:15 2006 -0700 [PATCH] dm: support ioctls on mapped devices Extend the core device-mapper infrastructure to accept arbitrary ioctls on a mapped device provided that it has exactly one target and it is capable of supporting ioctls. [We can't use unlocked_ioctl because we need 'inode': 'file' might be NULL. Is it worth changing this?] Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Arnd Bergmann wrote: > Am Wednesday 21 June 2006 21:31 schrieb Alasdair G Kergon: > > static struct block_device_operations dm_blk_dops = { > > .open = dm_blk_open, > > .release = dm_blk_close, > > +.ioctl = dm_blk_ioctl, > > .getgeo = dm_blk_getgeo, > > .owner = THIS_MODULE > > I guess this also needs a ->compat_ioctl method, otherwise it won't > work for ioctl numbers that have a compat_ioctl implementation in the > low-level device driver. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70abac6e4f4bfb05a8198e22225f9e066239c7a2 Author: Paul Mackerras Date: Tue Oct 3 01:15:14 2006 -0700 [PATCH] nvidia fbdev: fix powerpc xmon scribbles xmon writes garbage on the screen because the nvidia console driver has changed the line pitch from what the firmware set it to. Fix it by making the nvidia driver inform the btext engine (which xmon uses if the screen is its output device) about changes to display resolution. Signed-off-by: Paul Mackerras Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a09fd48f8fb6ecb8bf85efdd884b21b6201ef9cc Author: Geert Uytterhoeven Date: Tue Oct 3 01:15:11 2006 -0700 [PATCH] fbdev: correct buffer size limit in fbmem_read_proc() Address http://bugzilla.kernel.org/show_bug.cgi?id=7189 It should check `clen', not `len'. Signed-off-by: Geert Uytterhoeven Cc: Cc: "Antonino A. Daplas" Cc: Cc: Willy Tarreau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5b747b487038ce2a23e7b922bc4d27149838965 Author: Carl-Daniel Hailfinger Date: Tue Oct 3 01:15:09 2006 -0700 [PATCH] radeonfb supend/resume support for Acer Aspire 2010 This patch adds suspend/resume support for the graphics chip in the Acer Aspire 2010: ATI Technologies Inc RV350 [Mobility Radeon 9600 M10] 01:00.0 0300: 1002:4e50 (prog-if 00 [VGA]) Subsystem: 1025:0061 Flags: bus master, 66MHz, medium devsel, latency 128, IRQ 16 Memory at a8000000 (32-bit, prefetchable) [size=128M] I/O ports at c100 [size=256] Memory at e0010000 (32-bit, non-prefetchable) [size=64K] [virtual] Expansion ROM at a0000000 [disabled] [size=128K] Capabilities: [58] AGP version 2.0 Capabilities: [50] Power Management version 2 Signed-off-by: Carl-Daniel Hailfinger Acked-by: Benjamin Herrenschmidt Cc: "Benjamin A. Okopnik" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b262144a1b84c781555efd68769711279ebfba3 Author: Reiner Herrmann Date: Tue Oct 3 01:15:08 2006 -0700 [PATCH] Documentation fixes in intel810.txt Signed-off-by: Reiner Herrmann Acked-by: Randy Dunlap Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b98fc9a34bfcfd2a04e58c4fc5e408fce13204bb Author: Alan Cox Date: Tue Oct 3 01:15:07 2006 -0700 [PATCH] sstfb: cleanups - Remove 24/32bit unused support (the chips don't do 24/32bit anyway) - Clean up printk obfuscation - Clean up lispitus in the if(())()) stuff - Minor tidying No functionality changes, may have a crack at hardware scrolling based on my X driver once the cleanups are in. Signed-off-by: Alan Cox Cc: Antonino A. Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cb340ecbb010013229ac56f26707252ebed09b8 Author: Adrian Bunk Date: Tue Oct 3 01:15:06 2006 -0700 [PATCH] vt: proper prototypes for some console functions This patch adds proper prototypes to header files for three console init functions used on drivers/char/vt.c Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48afdf6eb750b6836932e4d492b90448bc68dfc0 Author: Adrian Bunk Date: Tue Oct 3 01:15:05 2006 -0700 [PATCH] fbcon:: make 3 functions static This patch makes three needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c60b118d62c14ad7586ed6a6e537c3294c90227 Author: Raphael Assenat Date: Tue Oct 3 01:15:05 2006 -0700 [PATCH] mbxfb: Fix framebuffer size smaller than requested This patch fixes a bug where we obtain a smaller resolution than requested. (eg: in 640x480, only 639x479 usable pixels). This was due to 1 being substracted from the xres and yres vars two times: first in mbxfb.c and then in the macros from reg_bits.h. This patch removes the minus ones from the mbxfb.c file. Tested and works. Signed-off-by: Raphael Assenat Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bc218410d6c2b22a7581fac6f3dc2ac1f8fc99f Author: Raphael Assenat Date: Tue Oct 3 01:15:03 2006 -0700 [PATCH] mbxfb: Fix a chip bug? resulting in wrong pixclock This is a workaround for what I think is a bug in the 2700G chip. The PLL output frequency is adustable using 3 values (M, N and P. See code for formula). The N value range is documented to be 1 to 7 but when it is set to 1, the output frequency is lower than it should be (divided by 2), giving unexpected results such as no sync on a CRT display. This patch prevents N=1 when searching for the best value for the requested pixclock. Signed-off-by: Raphael Assenat Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c5b39e0bcb407a95716de4650a2d1e6064baffa Author: Adrian Bunk Date: Tue Oct 3 01:15:02 2006 -0700 [PATCH] atyfb: Possible cleanups - make the following needlessly global function static: - mach64_ct.c: aty_st_pll_ct() - proper prototypes for the following functions: - atyfb_base.c: atyfb_copyarea() - atyfb_base.c: atyfb_fillrect() - atyfb_base.c: atyfb_imageblit() Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe27e67616e300f2c891a669ea3b0e29f1e3bead Author: Michal Piotrowski Date: Tue Oct 3 01:15:01 2006 -0700 [PATCH] drivers/video/sis/sis_main.h Removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86702ad483fa50e09f9535a0e5d2ecad2202facc Author: Michal Piotrowski Date: Tue Oct 3 01:15:01 2006 -0700 [PATCH] drivers/video/sis/vgatypes.h: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4370409a924b5e065f9f0905d243ab69a95b52f4 Author: Michal Piotrowski Date: Tue Oct 3 01:15:00 2006 -0700 [PATCH] drivers/video/sis/sis_main.c: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dc350283d3ea194c954428d86025190cab47366 Author: Michal Piotrowski Date: Tue Oct 3 01:14:59 2006 -0700 [PATCH] drivers/video/sis/sis_accel.h: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 882e6afd71a7cd8c2f97067bb819eaa310540e36 Author: Michal Piotrowski Date: Tue Oct 3 01:14:58 2006 -0700 [PATCH] drivers/video/sis/sis_accel.c: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31df9ee8c63a8d9459358e9d4be17e331f63de76 Author: Michal Piotrowski Date: Tue Oct 3 01:14:57 2006 -0700 [PATCH] drivers/video/sis/osdef.h: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db3affc0b256162a957253b4eaedb202885bb38d Author: Michal Piotrowski Date: Tue Oct 3 01:14:56 2006 -0700 [PATCH] drivers/video/sis/init.h: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8e3d4c19c1b81a8d1bf7ea709524ab8fc2186c3 Author: Michal Piotrowski Date: Tue Oct 3 01:14:55 2006 -0700 [PATCH] drivers/video/sis/initextlfb.c: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99dbb4641a820c777cb32d2907402525a6ab4015 Author: Michal Piotrowski Date: Tue Oct 3 01:14:54 2006 -0700 [PATCH] drivers/video/sis/init301.h: removal of old code Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a Author: Antonino A. Daplas Date: Tue Oct 3 01:14:54 2006 -0700 [PATCH] i810fb: Honor the return value of pci_enable_device Check the return value of pci_enable_device(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b Author: Antonino A. Daplas Date: Tue Oct 3 01:14:53 2006 -0700 [PATCH] nvidiafb: Honor the return value of pci_enable_device Check the return value of pci_enable_device(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0b10324b85d0379a2eec4984e77b25299a97ed4 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:52 2006 -0700 [PATCH] matroxfb: Honor the return value of pci_register_driver Check the return value of pci_register_driver() Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1cc53be0fc112cc8cb21ac4e0ab1af0a4082943 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:51 2006 -0700 [PATCH] atyfb: Honor the return value of pci_register_driver Check return value of pci_register_driver(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a727dea774c47ad1e18907be33f12c9f325ee4a Author: Antonino A. Daplas Date: Tue Oct 3 01:14:50 2006 -0700 [PATCH] fbcon: Honor the return value of device_create_file Check the return value of device_create_file(). If return is 'fail', remove attributes by calling device_remove_file(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a6600be3e5dafe2ddcc5d969d931c2591eed896 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:50 2006 -0700 [PATCH] fbdev: Honor the return value of device_create_file Check the return value of device_create_file(). If return is 'fail', remove attributes by calling device_remove_file(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 928e964f262b522dad57483108f62d87c52ccf82 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:49 2006 -0700 [PATCH] vt: Honor the return value of device_create_file Check the return value of device_create_file(). If return is 'fail', remove attributes by calling device_remove_file(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 212f26398f63bc905ea28f55b31d4ecd4a21a33b Author: Antonino A. Daplas Date: Tue Oct 3 01:14:48 2006 -0700 [PATCH] fbcon: Remove cursor timer if unused Remove the cursor timer (cursor flashing) on the following conditions: - if vc is in KD_GRAPHICS mode, ie, when X owns the console - if vc is blanked This misbehavior was exposed by Dave Jones. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e299dd4d7c5f38a24045e0578049d872b62f21eb Author: Dave Jones Date: Tue Oct 3 01:14:47 2006 -0700 [PATCH] fbcon: Use persistent allocation for cursor blinking Every time the console cursor blinks, we do a kmalloc/kfree pair. This patch turns that into a single allocation. This allocation was the most frequent kmalloc I saw on my test box. [adaplas] Per Alan's suggestion, move global variables to fbcon's private structure. This would also avoid resource leaks when fbcon is unloaded. Signed-off-by: Dave Jones Acked-by: Alan Cox Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a45093b7caa9d3d5421274b4ba80fba5da17e19 Author: Dennis Munsie Date: Tue Oct 3 01:14:46 2006 -0700 [PATCH] radeonfb: Use generic DDC reading Uses the generic ddc read functionality in fbmon.c instead of the previous functionality. Signed-off-by: Dennis Munsie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 946c4eab86cc67dac6021b56f45495f59b3970b4 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:45 2006 -0700 [PATCH] savagefb: Use generic DDC reading Update driver to use generic DDC reading [khali@linux-fr.org: fix oops in i2c handling] Signed-off-by: Antonino Daplas Signed-off-by: Jean Delvare Cc: Jurriaan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e80987f8db7b9c33089bb395ed54cb96d55eae04 Author: Antonino A. Daplas Date: Tue Oct 3 01:14:44 2006 -0700 [PATCH] i810fb: Use generic DDC reading Update driver to use generic DDC reading Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf5df0a2c54c2dc0fad619ac25d029119023610a Author: Antonino A. Daplas Date: Tue Oct 3 01:14:44 2006 -0700 [PATCH] rivafb: Use generic DDC reading Update driver to use generic DDC reading Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 346bc21026e7a92e1d7a4a1b3792c5e8b686133d Author: Antonino A. Daplas Date: Tue Oct 3 01:14:43 2006 -0700 [PATCH] nvidiafb: Use generic DDC reading Update driver to use generic DDC reading Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc5891c8a3ba284f13994d7bc1f1bfa8283982de Author: Dennis Munsie Date: Tue Oct 3 01:14:42 2006 -0700 [PATCH] fbdev: Add generic ddc read functionality Adds functionality to read the EDID information over the DDC bus in a generic way. This code is based on the DDC implementation in the radeon driver. [adaplas] - separate from fbmon.c and place in new file fb_ddc.c - remove dependency to CONFIG_I2C and CONFIG_I2C_ALGOBIT, otherwise, feature will not compile if i2c support is compiled as a module - feature is selectable only by drivers needing it. It must have a 'select FB_DDC if xxx' in Kconfig - change printk's to dev_*, the i2c people prefers it Signed-off-by: Dennis Munsie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66cf75121b1c8128ef9ab2d772c5654ae00c4284 Author: Mike Frysinger Date: Tue Oct 3 01:14:41 2006 -0700 [PATCH] vfb: Document option to enable the driver The Kconfig help text doesnt mention that in order to load the vfb module, you have to pass in the parameter vfb_enable=1 Document required module options in Kconfig for loading the vfb module. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 535a09ad59286b7675ffbf8b51d8ecb001c44386 Author: Guido Guenther Date: Tue Oct 3 01:14:40 2006 -0700 [PATCH] rivafb: use constants instead of magic values use (MIN/MAX)_LEVEL and FB_(UN)BLANK instead of the values they are defined to Signed-off-by: Guido Guenther Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bf1d73d7a512cfa791b7415742f71c80f6b8d7e Author: Ph. Marek Date: Tue Oct 3 01:14:38 2006 -0700 [PATCH] intelfb: Documentation update Correct sample boot line and add a remark on mode setting. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca27ac4cc6caa73740122a5f3d601c8a27b89e7c Author: Rodolfo Giometti Date: Tue Oct 3 01:14:36 2006 -0700 [PATCH] au1100fb: Add option to enable/disable the cursor - add cursor enable/disable, very useful if you wish a full screen boot logo. Cursor can be disabled from kernel command line: video=au1100fb:nocursor,panel:Toppoly_TD035STED4 or from sysfs interface: echo 1 > /sys/module/au1100fb/parameters/nocursor - fix up some wrong indentation issues. Signed-off-by: Rodolfo Giometti Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a04c6fb2e886efbc28b564d413bb5e70d79784 Author: David Brownell Date: Tue Oct 3 01:14:35 2006 -0700 [PATCH] ide-cs (CompactFlash) driver, rm irq warning Git rid of the runtime warning about pcmcia not supporting exclusive IRQs, so "the driver needs updating". Signed-off-by: David Brownell Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 652aa16291095911640137155063a5c6ea9bad74 Author: Alan Cox Date: Tue Oct 3 01:14:35 2006 -0700 [PATCH] IDE: more pci_find cleanup Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4bea10eca68152e84ffc4eaeb9d20ec2ac34664 Author: Patrick Jefferson Date: Tue Oct 3 01:14:34 2006 -0700 [PATCH] Allow ide_generic_all to be used modular and built in Allow ide/pci/generic to claim chipsets as a a module or when built-in. It requires using "all_generic_ide" as a boot option. Signed-off-by: Patrick Jefferson Acked-by: Alan Cox Closes-Bug: 7017 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 913759ac90a727b86da72efcfb70931f497d1cb7 Author: Alan Cox Date: Tue Oct 3 01:14:33 2006 -0700 [PATCH] ide: Fix crash on repeated reset Michal Miroslaw reported a problem (bugzilla #7023) where a user initiated reset while the IDE layer was already resetting the channel caused a crash, and provided a rough fix. This is a slightly cleaner version of the fix which tracks the reset state and blocks further reset requests while a reset is in progress. Note this is not a security issue - random end users can't access the ioctl in question anyway. Signed-off-by: Alan Cox Cc: Michal Miroslaw Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b86cc29dc42203588264d917e88134bdd500b0d7 Author: Alexey Dobriyan Date: Tue Oct 3 01:14:32 2006 -0700 [PATCH] CONFIG_PM=n slim: drivers/ide/pci/sc1200.c Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fa902a918518bcdc420bd272d2dd13fcae01581 Author: Marcin Juszkiewicz Date: Tue Oct 3 01:14:29 2006 -0700 [PATCH] PCMCIA: Add few IDs into ide-cs Few cards informations submitted by OpenZaurus users. Seagate 8GB microdrive: product info: "SEAGATE", "ST1" manfid 0x0111, 0x0000 One CF card: product info: "SAMSUNG", "04/05/06", "", "" manfid : 0x0000, 0x0000 Ridata 8GB Pro 150X Compact Flash Card: product info: "SMI VENDOR", "SMI PRODUCT", "" manfid: 0x000a, 0x0000 product info: "M-Systems", "CF500", "" manfid: 0x000a, 0x0000 product info: "TRANSCEND", "TS4GCF120", "" manfid: 0x000a, 0x0000 Alan sayeth: "Same update needs to go into drivers/ata/pata_pcmcia" Signed-off-by: Marcin Juszkiewicz Cc: Dominik Brodowski Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c2c0118b86183bf4826db990cae5c8a8d6c6746 Author: Jason Lunz Date: Tue Oct 3 01:14:26 2006 -0700 [PATCH] ide: reprogram disk pio timings on resume Add a step to the IDE PM state machine that reprograms disk PIO timings as the first step on resume. This prevents ide deadlock on resume-from-ram on my nforce3-based laptop. An earlier implementation was written entirely within the amd74xx ide driver, but Alan helpfully pointed out that this is the correct thing to do globally. Still, I'm only calling hwif->tuneproc() for disks, based on two things: - The existing state machine is already passed over for non-disk drives - Previous testing on my laptop shows that the hangs are related only to the disk - suspend/resume from a livecd showed that there's no need for this on the cdrom. Signed-off-by: Jason Lunz Cc: Bartlomiej Zolnierkiewicz Cc: "Rafael J. Wysocki" Cc: Sergei Shtylyov Cc: Pavel Machek Cc: Brad Campbell Cc: David Brownell Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f63c5e88a5ce45b423f3712293f1664115b09c0 Author: Sergei Shtylyov Date: Tue Oct 3 01:14:25 2006 -0700 [PATCH] ide: remove dma_base2 field from ide_hwif_t Remove dma_base2 field from ide_hwif_t as it's used only in 2 drivers and without great need. Signed-off-by: Sergei Shtylyov Cc: John Keller Signed-off-by: Jeremy Higdon Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27ac6036f31dea8117ecc525e0dbfd17b23e8c09 Author: Adrian Bunk Date: Tue Oct 3 01:14:24 2006 -0700 [PATCH] drivers/ide/: cleanups - setup-pci.c: remove the unused ide_pci_unregister_driver() - ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list) Signed-off-by: Adrian Bunk Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 349ae23fe7379a42973bcb1c85f7d43ec583c17d Author: Randy Dunlap Date: Tue Oct 3 01:14:23 2006 -0700 [PATCH] IDE core: driver layer error checking Check driver layer return values in IDE core. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac24697699b394cdebac0a2329ce3af247d6a3b Author: Alan Cox Date: Tue Oct 3 01:14:23 2006 -0700 [PATCH] ide: backport piix fixes from libata into the legacy driver There are three flags being set by default by the PIIX driver for speeds > PIO 1, and one not being cleared properly on fallback to PIO0. The most important one is the prefetch/post write control which only works for ATA and can do bad things with ATAPI. The patch does its best to set the flags correctly for drivers/ide. Its not 100% perfect but its closer than the original. 100% perfect requires proper IORDY handling but this isn't critical (and its not right in libata either .. yet) Sergei Shtylyov said: > + { 0, 0 }, > + { 0, 0 }, > + { 1, 0 }, > + { 2, 1 }, > + { 2, 3 }, }; > > pio = ide_get_best_pio_mode(drive, pio, 5, NULL); BTW, there's quite obvious error here which leads to access outside of timings[] if somebody passes PIO mode 5 (or autotuning code finds out that drive supports PIO mode 5). Could have been fixed while at it... Those drives should be rare, though... > + } > master_data = master_data | (timings[pio][0] << 12) | (timings[pio][1] << 8); > } > pci_write_config_word(dev, master_port, master_data); Actually, there's one more serious issue with piix_tune_drive() -- it doesn't actually set the drive's own transfer mode. Signed-off-by: Alan Cox Cc: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14e0a193209aeea810ad3d66388f422dc79c5b40 Author: Kirill Smelkov Date: Tue Oct 3 01:14:18 2006 -0700 [PATCH] ide: fix revision comparison in ide_in_drive_list Fix ide_in_drive_list: drive_table->id_firmware should be searched *in* id->fw_rev, not vice versa. Signed-off-by: Kirill Smelkov Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3d5b34caae393f13a9486036f98c81cac1595c4 Author: Tobias Oed Date: Tue Oct 3 01:14:17 2006 -0700 [PATCH] Enable cdrom dma access with pdc20265_old This patch allows me to use dma with my cd/dvd attached to my on board pdc20265 ide controller Alan sayeth: Looks sane. Would be nice to know if there is any documentation supporting this hack being safe but the logic makes sense. The LBA48 case faces the same problem - the state machine gets confused about the transfer length and needs kicking Signed-off-by: Tobias Oed Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Jens Axboe Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0750508ae6479d4ac6154b35c5b82929f31efb03 Author: Sergei Shtylyov Date: Tue Oct 3 01:14:17 2006 -0700 [PATCH] ide_dma_speed() fixes ide_dma_speed() fails to actually honor the IDE drivers' mode support masks) because of the bogus checks -- thus, selecting the DMA transfer mode that the driver explicitly refuses to support is possible. Additionally, there is no check for validity of the UltraDMA mode data in the drive ID, and the function is misdocumented. Signed-off-by: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83d7dbc4095a0c314b191c573be5fb4fa6ce0897 Author: Matt Mackall Date: Tue Oct 3 01:14:16 2006 -0700 [PATCH] Make number of IDE interfaces configurable Make IDE_HWIFS configurable if EMBEDDED This lets us lop as much as 16k off an x86 build. It's a little ugly, but it's dead simple. Note the fix for HWIFS < 2. Sizing interfaces dynamically unfortunately turns out to be pretty major surgery. add/remove: 0/1 grow/shrink: 0/11 up/down: 0/-16182 (-16182) function old new delta ide_hwifs 16920 1692 -15228 init_irq 1113 750 -363 ideprobe_init 283 138 -145 ide_pci_setup_ports 1329 1193 -136 save_match 85 - -85 ide_register_hw_with_fixup 367 287 -80 ide_setup 1364 1308 -56 is_chipset_set 40 4 -36 create_proc_ide_interfaces 225 205 -20 init_ide_data 84 67 -17 ide_probe_for_cmd640x 1198 1183 -15 ide_unregister 1452 1451 -1 Signed-off-by: Matt Mackall Cc: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce42f19137225d01be9388a73703df40fb7af80f Author: Hua Zhong Date: Tue Oct 3 01:14:15 2006 -0700 [PATCH] IDE error handling fixes In 2.6.15.1 I encountered some IDE crashes when unplugging IDE cables to emulate disk errors. Below is a patch against 2.6.16 which I think still applies. 1. The first BUG_ON could trigger when a PREFLUSH IO fails (it would fail the original barrier request which hasn't been marked REQ_STARTED yet). 2. the rq could have been dequeued already (same as 1). 3. HWGROUP(drive)->rq could be NULL because of the ide_error() several lines earlier. Signed-off-by: Hua Zhong Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc844e05913b84d09e86d88c0f861ef0afbee2fd Author: Sergei Shtylylov Date: Tue Oct 3 01:14:14 2006 -0700 [PATCH] IDE: always release DMA engine Release the DMA engine for the custom mapping IDE drivers also (for example, siimage.c does allocate it in both I/O-mapped and custom-mapped modes). Remove useless code from the error path of ide_allocate_dma_engine(). Signed-off-by: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 020e322de3ff75d32daa58e431aad07071da27c6 Author: Sergei Shtylylov Date: Tue Oct 3 01:14:13 2006 -0700 [PATCH] IDE: claim extra DMA ports regardless of channel - Claim extra DMA I/O ports regardless of what IDE channels are present/enabled. - Remove extra ports handling from ide_mapped_mmio_dma() since it's not applicable to the custom-mapping IDE drivers. Signed-off-by: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbb3bbdb0f78cb02451daf5687a99627f7ad1140 Author: Alan Cox Date: Tue Oct 3 01:14:12 2006 -0700 [PATCH] non-libata driver for Jmicron devices Less functional than libata this just uses the merged interface provided for dumb legacy OS's. This is basically a bridge for people not yet ready to use libata for some reason or another. Port visibility is entirely dependant on the BIOS setup. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce164428c4cabfd284ca81913415cacd889aac33 Author: Christoph Lameter Date: Tue Oct 3 01:14:11 2006 -0700 [PATCH] scheduler: NUMA aware placement of sched_group_allnodes When the per cpu sched domains are build then they also need to be placed on the node where the cpu resides otherwise we will have frequent off node accesses which will slow down the system. Signed-off-by: Christoph Lameter Acked-by: Ingo Molnar Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0feaece97795c4c775a3c732c045706eda28d0e5 Author: Satoru Takeuchi Date: Tue Oct 3 01:14:10 2006 -0700 [PATCH] sched: fixing wrong comment for find_idlest_cpu() Fixing wrong comment for find_idlest_cpu(). Signed-off-by: Satoru Takeuchi Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89c4710ee9bbbefe6a4d469d9f36266a92c275c5 Author: Siddha, Suresh B Date: Tue Oct 3 01:14:09 2006 -0700 [PATCH] sched: cleanup sched_group cpu_power setup Up to now sched group's cpu_power for each sched domain is initialized independently. This made the setup code ugly as the new sched domains are getting added. Make the sched group cpu_power setup code generic, by using domain child field and new domain flag in sched_domain. For most of the sched domains(except NUMA), sched group's cpu_power is now computed generically using the domain properties of itself and of the child domain. sched groups in NUMA domains are setup little differently and hence they don't use this generic mechanism. Signed-off-by: Suresh Siddha Acked-by: Ingo Molnar Acked-by: Nick Piggin Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a84887080dc15f048db7c3a643e98f1435790d6 Author: Siddha, Suresh B Date: Tue Oct 3 01:14:08 2006 -0700 [PATCH] sched: introduce child field in sched_domain Introduce the child field in sched_domain struct and use it in sched_balance_self(). We will also use this field in cleaning up the sched group cpu_power setup(done in a different patch) code. Signed-off-by: Suresh Siddha Acked-by: Ingo Molnar Acked-by: Nick Piggin Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74732646431a1bb7e23e6b564127a8881cfef900 Author: Dave Jones Date: Tue Oct 3 01:14:07 2006 -0700 [PATCH] sched: don't print migration cost when only 1 CPU If only a single CPU is present, printing this doesn't make much sense. Signed-off-by: Dave Jones Acked-by: Ingo Molnar Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a616058b7815aafb2163fc795e02a055b0dbc5e2 Author: Siddha, Suresh B Date: Tue Oct 3 01:14:06 2006 -0700 [PATCH] sched: remove unnecessary sched group allocations Remove dynamic sched group allocations for MC and SMP domains. These allocations can easily fail on big systems(1024 or so CPUs) and we can live with out these dynamic allocations. [akpm@osdl.org: build fix] Signed-off-by: Suresh Siddha Acked-by: Ingo Molnar Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c1e176781f43bc902a51e5832f789756bff911b Author: Nick Piggin Date: Tue Oct 3 01:14:04 2006 -0700 [PATCH] sched: force /sbin/init off isolated cpus Force /sbin/init off isolated cpus (unless every CPU is specified as an isolcpu). Users seem to think that the isolated CPUs shouldn't have much running on them to begin with. That's fair enough: intuitive, I guess. It also means that the cpu affinity masks of tasks will not include isolcpus by default, which is also more intuitive, perhaps. /sbin/init is spawned from the boot CPU's idle thread, and /sbin/init starts the rest of userspace. So if the boot CPU is specified to be an isolcpu, then prior to this patch, all of userspace will be run there. (throw in a couple of plausible devinit -> cpuinit conversions I spotted while we're here). Signed-off-by: Nick Piggin Cc: Dimitri Sivanich Acked-by: Paul Jackson Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c136efcf6f58d07512c4df83eb494597fe0d229 Author: OGAWA Hirofumi Date: Tue Oct 3 01:14:03 2006 -0700 [PATCH] pata_hpt366: fix typo switch(reg1 & 0x700) { case 5: info_hpt366.private_data = &hpt366_40; break; case 9: info_hpt366.private_data = &hpt366_25; break; default: info_hpt366.private_data = &hpt366_33; break; } The above runs always default part. It should be "(reg1 & 0x700) >> 8". Signed-off-by: OGAWA Hirofumi Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a545370d20519d7a72e1a801022180970eec34f Author: Luiz Fernando N. Capitulino Date: Tue Oct 3 01:14:01 2006 -0700 [PATCH] MAINTAINERS: Removes duplicated entry The 'STABLE BRANCH' entry is duplicated, remove it. Signed-off-by: Luiz Fernando N. Capitulino Cc: Greg KH Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ab54a936d75b1b100c998c8e2717fafd0b4c3b6 Author: Bjorn Helgaas Date: Tue Oct 3 01:14:00 2006 -0700 [PATCH] ia64: note requirement for 8250_pnp, now that 8250_acpi is gone We removed 8250_acpi in 2.6.17. If we don't have PNPACPI turned on, we won't find any ACPI serial devices, so mention this requirement in the troubleshooting part of the documentation. CONFIG_PNPACPI is already turned on in all the relevant defconfigs. Signed-off-by: Bjorn Helgaas Acked-by: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a51f4a81e737735668206ad1618ce4a84cf362e7 Author: Corey Minyard Date: Tue Oct 3 01:13:59 2006 -0700 [PATCH] IPMI: allow user to override the kernel IPMI daemon enable After the previous patch to disable the kernel IPMI daemon if interrupts were available, the issue of broken hardware was raised, and a reasonable request to add an override was mode. So here it is. Allow the user to force the kernel ipmi daemon on or off. This way, hardware with broken interrupts or users that are not concerned with performance can turn it on or off to their liking. [akpm@osdl.org: save 4 bytes in vmlinux] Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2537d36cf568291baacff91fe5ead6ad3949304e Author: Pekka Enberg Date: Tue Oct 3 01:13:58 2006 -0700 [PATCH] Add Pekka to CREDITS Whomever said... "When you meet someone now who is writing a compiler or hacking a Unix kernel, at least you know they're not just doing it to pick up chicks." ...has obviously never met a _Linux_ kernel hacker. Anyway, sometimes people confuse my email addresses, which is why I really should add the proper one to CREDITS ;-). Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 873ef76bdc56561df75ef5c3f3842c3a64da795d Author: Olaf Hering Date: Tue Oct 3 01:13:56 2006 -0700 [PATCH] restore parport_pc probing on powermac The last change for partport_pc did fix the common case for all PowerMacs, but it broke the case for PCI multiport IO cards. In fact, the config option CONFIG_PARPORT_PC_SUPERIO=y lead to a hard crash when cups probed the parport driver. It enables the winbond and smsc probing. Remove the PARPORT_BASE check again, parport_pc_find_nonpci_ports() will take care of it. All powerpc configs should have CONFIG_PARPORT_PC_SUPERIO=n, the code did not find anything on the chrp boards we tested it on. Tested on a G4/466 with a PCI card: 0001:10:13.0 Serial controller: Timedia Technology Co Ltd PCI2S550 (Dual 16550 UART) (rev 01) (prog-if 02 [16550]) Subsystem: Timedia Technology Co Ltd Unknown device 5079 Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping+ SERR- FastB2B- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- SERR- Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Adam Belay Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17a4506d0eb1f78c9018c06a79e7dd09ae78c3a8 Author: Alan Cox Date: Tue Oct 3 01:13:55 2006 -0700 [PATCH] ISDN warning fixes Clean up warnings in drivers/isdn by using long not int for the values where we pass void * and cast to integer types. The code is ok (ok passing the stuff this way isn't pretty but the code is valid). In all the cases I checked out the right thing happens anyway but this removes all the warnings. Signed-off-by: Alan Cox Cc: Jeff Garzik Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31e7e1a806dab5e8e218b78e1b41887a4f6dfcc0 Author: Jeff Garzik Date: Tue Oct 3 01:13:54 2006 -0700 [PATCH] schedule ftape removal Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcc7a8c4636ec9d14680126e9fde39e8411c44ea Author: Jeff Garzik Date: Tue Oct 3 01:13:53 2006 -0700 [PATCH] drivers/char/ip2: kill unused code, label Kill warning: drivers/char/ip2/ip2main.c: In function ‘ip2_loadmain’: drivers/char/ip2/ip2main.c:782: warning: label ‘out_class’ defined but not used This driver's initialization (and cleanup of errors during init) is extremely convoluted, and could stand to be transformed into the standard unwinding-goto style of error cleanup. Signed-off-by: Jeff Garzik Acked-by: Michael H. Warfield Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 397f4ebf4f317b1d5ecd678a8559a5cb5c6975c3 Author: Jeff Garzik Date: Tue Oct 3 01:13:52 2006 -0700 [PATCH] ipmi: fix uninitialized data bug gcc issues the following warning: drivers/char/ipmi/ipmi_si_intf.c: In function ‘init_ipmi_si’: drivers/char/ipmi/ipmi_si_intf.c:1729: warning: ‘data.irq’ may be used uninitialized in this function This is indeed a bug. data.irq is completely uninitialized in some code paths. Worse than that, data from a previous decode_dmi() run can easily leak through successive calls. Signed-off-by: Jeff Garzik Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3b6571384024be31e8b3442c0e7c3b127110d9b Author: Jeff Garzik Date: Tue Oct 3 01:13:52 2006 -0700 [PATCH] fs/eventpoll: error handling micro-cleanup While reviewing the 'may be used uninitialized' bogus gcc warnings, I noticed that an error code assignment was only needed if an error had actually occured. Signed-off-by: Jeff Garzik Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1ca66d1b990b23e7753c729332c0ada61f4f38d Author: Randy Dunlap Date: Tue Oct 3 01:13:51 2006 -0700 [PATCH] kernel-doc for kernel/resource.c Add kernel-doc function headers in kernel/resource.c and use them in DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed34d0fc5e4b89269053ed855ef714edbcf4518 Author: Randy Dunlap Date: Tue Oct 3 01:13:50 2006 -0700 [PATCH] kernel-doc for kernel/dma.c Add kernel-doc function headers in kernel/dma.c and use it in DocBook. Clean up kernel-doc in mca_dma.h (the colon (':') represents a section header). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3717bdf8f08a0e1039158c8bab2c24d20f492b6 Author: keios Date: Tue Oct 3 01:13:49 2006 -0700 [PATCH] low performance of lib/sort.c It is a non-standard heap-sort algorithm implementation because the index of child node is wrong . The sort function still outputs right result, but the performance is O( n * ( log(n) + 1 ) ) , about 10% ~ 20% worse than standard algorithm. Signed-off-by: keios Acked-by: Matt Mackall Acked-by: Zou Nan hai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffc5089196446c08d9a005cf0dd7cab18d119606 Author: Franck Bui-Huu Date: Tue Oct 3 01:13:48 2006 -0700 [PATCH] Create kallsyms_lookup_size_offset() Some uses of kallsyms_lookup() do not need to find out the name of a symbol and its module's name it belongs. This is specially true in arch specific code, which needs to unwind the stack to show the back trace during oops (mips is an example). In this specific case, we just need to retreive the function's size and the offset of the active intruction inside it. Adds a new entry "kallsyms_lookup_size_offset()" This new entry does exactly the same as kallsyms_lookup() but does not require any buffers to store any names. It returns 0 if it fails otherwise 1. Signed-off-by: Franck Bui-Huu Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 339b0c0813a257893fa84be999b9b85a50846dd8 Author: David Howells Date: Tue Oct 3 01:13:47 2006 -0700 [PATCH] FRV: Permit large kmalloc allocations [try #2] Permit kmalloc() to make allocations of up to 32MB if so configured. This may be useful under NOMMU conditions where vmalloc() can't do this. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afefdbb28a0a2af689926c30b94a14aea6036719 Author: David Howells Date: Tue Oct 3 01:13:46 2006 -0700 [PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers These patches make the kernel pass 64-bit inode numbers internally when communicating to userspace, even on a 32-bit system. They are required because some filesystems have intrinsic 64-bit inode numbers: NFS3+ and XFS for example. The 64-bit inode numbers are then propagated to userspace automatically where the arch supports it. Problems have been seen with userspace (eg: ld.so) using the 64-bit inode number returned by stat64() or getdents64() to differentiate files, and failing because the 64-bit inode number space was compressed to 32-bits, and so overlaps occur. This patch: Make filldir_t take a 64-bit inode number and struct kstat carry a 64-bit inode number so that 64-bit inode numbers can be passed back to userspace. The stat functions then returns the full 64-bit inode number where available and where possible. If it is not possible to represent the inode number supplied by the filesystem in the field provided by userspace, then error EOVERFLOW will be issued. Similarly, the getdents/readdir functions now pass the full 64-bit inode number to userspace where possible, returning EOVERFLOW instead when a directory entry is encountered that can't be properly represented. Note that this means that some inodes will not be stat'able on a 32-bit system with old libraries where they were before - but it does mean that there will be no ambiguity over what a 32-bit inode number refers to. Note similarly that directory scans may be cut short with an error on a 32-bit system with old libraries where the scan would work before for the same reasons. It is judged unlikely that this situation will occur because modern glibc uses 64-bit capable versions of stat and getdents class functions exclusively, and that older systems are unlikely to encounter unrepresentable inode numbers anyway. [akpm: alpha build fix] Signed-off-by: David Howells Cc: Trond Myklebust Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d32849b14bc8792e6f35ab27dd990d74b16126c Author: Andrew Morton Date: Tue Oct 3 01:13:45 2006 -0700 [PATCH] pid.h cleanup Make the pid.h macros look less revolting in an 80-col window. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f6fd19f1f7ab1dab225845464c96cba36a18533 Author: Guennadi Liakhovetski Date: Sun Oct 1 12:00:47 2006 +0200 [SCSI] enable clustering for tmscsim following an email from John Adams to me with a patch to enable tmscsim to use blocks up to 1MB and a discussion on linux-scsi, below is a patch to enable clustering for tmscsim. I made it switchable with a module parameter, with default "enable" - in case somebody gets problems with it. Unfortunately, I was not able to check if this alone lets you use any bigger blocks with a tape, as my tape seems to only support 1 block size - only "mt setblk 1" is successful, any other value fails. OTOH, testing on a P-133 showed that enabling clustering alone improves throughput by 10% and reduces CPU load by another 10%, so, seems a worthy thing to do. As for setting max_sectors, that might become a separate patch... Signed-off-by: James Bottomley commit 80a544cebca5f28397020332e21e04d639a18943 Author: Stephen Rothwell Date: Tue Sep 26 13:55:58 2006 +1000 [POWERPC] iSeries has no legacy I/O Signed-off-by: Stephen Rothwell commit 3f639ee8c52c187d8c95db430ac6f485bffbe5af Author: Stephen Rothwell Date: Mon Sep 25 18:19:00 2006 +1000 [POWERPC] implement BEGIN/END_FW_FTR_SECTION and use it an all the obvious places in assembler code. Signed-off-by: Stephen Rothwell commit fc246c389db7b08b4a054e68c742c6598b02523c Author: Stephen Rothwell Date: Mon Sep 25 14:00:41 2006 +1000 [POWERPC] iSeries does not need pcibios_fixup_resources Signed-off-by: Stephen Rothwell commit a542dbd3172922f178d25b463751da81d7b1e560 Author: Stephen Rothwell Date: Mon Sep 25 13:49:58 2006 +1000 [POWERPC] Allow combined iSeries and MULTIPLATFORM build This will build with ISERIES, PSERIES and PMAC64 selected, but will only boot on iSeries so far. Signed-off-by: Stephen Rothwell commit fac99d97469e7f91102f97101bea620e5f073196 Author: Paul Mundt Date: Tue Oct 3 14:13:09 2006 +0900 sh: Fixup __raw_read_trylock(). generic__raw_read_trylock() was broken, fix up the __raw_read_trylock() implementation for something sensible. Taken from m32r, which has the same use cases. Signed-off-by: Paul Mundt commit 3998a7a9d37f72c6fffd58ff39fd17f7c11a00f3 Author: Richard Curnow Date: Tue Oct 3 13:35:18 2006 +0900 sh64: Remove me from sh64 maintainers. Drop Richard as a co-maintainer, as he no longer has interest in working on the platform. Signed-off-by: Richard Curnow Signed-off-by: Paul Mundt commit b4a53b45bb48864c1b9ec61178e91651978b4632 Author: Paul Mundt Date: Tue Oct 3 13:31:43 2006 +0900 sh64: Update cayman defconfig. This fell behind a bit, update it. Signed-off-by: Paul Mundt commit 2914d4da172f53f71d0563d3c3bae14e496cbc86 Author: Paul Mundt Date: Tue Oct 3 13:19:02 2006 +0900 sh: Kill off remaining config.h references. A few of these managed to sneak back in, get rid of them once and for all. Signed-off-by: Paul Mundt commit 3e6c999de9a5438c97524a62845da8da78923205 Author: Paul Mundt Date: Tue Oct 3 13:16:15 2006 +0900 sh: Initial gitignore list Ignore build-time generated files. Signed-off-by: Paul Mundt commit 711fa8096863e4b50bb97f9ebc44606dc2182ac3 Author: Paul Mundt Date: Tue Oct 3 13:14:04 2006 +0900 sh: build fixes for defconfigs. Get all of the defconfigs building again. Signed-off-by: Paul Mundt commit 059fbd6a5ee9a35ac9f15edb2876a50bd88a008d Author: Paul Mundt Date: Tue Oct 3 13:12:38 2006 +0900 sh: Kill off more dead headers. Some old rtc and io headers were left hanging around, kill them off.. Signed-off-by: Paul Mundt commit c91485676ebea1342622b8ac566c1efd750b60dc Author: Paul Mundt Date: Tue Oct 3 13:11:00 2006 +0900 sh: Set pclk default for SH7705. CPU sub-types set the pclk default in Kconfig, add one for SH7705. Signed-off-by: Paul Mundt commit af3e17c4482cc5c8118615eddc4ac0c33b94c5f2 Author: Paul Mundt Date: Tue Oct 3 13:08:20 2006 +0900 sh: defconfig updates. Sync up all of the defconfigs, and kill off a few old ones.. Signed-off-by: Paul Mundt commit ad7a3bf30c27d902042bc85c3e54eb2082d633bd Author: Paul Mundt Date: Tue Oct 3 11:26:34 2006 +0900 [PATCH] Add unifdef to gitignore This seems to have been missed when unifdef went in via Sam's tree.. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds commit 7525d4bf991879f489c59988cbf162558b9d6489 Author: Jeff Garzik Date: Mon Oct 2 21:08:22 2006 -0400 [PATCH] hp100: fix conditional compilation mess The previous hp100 changeset attempted to kill warnings, but was only tested on !CONFIG_ISA platforms. The correct conditional compilation setup involves tested CONFIG_ISA rather than just MODULE. Fixes link on CONFIG_ISA platforms (i386) in current -git. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 0e4a523fa3981f20c3887803cebef1ad2948a0d4 Author: Andrew Morton Date: Mon Oct 2 17:24:06 2006 -0700 [PATCH] revert "insert IOAPIC(s) and Local APIC into resource map" Commit 54dbc0c9ebefb38840c6b07fa6eabaeb96c921f5 is causing various people's machines to fail to map PCI resources. Revert it in preparation for addressing the show-APICs-in-/proc/iomem requirement in a different manner. Cc: Aaron Durbin Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5a010690141ab805b059ba10f7401b80e0be831 Author: Hoang-Nam Nguyen Date: Mon Oct 2 14:52:17 2006 -0700 IB/ehca: Tweak trace message format Add an extra space to make things more readable. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 0f248d9cde673a481eb3182909b54d07e9d58f72 Author: Hoang-Nam Nguyen Date: Mon Oct 2 14:52:17 2006 -0700 IB/ehca: Fix device registration Move the call to ib_register_device() later, since a device should not be registered until it is completely read to be used. This fixes crashes that occur if an upper-layer driver such as IPoIB is loaded before the ehca module. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 13b18c86176cab34ef30ef0a5962fcb0305f7269 Author: Ralph Campbell Date: Fri Sep 29 14:37:51 2006 -0700 IB/ipath: Fix RDMA reads The PSN used to generate the request following a RDMA read was incorrect and some state booking wasn't maintained correctly. This patch fixes that. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan commit 3f168d2b66d2314fea40614a3b966c1a0b6241a9 Author: Krishna Kumar Date: Fri Sep 29 12:09:51 2006 -0700 RDMA/cma: Optimize error handling Reorganize code relating to cma_get_net_info() and rdam_create_id() to optimize error case handling (no need to alloc memory/etc. as part of rdma_create_id() if input parameters are wrong). Signed-off-by: Krishna Kumar Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 94de178ac636e9d6f89b11cb3dd400b777942ac9 Author: Krishna Kumar Date: Fri Sep 29 12:03:35 2006 -0700 RDMA/cma: Eliminate unnecessary remove_list Eliminate remove_list by using list_del_init() instead during device removal handling. Signed-off-by: Krishna Kumar Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8f0472d331619d5d74927978d0dde5b4935e41a5 Author: Sean Hefty Date: Fri Sep 29 11:57:09 2006 -0700 RDMA/cma: Set status correctly on route resolution error On reporting a route error, also include the status for the error, rather than indicating a status of 0 when an error has occurred. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6e35aabee125999f4b3c01326f5339fa74a89259 Author: Krishna Kumar Date: Fri Sep 29 11:51:49 2006 -0700 RDMA/cma: Fix device removal race The race is as follows: A process : cma_process_remove() calls cma_remove_id_dev(), which sets id state to CMA_DEVICE_REMOVAL and calls wait_event(dev_remove). B process : cma_req_handler() had incremented dev_remove, and calls cma_acquire_ib_dev() and on failure calls cma_release_remove(), which does a wake_up of cma_process_remove(). Then cma_req_handler() calls rdma_destroy_id(); A Process : cma_remove_id_dev() gets woken and checks the state of id, and since it is still (wrongly) CMA_DEVICE_REMOVAL, it calls notify_user(id) and if that fails, the caller - cma_process_remove() calls rdma_destroy_id(id). Two processes can call rdma_destroy_id(), resulting in one de-referencing kfreed id_priv. Fix is for process B to set CMA_DESTROYING in cma_req_handler() so that process A will return instead of doing a rdma_destroy_id(). Signed-off-by: Krishna Kumar Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 675a027c3db25a439f6ea744bb0c284f983dbfb9 Author: Krishna Kumar Date: Fri Sep 29 11:47:06 2006 -0700 RDMA/cma: Fix leak of cm_ids in case of failures cma_connect_ib() and cma_connect_iw() leak cm_id's in failure cases. Signed-off-by: Krishna Kumar Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 94e45a2b87bde64fd2eb170999da2fd2c5b04d28 Author: David S. Miller Date: Mon Oct 2 14:31:19 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 36d046bbbdc72a3b2f728d79b21c7275822928fd Author: David S. Miller Date: Mon Oct 2 14:30:45 2006 -0700 [SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more. It's not needed, now that all of that stuff is now in asm/compat_signal.h, and it breaks the build too :-) Signed-off-by: David S. Miller commit 14cc6abada7770bb7bd637bf7bce35503e10b652 Author: David S. Miller Date: Mon Oct 2 14:17:57 2006 -0700 [SPARC64]: Move signal compat bits to new header file. Create asm-sparc64/compat_signal.h and stuff things there. This avoids the "linux/compat.h includes asm/signal.h but asm/signal.h needs compat_sigset_t which isn't defined yet" problems introduced recently. Signed-off-by: David S. Miller commit 11dc10195aed0636d9a60907594b349424b933a7 Author: Dave Jones Date: Tue Aug 1 20:06:43 2006 +0200 [WATCHDOG] improve machzwd detection On a machine with no machzwd, loading the module prints out.. machzwd: MachZ ZF-Logic Watchdog driver initializing. 0xffff machzwd: Watchdog using action = RESET - the 0xffff printk is unnecessary - 0xffff seems to be 'hardware not present' - fix CodingStyle. (This driver could use some more work here) Signed-off-by: Dave Jones Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 795b89d207d8ff5397f9ff1f4d44662aa7c821fc Author: Samuel Tardieu Date: Sat Sep 9 17:34:31 2006 +0200 [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl() Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands. ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck Acked-by: Alan Cox Signed-off-by: Andrew Morton commit 25ff3780d4cd46804e22192a728cfb6b33c84d1b Author: Ben Dooks Date: Wed Sep 6 12:24:35 2006 +0100 [WATCHDOG] s3c24XX nowayout If the driver is not configured for `no way out`, then the open method should not automatically allow the setting of allow_close to CLOSE_STATE_ALLOW. The setting of allow_close nullifies the use of the magic close via the write path. It means that in the default state, the watchdog will shut-down even if the magic close has not been issued. Signed-off-by: Ben Dooks commit 65a64ec3b4fc904932b832c53e5a86d56b972682 Author: Vitaly Wool Date: Mon Sep 11 14:42:39 2006 +0400 [WATCHDOG] pnx4008: add cpu_relax() Added cpu_relax as suggested by Alan Cox. Signed-off-by: Vitaly Wool Signed-off-by: Wim Van Sebroeck commit 99d2853ac953900962d8191788060e80766eb214 Author: Wim Van Sebroeck Date: Sun Sep 10 12:48:15 2006 +0200 [WATCHDOG] pnx4008_wdt.c - spinlock fixes. Add io spinlocks to prevent possible race conditions between start and stop operations that are issued from different child processes where the master process opened /dev/watchdog. Signed-off-by: Wim Van Sebroeck commit 0235497f7a961db57ef975eb889503809ce82fe5 Author: Linus Torvalds Date: Mon Oct 2 14:05:20 2006 -0700 Add prototype for sigset_from_compat() Duh. I screwed up editing David Howells patch in commit 3f2e05e90e0846c42626e3d272454f26be34a1bc, and the actual declaration for the sigset_from_compat() function went missing. My bad. Olaf Hering saved the day and noticed that I'm a moron. Signed-off-by: Linus Torvalds commit f676449785d333078acb60ccf2046d0d3c59548f Author: Wim Van Sebroeck Date: Sun Jul 30 20:06:07 2006 +0200 [WATCHDOG] pnx4008_wdt.c - remove patch Change remove code so that we first detach the driver from userspace, then clean up the clock and then clean up the memory we allocated. Signed-off-by: Wim Van Sebroeck commit 2898172708aa84c9b0ce3865d6ff1ef76b538f51 Author: Wim Van Sebroeck Date: Mon Jul 3 09:03:47 2006 +0200 [WATCHDOG] pnx4008_wdt.c - nowayout patch Change nowayout to: WATCHDOG_NOWAYOUT as defined in include/linux/watchdog.h . Signed-off-by: Wim Van Sebroeck commit 9325fa36151fb9af39e697a6cd87e82667e2d8f9 Author: Vitaly Wool Date: Mon Jun 26 19:31:49 2006 +0400 [WATCHDOG] pnx4008: add watchdog support Add watchdog support for Philips PNX4008 ARM board inlined. Signed-off-by: Vitaly Wool Signed-off-by: Wim Van Sebroeck commit 92dd9994c36fb83883585058232e082cb78b19c1 Author: Jiri Slaby Date: Wed Jul 19 02:18:23 2006 +0159 [WATCHDOG] i8xx_tco remove pci_find_device. Use refcounting for pci device obtaining. Use PCI_DEVICE macro. Signed-off-by: Jiri Slaby Signed-off-by: Wim Van Sebroeck Cc: Andrew Morton commit 02be2ee9e0797b6f657827e32345f0bfeae4c20e Author: Jiri Slaby Date: Tue Jul 18 18:29:00 2006 +0159 [WATCHDOG] alim remove pci_find_device Convert pci_find_device to pci_get_device + pci_dev_put in alim watchdog cards' drivers (refcounting). Signed-off-by: Jiri Slaby Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit f92a0b6ff43e8e07bbd5b1d2dd1cff130014f3c7 Author: Steven Whitehouse Date: Mon Oct 2 16:01:53 2006 -0400 [GFS2] Mark nlink cleared so VFS sees it happen This does nothing atm, but will be required for later support of r/o bind mounts. Signed-off-by: Steven Whitehouse commit 409e185d2370356ac2e4c7160e002ac5340b6709 Author: Steven Whitehouse Date: Mon Oct 2 14:20:43 2006 -0400 [GFS2] Two redundant casts removed Signed-off-by: Steven Whitehouse commit 48516ced21e83a755ebae3d1ed03f1731befc391 Author: Steven Whitehouse Date: Mon Oct 2 12:39:19 2006 -0400 [GFS2] Remove uneeded endian conversion In many places GFS2 was calling the endian conversion routines for an inode even when only a single field, or a few fields might have changed. As a result we were copying lots of data needlessly. This patch replaces those calls with conversion of just the required fields in each case. This should be faster and easier to understand. There are still other places which suffer from this problem, but this is a start in the right direction. Signed-off-by: Steven Whitehouse commit 3cf1e7bed4681bdb1c14b6e146ae9c0afb6c1552 Author: Steven Whitehouse Date: Mon Oct 2 11:49:41 2006 -0400 [GFS2] Remove duplicate sb reading code For some reason we had two different sets of code for reading in the superblock. This removes one of them in favour of the other. Also we don't need the temporary buffer for the sb since we already have one in the gfs2 sb itself. Signed-off-by: Steven Whitehouse commit 2e565bb69ce2184eabf4f43e64afc79c46f46204 Author: Steven Whitehouse Date: Mon Oct 2 11:38:25 2006 -0400 [GFS2] Mark metadata reads for blktrace Mark the metadata reads so that blktrace knows what they are. Signed-off-by: Steven Whitehouse commit 128e5ebaf8abbda375bba82690b09630003c9213 Author: Steven Whitehouse Date: Mon Oct 2 11:24:43 2006 -0400 [GFS2] Remove iflags.h, use FS_ Update GFS2 in the light of David Howells' patch: [PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6] 36695673b012096228ebdc1b39a6a5850daa474e which calls the filesystem independant flags FS_..._FL. As a result we no longer need the flags.h file and the conversion routine is moved into the GFS2 source code. Userland programs which used to include iflags.h should now include fs.h and use the new flag names. Signed-off-by: Steven Whitehouse commit 3f2e05e90e0846c42626e3d272454f26be34a1bc Author: David Howells Date: Mon Oct 2 14:12:31 2006 +0100 [PATCH] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h Revert Andrew Morton's patch to temporarily hack around the lack of a declaration of sigset_t in linux/compat.h to make the block-disablement patches build on IA64. This got accidentally pushed to Linus and should be fixed in a different manner. Also make linux/compat.h #include asm/signal.h to gain a definition of sigset_t so that it can externally declare sigset_from_compat(). This has been compile-tested for i386, x86_64, ia64, mips, mips64, frv, ppc and ppc64 and run-tested on frv. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 9ec52099e4b8678a60e9f93e41ad87885d64f3e6 Author: Cedric Le Goater Date: Mon Oct 2 02:19:00 2006 -0700 [PATCH] replace cad_pid by a struct pid There are a few places in the kernel where the init task is signaled. The ctrl+alt+del sequence is one them. It kills a task, usually init, using a cached pid (cad_pid). This patch replaces the pid_t by a struct pid to avoid pid wrap around problem. The struct pid is initialized at boot time in init() and can be modified through systctl with /proc/sys/kernel/cad_pid [ I haven't found any distro using it ? ] It also introduces a small helper routine kill_cad_pid() which is used where it seemed ok to use cad_pid instead of pid 1. [akpm@osdl.org: cleanups, build fix] Signed-off-by: Cedric Le Goater Cc: Eric W. Biederman Cc: Martin Schwidefsky Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a657f78dcc8ea7c53eaa1f2a45ea2315738c15f Author: Oleg Nesterov Date: Mon Oct 2 02:18:59 2006 -0700 [PATCH] introduce get_task_pid() to fix unsafe get_pid() proc_pid_make_inode: ei->pid = get_pid(task_pid(task)); I think this is not safe. get_pid() can be preempted after checking "pid != NULL". Then the task exits, does detach_pid(), and RCU frees the pid. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c0d04c9e44f4a248335c33d2be7c7f7b06ff359 Author: Eric W. Biederman Date: Mon Oct 2 02:18:57 2006 -0700 [PATCH] proc: comment what proc_fill_cache does Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e61feafa2c641c2a013ba94eec56c411011cc94 Author: Eric W. Biederman Date: Mon Oct 2 02:18:57 2006 -0700 [PATCH] proc: remove the useless SMP-safe comments from /proc Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bcd6b0efd5216f2f208e92150b0e5b9bea2c210 Author: Eric W. Biederman Date: Mon Oct 2 02:18:56 2006 -0700 [PATCH] proc: remove trailing blank entry from pid_entry arrays It was pointed out that since I am taking ARRAY_SIZE anyway the trailing empty entry is silly and just wastes space. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e95bd936df2d3fc0e773068aa34350306a5c52a Author: Eric W. Biederman Date: Mon Oct 2 02:18:55 2006 -0700 [PATCH] proc: properly compute TGID_OFFSET The value doesn't change but this ensures I will have the proper value when other files are added to proc_base_stuff. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0fa9db6abdb2875a6d3069ddc6a2846a73fa5cd Author: Oleg Nesterov Date: Mon Oct 2 02:18:54 2006 -0700 [PATCH] proc: drop tasklist lock in task_state() task_state() needs tasklist_lock to protect ->parent/->real_parent. However task->parent points to nowhere only when the actions below happen in order 1) release_task(task) 2) release_task(task->parent) 3) a grace period passed But 3) implies that the memory ops from 1) should be finished, so pid_alive() can't be true in such a case. Otherwise, we don't care if ->parent/->real_parent changes under us. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a593d6edeb0a5a2c6e6919b225cec668a375df52 Author: Oleg Nesterov Date: Mon Oct 2 02:18:53 2006 -0700 [PATCH] proc: convert do_task_stat() to use lock_task_sighand() Drop tasklist_lock. ->siglock protects almost all interesting data (including sub-threads traversal) except: ->signal->tty protected by tty_mutex ->real_parent the task can't be unhashed while we are holding ->siglock, so ->real_parent can change from under us but we can safely dereference it under rcu_read_lock() ->pgrp/->session we can get inconsistent numbers if the task does sys_setsid/daemonize at the same time. I hope this is acceptable. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e6b3f42edc20e988b186fbfb9eec174294222ea Author: Oleg Nesterov Date: Mon Oct 2 02:18:52 2006 -0700 [PATCH] proc: convert task_sig() to use lock_task_sighand() lock_task_sighand() can take ->siglock without holding tasklist_lock. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fbaac005cab2f3b4d6999cdb32fb93d442c5cdb Author: Eric W. Biederman Date: Mon Oct 2 02:18:51 2006 -0700 [PATCH] proc: Use pid_task instead of open coding it Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72d9dcfc7afd80fe98334ec23531b638ee54df8b Author: Eric W. Biederman Date: Mon Oct 2 02:18:50 2006 -0700 [PATCH] proc: Merge proc_tid_attr and proc_tgid_attr The implementation is exactly the same and there is currently nothing to distinguish proc_tid_attr, and proc_tgid_attr. So it is pointless to have two separate implementations. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61a28784028e6d55755e4d0f39bee8d9bf2ee8d9 Author: Eric W. Biederman Date: Mon Oct 2 02:18:49 2006 -0700 [PATCH] proc: Remove the hard coded inode numbers The hard coded inode numbers in proc currently limit its maintainability, its flexibility, and what can be done with the rest of system. /proc limits pid-max to 32768 on 32 bit systems it limits fd-max to 32768 on all systems, and placing the pid in the inode number really gets in the way of implementing subdirectories of per process information. Ever since people started adding to the middle of the file type enumeration we haven't been maintaing the historical inode numbers, all we have really succeeded in doing is keeping the pid in the proc inode number. The pid is already available in the directory name so no information is lost removing it from the inode number. So if something in user space cares if we remove the inode number from the /proc inode it is almost certainly broken. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 444ceed8d186631fdded5e3f24dc20b93d0d3fda Author: Eric W. Biederman Date: Mon Oct 2 02:18:49 2006 -0700 [PATCH] proc: Factor out an instantiate method from every lookup method To remove the hard coded proc inode numbers it is necessary to be able to create the proc inodes during readdir. The instantiate methods are the subset of lookup that is needed to accomplish that. This first step just splits the lookup methods into 2 functions. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 801199ce805a2412bbcd9bfe213092ec656013dd Author: Eric W. Biederman Date: Mon Oct 2 02:18:48 2006 -0700 [PATCH] proc: Make the generation of the self symlink table driven This patch generalizes the concept of files in /proc that are related to processes but live in the root directory of /proc Ideally this would reuse infrastructure from the rest of the process specific parts of proc but unfortunately security_task_to_inode must not be called on files that are not strictly per process. security_task_to_inode really needs to be reexamined as the security label can change in important places that we are not currently catching, but I'm not certain that simplifies this problem. By at least matching the structure of the rest of proc we get more idiom reuse and it becomes easier to spot problems in the way things are put together. Later things like /proc/mounts are likely to be moved into proc_base as well. If union mounts are ever supported we may be able to make /proc a union mount, and properly split it into 2 filesystems. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5f2420a063fcc5a4cd6610c3ef6934827853001 Author: Haavard Skinnemoen Date: Mon Oct 2 02:18:46 2006 -0700 [PATCH] AVR32: Implement kernel_execve Move execve() into arch/avr32/kernel/sys_avr32.c, rename it to kernel_execve() and return the syscall return value directly without setting errno. This also gets rid of the __KERNEL_SYSCALLS__ stuff from unistd.h and expands #ifdef __KERNEL__ to cover everything in unistd.h except the __NR_foo definitions. Signed-off-by: Haavard Skinnemoen Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135ab6ec8fdad6f61aabe53f456821baf4a4aa0e Author: Arnd Bergmann Date: Mon Oct 2 02:18:44 2006 -0700 [PATCH] remove remaining errno and __KERNEL_SYSCALLS__ references The last in-kernel user of errno is gone, so we should remove the definition and everything referring to it. This also removes the now-unused lib/execve.c file that was introduced earlier. Also remove every trace of __KERNEL_SYSCALLS__ that still remained in the kernel. Signed-off-by: Arnd Bergmann Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 821278a75d270048e291fcbec9304439a176ba88 Author: Arnd Bergmann Date: Mon Oct 2 02:18:41 2006 -0700 [PATCH] sh64: remove the use of kernel syscalls sh64 is using system call macros to call some functions from the kernel. The old debug code can simply be removed, since we don't really have that much of a need for it anymore, it was mostly something that was handy during the initial bringup. This also brings us closer to something that looks like readable code again.. I also added a sane kernel_thread() implementation that gets away from this, so that should take care of sh64 at least. Signed-off-by: Paul Mundt Signed-off-by: Arnd Bergmann Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f4c6bc1f369f20807a8e753c2308d1629478c61 Author: Arnd Bergmann Date: Mon Oct 2 02:18:37 2006 -0700 [PATCH] Remove the use of _syscallX macros in UML User mode linux uses _syscallX() to call into the host kernel. The recommended way to do this is to use the syscall() function from libc. Signed-off-by: Arnd Bergmann Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe74290d51bc08e9b90ed7c145d74a22cd50b90e Author: Arnd Bergmann Date: Mon Oct 2 02:18:34 2006 -0700 [PATCH] provide kernel_execve on all architectures This adds the new kernel_execve function on all architectures that were using _syscall3() to implement execve. The implementation uses code from the _syscall3 macros provided in the unistd.h header file. I don't have cross-compilers for any of these architectures, so the patch is untested with the exception of i386. Most architectures can probably implement this in a nicer way in assembly or by combining it with the sys_execve implementation itself, but this should do it for now. [bunk@stusta.de: m68knommu build fix] [markh@osdl.org: build fix] [bero@arklinux.org: build fix] [ralf@linux-mips.org: mips fix] [schwidefsky@de.ibm.com: s390 fix] Signed-off-by: Arnd Bergmann Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Ralf Baechle Signed-off-by: Bernhard Rosenkraenzer Signed-off-by: Mark Haverkamp Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3db03b4afb3ecd66a0399b8ba57742ca953b0ecd Author: Arnd Bergmann Date: Mon Oct 2 02:18:31 2006 -0700 [PATCH] rename the provided execve functions to kernel_execve Some architectures provide an execve function that does not set errno, but instead returns the result code directly. Rename these to kernel_execve to get the right semantics there. Moreover, there is no reasone for any of these architectures to still provide __KERNEL_SYSCALLS__ or _syscallN macros, so remove these right away. [akpm@osdl.org: build fix] [bunk@stusta.de: build fix] Signed-off-by: Arnd Bergmann Cc: Andi Kleen Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Adrian Bunk Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6760856791c6e527da678021ee6a67896549d4da Author: Arnd Bergmann Date: Mon Oct 2 02:18:26 2006 -0700 [PATCH] introduce kernel_execve The use of execve() in the kernel is dubious, since it relies on the __KERNEL_SYSCALLS__ mechanism that stores the result in a global errno variable. As a first step of getting rid of this, change all users to a global kernel_execve function that returns a proper error code. This function is a terrible hack, and a later patch removes it again after the kernel syscalls are gone. Signed-off-by: Arnd Bergmann Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2453a3062d36f39f01302f9f1ad18e7a0c54fe38 Author: Matt Helsley Date: Mon Oct 2 02:18:25 2006 -0700 [PATCH] ipc: replace kmalloc and memset in get_undo_list with kzalloc Simplify get_undo_list() by dropping the unnecessary cast, removing the size variable, and switching to kzalloc() instead of a kmalloc() followed by a memset(). This cleanup was split then modified from Jes Sorenson's Task Notifiers patches. Signed-off-by: Matt Helsley Cc: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d124e99c2fee1c8f3020ecb0dff8d5617ee7991 Author: Pavel Date: Mon Oct 2 02:18:24 2006 -0700 [PATCH] nsproxy cloning error path fix This patch fixes copy_namespaces()'s error path. when new nsproxy (new_ns) is created pointers to namespaces (ipc, uts) are copied from the old nsproxy. Later in copy_utsname, copy_ipcs, etc. according namespaces are get-ed. On error path needed namespaces are put-ed, so there's no need to put new nsproxy itelf as it woud cause putting namespaces for the second time. Found when incorporating namespaces into OpenVZ kernel. Signed-off-by: Pavel Emelianov Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcfbd547b1209aae9d880fe5db33464413925cc8 Author: Kirill Korotaev Date: Mon Oct 2 02:18:23 2006 -0700 [PATCH] IPC namespace - sysctls Sysctl tweaks for IPC namespace Signed-off-by: Pavel Emelianiov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e9823111bdc76127b17fc70dc57f584fd7dd34c Author: Kirill Korotaev Date: Mon Oct 2 02:18:22 2006 -0700 [PATCH] IPC namespace - shm IPC namespace support for IPC shm code. Signed-off-by: Pavel Emelianiov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e38935341a3105471848220b5750e1ea8722d197 Author: Kirill Korotaev Date: Mon Oct 2 02:18:22 2006 -0700 [PATCH] IPC namespace - sem IPC namespace support for IPC sem code. Signed-off-by: Pavel Emelianiov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e78693738b71da037d0df340f38e919e8227c2b Author: Kirill Korotaev Date: Mon Oct 2 02:18:21 2006 -0700 [PATCH] IPC namespace - msg IPC namespace support for IPC msg code. Signed-off-by: Pavel Emelianiov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ea41302bab5e02c9e86ab15c509494a550f1db Author: Kirill Korotaev Date: Mon Oct 2 02:18:20 2006 -0700 [PATCH] IPC namespace - utils This patch adds basic IPC namespace functionality to IPC utils: - init_ipc_ns - copy/clone/unshare/free IPC ns - /proc preparations Signed-off-by: Pavel Emelianov Signed-off-by: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25b21cb2f6d69b0475b134e0a3e8e269137270fa Author: Kirill Korotaev Date: Mon Oct 2 02:18:19 2006 -0700 [PATCH] IPC namespace core This patch set allows to unshare IPCs and have a private set of IPC objects (sem, shm, msg) inside namespace. Basically, it is another building block of containers functionality. This patch implements core IPC namespace changes: - ipc_namespace structure - new config option CONFIG_IPC_NS - adds CLONE_NEWIPC flag - unshare support [clg@fr.ibm.com: small fix for unshare of ipc namespace] [akpm@osdl.org: build fix] Signed-off-by: Pavel Emelianov Signed-off-by: Kirill Korotaev Signed-off-by: Cedric Le Goater Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0b2fc316599d6cd875b6b8cafa67f03b9512b4d Author: Serge Hallyn Date: Mon Oct 2 02:18:18 2006 -0700 [PATCH] uts: copy nsproxy only when needed The nsproxy was being copied in unshare() when anything was being unshared, even if it was something not referenced from nsproxy. This should end up in some cases with far more memory usage than necessary. Signed-off-by: Serge Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 071df104f808b8195c40643dcb4d060681742e29 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:17 2006 -0700 [PATCH] namespaces: utsname: implement CLONE_NEWUTS flag Implement a CLONE_NEWUTS flag, and use it at clone and sys_unshare. [clg@fr.ibm.com: IPC unshare fix] [bunk@stusta.de: cleanup] Signed-off-by: Serge Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Adrian Bunk Signed-off-by: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf47fdcda65b44dbd674eeedcaa06e0aa28a5a00 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:16 2006 -0700 [PATCH] namespaces: utsname: remove system_utsname The system_utsname isn't needed now that kernel/sysctl.c is fixed. Nuke it. Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8218c74c02a7bdb5db2e40a2100534bdeb83475b Author: Serge E. Hallyn Date: Mon Oct 2 02:18:15 2006 -0700 [PATCH] namespaces: utsname: sysctl Sysctl uts patch. This will need to be done another way, but since sysctl itself needs to be container aware, 'the right thing' is a separate patchset. [akpm@osdl.org: ia64 build fix] [sam.vilain@catalyst.net.nz: cleanup] [sam.vilain@catalyst.net.nz: add proc_do_utsns_string] Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4865ecf1315b450ab3317a745a6678c04d311e40 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:14 2006 -0700 [PATCH] namespaces: utsname: implement utsname namespaces This patch defines the uts namespace and some manipulators. Adds the uts namespace to task_struct, and initializes a system-wide init namespace. It leaves a #define for system_utsname so sysctl will compile. This define will be removed in a separate patch. [akpm@osdl.org: build fix, cleanup] Signed-off-by: Serge Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96b644bdec977b97a45133e5b4466ba47a7a5e65 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:13 2006 -0700 [PATCH] namespaces: utsname: use init_utsname when appropriate In some places, particularly drivers and __init code, the init utsns is the appropriate one to use. This patch replaces those with a the init_utsname helper. Changes: Removed several uses of init_utsname(). Hope I picked all the right ones in net/ipv4/ipconfig.c. These are now changed to utsname() (the per-process namespace utsname) in the previous patch (2/7) [akpm@osdl.org: CIFS fix] Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Cc: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9ff3990f08e9a0c2839cc22808b01732ea5b3e4 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:11 2006 -0700 [PATCH] namespaces: utsname: switch to using uts namespaces Replace references to system_utsname to the per-process uts namespace where appropriate. This includes things like uname. Changes: Per Eric Biederman's comments, use the per-process uts namespace for ELF_PLATFORM, sunrpc, and parts of net/ipv4/ipconfig.c [jdike@addtoit.com: UML fix] [clg@fr.ibm.com: cleanup] [akpm@osdl.org: build fix] Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Cedric Le Goater Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bdd7aab7f0ecd5d337910816aa058c18398628e Author: Serge E. Hallyn Date: Mon Oct 2 02:18:10 2006 -0700 [PATCH] namespaces: utsname: introduce temporary helpers Define utsname() and init_utsname() which return &system_utsname. Users of system_utsname will be changed to use these helpers, after which system_utsname will disappear. Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fab413a334a7b3dd2688c5cd5d4718476e430ea4 Author: Cedric Le Goater Date: Mon Oct 2 02:18:09 2006 -0700 [PATCH] namespaces: exit_task_namespaces() invalidates nsproxy exit_task_namespaces() has replaced the former exit_namespace(). It invalidates task->nsproxy and associated namespaces. This is an issue for the (futur) pid namespace which is required to be valid in exit_notify(). This patch moves exit_task_namespaces() after exit_notify() to keep nsproxy valid. Signed-off-by: Cedric Le Goater Cc: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1651e14e28a2d9f446018ef522882e0709a2ce4f Author: Serge E. Hallyn Date: Mon Oct 2 02:18:08 2006 -0700 [PATCH] namespaces: incorporate fs namespace into nsproxy This moves the mount namespace into the nsproxy. The mount namespace count now refers to the number of nsproxies point to it, rather than the number of tasks. As a result, the unshare_namespace() function in kernel/fork.c no longer checks whether it is being shared. Signed-off-by: Serge Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0437eb594e6e5e699248f865482e61034be846d0 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:07 2006 -0700 [PATCH] nsproxy: move init_nsproxy into kernel/nsproxy.c Move the init_nsproxy definition out of arch/ into kernel/nsproxy.c. This avoids all arches having to be updated. Compiles and boots on s390. Signed-off-by: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab516013ad9ca47f1d3a936fa81303bfbf734d52 Author: Serge E. Hallyn Date: Mon Oct 2 02:18:06 2006 -0700 [PATCH] namespaces: add nsproxy This patch adds a nsproxy structure to the task struct. Later patches will move the fs namespace pointer into this structure, and introduce a new utsname namespace into the nsproxy. The vserver and openvz functionality, then, would be implemented in large part by virtualizing/isolating more and more resources into namespaces, each contained in the nsproxy. [akpm@osdl.org: build fix] Signed-off-by: Serge Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1ba4ddde0cf67991d89f039365eaaeda61aa027 Author: Adrian Bunk Date: Mon Oct 2 02:18:05 2006 -0700 [PATCH] make kernel/sysctl.c:_proc_do_string() static This patch makes the needlessly global _proc_do_string() static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5dd3d6fadf98a53b35d20427ca198fda42f1251 Author: Sam Vilain Date: Mon Oct 2 02:18:04 2006 -0700 [PATCH] proc: sysctl: add _proc_do_string helper The logic in proc_do_string is worth re-using without passing in a ctl_table structure (say, we want to calculate a pointer and pass that in instead); pass in the two fields it uses from that structure as explicit arguments. Signed-off-by: Sam Vilain Cc: Serge E. Hallyn Cc: Kirill Korotaev Cc: "Eric W. Biederman" Cc: Herbert Poetzl Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12fd352038c037ba3a7071a2ca8597c55114abc3 Author: Peter Zijlstra Date: Mon Oct 2 02:18:03 2006 -0700 [PATCH] nfsd: lockdep annotation while doing a kernel make modules_install install over an NFS mount. ============================================= [ INFO: possible recursive locking detected ] --------------------------------------------- nfsd/9550 is trying to acquire lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f but task is already holding lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f other info that might help us debug this: 2 locks held by nfsd/9550: #0: (hash_sem){..--}, at: [] exp_readlock+0xd/0xf [nfsd] #1: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f stack backtrace: [] show_trace_log_lvl+0x58/0x152 [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] __lock_acquire+0x77a/0x9a3 [] lock_acquire+0x60/0x80 [] __mutex_lock_slowpath+0xa7/0x20e [] mutex_lock+0x1c/0x1f [] vfs_unlink+0x34/0x8a [] nfsd_unlink+0x18f/0x1e2 [nfsd] [] nfsd3_proc_remove+0x95/0xa2 [nfsd] [] nfsd_dispatch+0xc0/0x178 [nfsd] [] svc_process+0x3a5/0x5ed [] nfsd+0x1a7/0x305 [nfsd] [] kernel_thread_helper+0x5/0xb DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb Leftover inexact backtrace: [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] __lock_acquire+0x77a/0x9a3 [] lock_acquire+0x60/0x80 [] __mutex_lock_slowpath+0xa7/0x20e [] mutex_lock+0x1c/0x1f [] vfs_unlink+0x34/0x8a [] nfsd_unlink+0x18f/0x1e2 [nfsd] [] nfsd3_proc_remove+0x95/0xa2 [nfsd] [] nfsd_dispatch+0xc0/0x178 [nfsd] [] svc_process+0x3a5/0x5ed [] nfsd+0x1a7/0x305 [nfsd] [] kernel_thread_helper+0x5/0xb ============================================= [ INFO: possible recursive locking detected ] --------------------------------------------- nfsd/9580 is trying to acquire lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f but task is already holding lock: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f other info that might help us debug this: 2 locks held by nfsd/9580: #0: (hash_sem){..--}, at: [] exp_readlock+0xd/0xf [nfsd] #1: (&inode->i_mutex){--..}, at: [] mutex_lock+0x1c/0x1f stack backtrace: [] show_trace_log_lvl+0x58/0x152 [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] __lock_acquire+0x77a/0x9a3 [] lock_acquire+0x60/0x80 [] __mutex_lock_slowpath+0xa7/0x20e [] mutex_lock+0x1c/0x1f [] nfsd_setattr+0x2c8/0x499 [nfsd] [] nfsd_create_v3+0x31b/0x4ac [nfsd] [] nfsd3_proc_create+0x128/0x138 [nfsd] [] nfsd_dispatch+0xc0/0x178 [nfsd] [] svc_process+0x3a5/0x5ed [] nfsd+0x1a7/0x305 [nfsd] [] kernel_thread_helper+0x5/0xb DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb Leftover inexact backtrace: [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] __lock_acquire+0x77a/0x9a3 [] lock_acquire+0x60/0x80 [] __mutex_lock_slowpath+0xa7/0x20e [] mutex_lock+0x1c/0x1f [] nfsd_setattr+0x2c8/0x499 [nfsd] [] nfsd_create_v3+0x31b/0x4ac [nfsd] [] nfsd3_proc_create+0x128/0x138 [nfsd] [] nfsd_dispatch+0xc0/0x178 [nfsd] [] svc_process+0x3a5/0x5ed [] nfsd+0x1a7/0x305 [nfsd] [] kernel_thread_helper+0x5/0xb Signed-off-by: Peter Zijlstra Cc: Neil Brown Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed2965af1bae30f746e936d80ad4fabb9e208c8 Author: Greg Banks Date: Mon Oct 2 02:18:02 2006 -0700 [PATCH] knfsd: allow admin to set nthreads per node Add /proc/fs/nfsd/pool_threads which allows the sysadmin (or a userspace daemon) to read and change the number of nfsd threads in each pool. The format is a list of space-separated integers, one per pool. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfd241600a3b0db4fe43c859f1460d0a958d924a Author: Greg Banks Date: Mon Oct 2 02:18:01 2006 -0700 [PATCH] knfsd: make rpc threads pools numa aware Actually implement multiple pools. On NUMA machines, allocate a svc_pool per NUMA node; on SMP a svc_pool per CPU; otherwise a single global pool. Enqueue sockets on the svc_pool corresponding to the CPU on which the socket bh is run (i.e. the NIC interrupt CPU). Threads have their cpu mask set to limit them to the CPUs in the svc_pool that owns them. This is the patch that allows an Altix to scale NFS traffic linearly beyond 4 CPUs and 4 NICs. Incorporates changes and feedback from Neil Brown, Trond Myklebust, and Christoph Hellwig. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eec09661dc82e90a31051d045a94026a91aceb82 Author: Greg Banks Date: Mon Oct 2 02:18:00 2006 -0700 [PATCH] knfsd: use svc_set_num_threads to manage threads in knfsd Replace the existing list of all nfsd threads with new code using svc_create_pooled(). Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a74554429eada89a7ddb47317e6a2968d03e41a2 Author: Greg Banks Date: Mon Oct 2 02:17:59 2006 -0700 [PATCH] knfsd: add svc_set_num_threads Currently knfsd keeps its own list of all nfsd threads in nfssvc.c; add a new way of managing the list of all threads in a svc_serv. Add svc_create_pooled() to allow creation of a svc_serv whose threads are managed by the sunrpc code. Add svc_set_num_threads() to manage the number of threads in a service, either per-pool or globally across the service. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a24ab5749a31aa10ee60d9310ad72f24d7c38ab Author: Greg Banks Date: Mon Oct 2 02:17:58 2006 -0700 [PATCH] knfsd: add svc_get add svc_get() for those occasions when we need to temporarily bump up svc_serv->sv_nrthreads as a pseudo refcount. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3262c816a3d7fb1eaabce633caa317887ed549ae Author: Greg Banks Date: Mon Oct 2 02:17:58 2006 -0700 [PATCH] knfsd: split svc_serv into pools Split out the list of idle threads and pending sockets from svc_serv into a new svc_pool structure, and allocate a fixed number (in this patch, 1) of pools per svc_serv. The new structure contains a lock which takes over several of the duties of svc_serv->sv_lock, which is now relegated to protecting only sv_tempsocks, sv_permsocks, and sv_tmpcnt in svc_serv. The point is to move the hottest fields out of svc_serv and into svc_pool, allowing a following patch to arrange for a svc_pool per NUMA node or per CPU. This is a major step towards making the NFS server NUMA-friendly. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c081a0c7cfe42adf8e8b9c2b8d0b2ec7f47603e8 Author: Greg Banks Date: Mon Oct 2 02:17:57 2006 -0700 [PATCH] knfsd: test and set SK_BUSY atomically The SK_BUSY bit in svc_sock->sk_flags ensures that we do not attempt to enqueue a socket twice. Currently, setting and clearing the bit is protected by svc_serv->sv_lock. As I intend to reduce the data that the lock protects so it's not held when svc_sock_enqueue() tests and sets SK_BUSY, that test and set needs to be atomic. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5685f0fa1c24b138d041ef129ed419c5effa40e1 Author: Greg Banks Date: Mon Oct 2 02:17:56 2006 -0700 [PATCH] knfsd: convert sk_reserved to atomic_t Convert the svc_sock->sk_reserved variable from an int protected by svc_serv->sv_lock, to an atomic. This reduces (by 1) the number of places we need to take the (effectively global) svc_serv->sv_lock. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a68d952af5f43032012d26dd0d5164c9e9986bc Author: Greg Banks Date: Mon Oct 2 02:17:55 2006 -0700 [PATCH] knfsd: use new lock for svc_sock deferred list Protect the svc_sock->sk_deferred list with a new lock svc_sock->sk_defer_lock instead of svc_serv->sv_lock. Using the more fine-grained lock reduces the number of places we need to take the svc_serv lock. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c45c357d7dbc9e94338f44349e0035149da86b26 Author: Greg Banks Date: Mon Oct 2 02:17:54 2006 -0700 [PATCH] knfsd: convert sk_inuse to atomic_t Convert the svc_sock->sk_inuse counter from an int protected by svc_serv->sv_lock, to an atomic. This reduces the number of places we need to take the (effectively global) svc_serv->sv_lock. Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36bdfc8bae51339aa27ef8e4ce148185293061ae Author: Greg Banks Date: Mon Oct 2 02:17:54 2006 -0700 [PATCH] knfsd: move tempsock aging to a timer Following are 11 patches from Greg Banks which combine to make knfsd more Numa-aware. They reduce hitting on 'global' data structures, and create some data-structures that can be node-local. knfsd threads are bound to a particular node, and the thread to handle a new request is chosen from the threads that are attach to the node that received the interrupt. The distribution of threads across nodes can be controlled by a new file in the 'nfsd' filesystem, though the default approach of an even spread is probably fine for most sites. Some (old) numbers that show the efficacy of these patches: N == number of NICs == number of CPUs == nmber of clients. Number of NUMA nodes == N/2 N Throughput, MiB/s CPU usage, % (max=N*100) Before After Before After --- ------ ---- ----- ----- 4 312 435 350 228 6 500 656 501 418 8 562 804 690 589 This patch: Move the aging of RPC/TCP connection sockets from the main svc_recv() loop to a timer which uses a mark-and-sweep algorithm every 6 minutes. This reduces the amount of work that needs to be done in the main RPC loop and the length of time we need to hold the (effectively global) svc_serv->sv_lock. [akpm@osdl.org: cleanup] Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a3ae42dc312dbdffee803efaf393421b79f997a Author: NeilBrown Date: Mon Oct 2 02:17:53 2006 -0700 [PATCH] knfsd: Correctly handle error condition from lockd_up If lockd_up fails - what should we expect? Do we have to later call lockd_down? Well the nfs client thinks "no", the nfs server thinks "yes". lockd thinks "yes". The only answer that really makes sense is "no" !! So: Make lockd_up only increment nlmsvc_users on success. Make nfsd handle errors from lockd_up properly. Make sure lockd_up(0) never fails when lockd is running so that the 'reclaimer' call to lockd_up doesn't need to be error checked. Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dcf91ec6698fe8564ad91bbe42740aacaa0d9ee Author: NeilBrown Date: Mon Oct 2 02:17:52 2006 -0700 [PATCH] knfsd: Move makesock failed warning into make_socks. Thus it is printed for any path that leads to failure (make_socks is called from two places). Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dfb4210535303bb4c2e0ff1c4fdd4dfe9b93472 Author: NeilBrown Date: Mon Oct 2 02:17:51 2006 -0700 [PATCH] knfsd: Check return value of lockd_up in write_ports We should be checking the return value of lockd_up when adding a new socket to nfsd. So move the lockd_up before the svc_addsock and check the return value. The move is because lockd_down is easy, but there is no easy way to remove a recently added socket. Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fb2b47fa16c81317ec282248e6cff521cca31c2 Author: NeilBrown Date: Mon Oct 2 02:17:50 2006 -0700 [PATCH] knfsd: Drop 'serv' option to svc_recv and svc_process It isn't needed as it is available in rqstp->rq_server, and dropping it allows some local vars to be dropped. [akpm@osdl.org: build fix] Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 896440d560de3bca6813e83792f431edf5073318 Author: Josh Triplett Date: Mon Oct 2 02:17:50 2006 -0700 [PATCH] nfsd: add lock annotations to e_start and e_stop e_start acquires svc_export_cache.hash_lock, and e_stop releases it. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc6f02e516b487ada46823fb05f237a0ef705f92 Author: Greg Banks Date: Mon Oct 2 02:17:49 2006 -0700 [PATCH] knfsd: Use SEQ_START_TOKEN instead of hardcoded magic (void*)1 Signed-off-by: Greg Banks Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41b66d63c730cc45a1024e1f1e67439e507e40f Author: NeilBrown Date: Mon Oct 2 02:17:48 2006 -0700 [PATCH] knfsd: allow sockets to be passed to nfsd via 'portlist' Userspace should create and bind a socket (but not connectted) and write the 'fd' to portlist. This will cause the nfs server to listen on that socket. To close a socket, the name of the socket - as read from 'portlist' can be written to 'portlist' with a preceding '-'. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80212d59e32a8a8e030c2ddc5861d8ff70542c56 Author: NeilBrown Date: Mon Oct 2 02:17:47 2006 -0700 [PATCH] knfsd: define new nfsdfs file: portlist - contains list of ports This file will list all ports that nfsd has open. Default when TCP enabled will be ipv4 udp 0.0.0.0 2049 ipv4 tcp 0.0.0.0 2049 Later, the list of ports will be settable. 'portlist' chosen rather than 'ports', to avoid unnecessary confusion with non-mainline patches which created 'ports' with different semantics. [akpm@osdl.org: cleanups, build fix] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02a375f0ac4bc2e9b767fabb6b2f9915547226a7 Author: NeilBrown Date: Mon Oct 2 02:17:46 2006 -0700 [PATCH] knfsd: separate out some parts of nfsd_svc, which start nfs servers Separate out the code for creating a new service, and for creating initial sockets. Some of these new functions will have multiple callers soon. [akpm@osdl.org: cleanups] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6658d3a7bbfd1768a7b599def47939417f0ee8ef Author: NeilBrown Date: Mon Oct 2 02:17:46 2006 -0700 [PATCH] knfsd: remove nfsd_versbits as intermediate storage for desired versions We have an array 'nfsd_version' which lists the available versions of nfsd, and 'nfsd_versions' (poor choice there :-() which lists the currently active versions. Then we have a bitmap - nfsd_versbits which says which versions are wanted. The bits in this bitset cause content to be copied from nfsd_version to nfsd_versions when nfsd starts. This patch removes nfsd_versbits and moves information directly from nfsd_version to nfsd_versions when requests for version changes arrive. Note that this doesn't make it possible to change versions while the server is running. This is because serv->sv_xdrsize is calculated when a service is created, and used when threads are created, and xdrsize depends on the active versions. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24e36663c375df577d2dcae437713481ffd6850c Author: NeilBrown Date: Mon Oct 2 02:17:45 2006 -0700 [PATCH] knfsd: be more selective in which sockets lockd listens on Currently lockd listens on UDP always, and TCP if CONFIG_NFSD_TCP is set. However as lockd performs services of the client as well, this is a problem. If CONFIG_NfSD_TCP is not set, and a tcp mount is used, the server will not be able to call back to lockd. So: - add an option to lockd_up saying which protocol is needed - Always open sockets for which an explicit port was given, otherwise only open a socket of the type required - Change nfsd to do one lockd_up per socket rather than one per thread. This - removes the dependancy on CONFIG_NFSD_TCP - means that lockd may open sockets other than at startup - means that lockd will *not* listen on UDP if the only mounts are TCP mount (and nfsd hasn't started). The latter is the only one that concerns me at all - I don't know if this might be a problem with some servers. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc591ccff27e6a85d3a0d6fcb16cfadcc45267a8 Author: NeilBrown Date: Mon Oct 2 02:17:44 2006 -0700 [PATCH] knfsd: add a callback for when last rpc thread finishes nfsd has some cleanup that it wants to do when the last thread exits, and there will shortly be some more. So collect this all into one place and define a callback for an rpc service to call when the service is about to be destroyed. [akpm@osdl.org: cleanups, build fix] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40f10522173c34e56cb9bf2fd37c62f69a427f1b Author: Greg Banks Date: Mon Oct 2 02:17:43 2006 -0700 [PATCH] knfsd: remove an unused variable from auth_unix_lookup() Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b06c7b43335788a62f77a9be9cc8eb479a929853 Author: Greg Banks Date: Mon Oct 2 02:17:42 2006 -0700 [PATCH] knfsd: remove an unused variable from e_show() Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e3b480096568d58d931df6104ef7ca80757efd3 Author: Greg Banks Date: Mon Oct 2 02:17:41 2006 -0700 [PATCH] knfsd: add some missing newlines in printks Signed-off-by: Greg Banks Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a406c3664e171ca8f20dfb339074b26eb2674ac0 Author: Greg Banks Date: Mon Oct 2 02:17:41 2006 -0700 [PATCH] cpumask: export node_to_cpu_mask consistently cpumask: ensure that node_to_cpumask() is available to modules for all supported combinations of architecture and CONFIG_NUMA. Signed-off-by: Greg Banks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e16b38f71322efd8a221f64b6ddc0748d21d2e1a Author: Greg Banks Date: Mon Oct 2 02:17:40 2006 -0700 [PATCH] cpumask: export cpu_online_map and cpu_possible_map consistently cpumask: ensure that the cpu_online_map and cpu_possible_map bitmasks, and hence all the macros in that require them, are available to modules for all supported combinations of architecture and CONFIG_SMP. Signed-off-by: Greg Banks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f532f3861d2c4e5aa7dcd33fb18e9975eb28457 Author: Greg Banks Date: Mon Oct 2 02:17:39 2006 -0700 [PATCH] cpumask: add highest_possible_node_id cpumask: add highest_possible_node_id(), analogous to highest_possible_processor_id(). [pj@sgi.com: fix typo] Signed-off-by: Greg Banks Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca8af486765852302931bb69075871d5564e1e5b Author: Andrew Morton Date: Mon Oct 2 02:17:38 2006 -0700 [PATCH] isdn: work around excessive udelay() As reported in http://bugzilla.kernel.org/show_bug.cgi?id=6970, ISDN can issue excessively-long udelays, which triggers a build-time error on ARM. This is very sucky of ISDN, but I doubt if anyone is going to suddenly fix it. So change the macro to do the microsecond counting itself. Cc: Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd0fbcc27fd72a11dacc3f1a1681ee4dfd256a0b Author: Tilman Schmidt Date: Mon Oct 2 02:17:37 2006 -0700 [PATCH] isdn4linux: Gigaset driver: fix __must_check warning This patch to the Siemens Gigaset driver fixes the compile warning "ignoring return value of 'class_device_create_file', declared with attribute warn_unused_result" appearing with CONFIG_ENABLE_MUST_CHECK=y in release 2.6.18-rc1-mm1. Signed-off-by: Tilman Schmidt Acked-by: Hansjoerg Lipp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bb31b9d5340ed3dfef45d322f59fcf18a0d598b Author: Ankita Garg Date: Mon Oct 2 02:17:36 2006 -0700 [PATCH] Linux Kernel Dump Test Module A simple module to test Linux Kernel Dump mechanism. This module uses jprobes to install/activate pre-defined crash points. At different crash points, various types of crashing scenarios are created like a BUG(), panic(), exception, recursive loop and stack overflow. The user can activate a crash point with specific type by providing parameters at the time of module insertion. Please see the file header for usage information. The module is based on the Linux Kernel Dump Test Tool by Fernando . This module could be merged with mainline. Jprobes is used here so that the context in which crash point is hit, could be maintained. This implements all the crash points as done by LKDTT except the one in the middle of tasklet_action(). Signed-off-by: Ankita Garg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99219a3fbc2dcf2eaa954f7b2ac27299fd7894cd Author: bibo,mao Date: Mon Oct 2 02:17:35 2006 -0700 [PATCH] kretprobe spinlock deadlock patch kprobe_flush_task() possibly calls kfree function during holding kretprobe_lock spinlock, if kfree function is probed by kretprobe that will incur spinlock deadlock. This patch moves kfree function out scope of kretprobe_lock. Signed-off-by: bibo, mao Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2aa85a0ccd90110e76c6375535adc3ae358f971 Author: bibo,mao Date: Mon Oct 2 02:17:34 2006 -0700 [PATCH] disallow kprobes on notifier_call_chain When kprobe is re-entered, the re-entered kprobe kernel path will will call atomic_notifier_call_chain function, if this function is kprobed that will incur numerous kprobe recursive fault. This patch disallows kprobes on atomic_notifier_call_chain function. Signed-off-by: bibo, mao Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62c27be0dd8144e11bd3ed054a0fb890579925f8 Author: bibo,mao Date: Mon Oct 2 02:17:33 2006 -0700 [PATCH] kprobe whitespace cleanup Whitespace is used to indent, this patch cleans up these sentences by kernel coding style. Signed-off-by: bibo, mao Signed-off-by: Ananth N Mavinakayanahalli Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09b18203d772db318ef92f6908c439ee5a35a4f9 Author: Ananth N Mavinakayanahalli Date: Mon Oct 2 02:17:32 2006 -0700 [PATCH] Update Documentation/kprobes.txt Documentation/kprobes.txt updated to reflect: o In-kernel symbol resolution o CONFIG_KALLSYMS dependency o Usage of JPROBE_ENTRY o Addition of regs_return_value() Also update the references list and usage examples to use correct module interfaces. Signed-off-by: Ananth N Mavinakayanahalli Acked-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3f827cb0fe0660c2eacea2c2f9bdb1f225ff768 Author: Ananth N Mavinakayanahalli Date: Mon Oct 2 02:17:31 2006 -0700 [PATCH] Add regs_return_value() helper Add the regs_return_value() macro to extract the return value in an architecture agnostic manner, given the pt_regs. Other architecture maintainers may want to add similar helpers. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Anil S Keshavamurthy Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 412998cf6bce78b8dc5f68660e09bf3b4fcbb210 Author: Ananth N Mavinakayanahalli Date: Mon Oct 2 02:17:31 2006 -0700 [PATCH] kprobes: handle symbol resolution when is specified kallsyms_lookup_name() allows for style specification for looking up symbol addresses. Handle the case where the user specifies on powerpc, given that 64-bit powerpc uses function descriptors. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a872d89baae821a0f6e2c1055d4b47650661137 Author: Ananth N Mavinakayanahalli Date: Mon Oct 2 02:17:30 2006 -0700 [PATCH] Kprobes: Make kprobe modules more portable In an effort to make kprobe modules more portable, here is a patch that: o Introduces the "symbol_name" field to struct kprobe. The symbol->address resolution now happens in the kernel in an architecture agnostic manner. 64-bit powerpc users no longer have to specify the ".symbols" o Introduces the "offset" field to struct kprobe to allow a user to specify an offset into a symbol. o The legacy mechanism of specifying the kprobe.addr is still supported. However, if both the kprobe.addr and kprobe.symbol_name are specified, probe registration fails with an -EINVAL. o The symbol resolution code uses kallsyms_lookup_name(). So CONFIG_KPROBES now depends on CONFIG_KALLSYMS o Apparantly kprobe modules were the only legitimate out-of-tree user of the kallsyms_lookup_name() EXPORT. Now that the symbol resolution happens in-kernel, remove the EXPORT as suggested by Christoph Hellwig o Modify tcp_probe.c that uses the kprobe interface so as to make it work on multiple platforms (in its earlier form, the code wouldn't work, say, on powerpc) Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 782237a2418e2561a87c86a4832726931adce737 Author: Cedric Le Goater Date: Mon Oct 2 02:17:28 2006 -0700 [PATCH] s390: update fs3270 to use a struct pid Replaces the pid_t value with a struct pid to avoid pid wrap around problems. Signed-off-by: Cedric Le Goater Cc: Martin Schwidefsky Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2425c08b37244005ff221efe4957d8aaff18609c Author: Eric W. Biederman Date: Mon Oct 2 02:17:28 2006 -0700 [PATCH] usb: fixup usb so it uses struct pid The problem with remembering a user space process by its pid is that it is possible that the process will exit, pid wrap around will occur. Converting to a struct pid avoid that problem, and paves the way for implementing a pid namespace. Also since usb is the only user of kill_proc_info_as_uid rename kill_proc_info_as_uid to kill_pid_info_as_uid and have the new version take a struct pid. Signed-off-by: Eric W. Biederman Acked-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43fa1adb9334bf4585cd53144eb5911488f85bc7 Author: Eric W. Biederman Date: Mon Oct 2 02:17:27 2006 -0700 [PATCH] file: Add locking to f_getown This has been needed for a long time, but now with the advent of a reference counted struct pid there are real consequences for getting this wrong. Someone I think it was Oleg Nesterov pointed out that this construct was missing locking, when I introduced struct pid. After taking time to review the locking construct already present I figured out which lock needs to be taken. The other paths that access f_owner.pid take either the f_owner read or the write lock. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a03fcb730b4fe7da14ca4405f23dbde717b1d2b9 Author: Cedric Le Goater Date: Mon Oct 2 02:17:26 2006 -0700 [PATCH] update mq_notify to use a struct pid Message queues can signal a process waiting for a message. This patch replaces the pid_t value with a struct pid to avoid pid wrap around problems. Signed-off-by: Cedric Le Goater Acked-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f40f50d3bb33b52dfd550ca80be7daaddad21883 Author: Eric W. Biederman Date: Mon Oct 2 02:17:25 2006 -0700 [PATCH] Use struct pspace in next_pidmap and find_ge_pid This updates my proc: readdir race fix (take 3) patch to account for the changes made by: Sukadev Bhattiprolu to introduce struct pspace. Signed-off-by: Eric W. Biederman Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fbc96486459324e182717b03c50c90c880be6ec Author: Sukadev Bhattiprolu Date: Mon Oct 2 02:17:24 2006 -0700 [PATCH] Define struct pspace Define a per-container pid space object. And create one instance of this object, init_pspace, to define the entire pid space. Subsequent patches will provide/use interfaces to create/destroy pid spaces. Its a subset/rework of Eric Biederman's patch http://lkml.org/lkml/2006/2/6/285 . Signed-off-by: Eric Biederman Signed-off-by: Sukadev Bhattiprolu Cc: Dave Hansen Cc: Serge Hallyn Cc: Cedric Le Goater Cc: Kirill Korotaev Cc: Andrey Savochkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa5a6662f93f52605b6c447ba6f7291e92f515c5 Author: Sukadev Bhattiprolu Date: Mon Oct 2 02:17:23 2006 -0700 [PATCH] Move pidmap to pspace.h Move struct pidmap and PIDMAP_ENTRIES to a new file, include/linux/pspace.h where it will be used in subsequent patches to define pid spaces. Its a subset of Eric Biederman's patch http://lkml.org/lkml/2006/2/6/285 [akpm@osdl.org: cleanups] Signed-off-by: Eric W. Biederman Signed-off-by: Sukadev Bhattiprolu Cc: Dave Hansen Cc: Serge Hallyn Cc: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d387cae075b0aec479adbdfb71df39f7de8e9adb Author: Oleg Nesterov Date: Mon Oct 2 02:17:22 2006 -0700 [PATCH] pid: simplify pid iterators I think it is hardly possible to read the current do_each_task_pid(). The new version is much simpler and makes the code smaller. Only the do_each_task_pid change is tested, the do_each_pid_task isn't. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c88be3eb2e01bbb21c9ccdc3805f0d3546c1898c Author: Eric W. Biederman Date: Mon Oct 2 02:17:21 2006 -0700 [PATCH] pids coding style use struct pidmap in next_pidmap Use struct pidmap instead of pidmap_t. This updates my proc: readdir race fix (take 3) patch to account for the changes made by: Sukadev Bhattiprolu to kill pidmap_t. Signed-off-by: Eric W. Biederman Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1f3b84557774a46af68747c92d8f36382027ae Author: Sukadev Bhattiprolu Date: Mon Oct 2 02:17:20 2006 -0700 [PATCH] pids: coding style: use struct pidmap Use struct pidmap instead of pidmap_t. Its a subset of Eric Biederman's patch http://lkml.org/lkml/2006/2/6/271. Signed-off-by: Eric W. Biederman Signed-off-by: Sukadev Bhattiprolu Cc: Dave Hansen Cc: Serge Hallyn Cc: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b68e31d0ebbcc909d1941f9f230c9d062a3a13d3 Author: Jeff Dike Date: Mon Oct 2 02:17:18 2006 -0700 [PATCH] const struct tty_operations As part of an SMP cleanliness pass over UML, I consted a bunch of structures in order to not have to document their locking. One of these structures was a struct tty_operations. In order to const it in UML without introducing compiler complaints, the declaration of tty_set_operations needs to be changed, and then all of its callers need to be fixed. This patch declares all struct tty_operations in the tree as const. In all cases, they are static and used only as input to tty_set_operations. As an extra check, I ran an i386 allyesconfig build which produced no extra warnings. 53 drivers are affected. I checked the history of a bunch of them, and in most cases, there have been only a handful of maintenance changes in the last six months. serial_core.c was the busiest one that I looked at. Signed-off-by: Jeff Dike Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed97bd37efd8ff7398d3a7eedf4bcbf245f5dad3 Author: Andreas Mohr Date: Mon Oct 2 02:17:17 2006 -0700 [PATCH] fs/inode.c tweaks Only touch inode's i_mtime and i_ctime to make them equal to "now" in case they aren't yet (don't just update timestamp unconditionally). Uninline the hash function to save 259 Bytes. This tiny inode change which may improve cache behaviour also shaves off 8 Bytes from file_update_time() on i386. Included a tiny codestyle cleanup, too. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07acaf28d21e710bcf1cec91c0cfdb1a7b5e3d65 Author: Alexey Dobriyan Date: Mon Oct 2 02:17:16 2006 -0700 [PATCH] Remove NULL check in register_nls() Everybody passes valid pointer there. Signed-off-by: Alexey Dobriyan Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 609d7fa9565c754428d2520cac2accc9052e1245 Author: Eric W. Biederman Date: Mon Oct 2 02:17:15 2006 -0700 [PATCH] file: modify struct fown_struct to use a struct pid File handles can be requested to send sigio and sigurg to processes. By tracking the destination processes using struct pid instead of pid_t we make the interface safe from all potential pid wrap around problems. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bde0d2c98bcfc9acc83ac79c33a6ac1335b95a92 Author: Eric W. Biederman Date: Mon Oct 2 02:17:14 2006 -0700 [PATCH] vt: Make vt_pid a struct pid (making it pid wrap around safe). I took a good hard look at the locking and it appears the locking on vt_pid is the console semaphore. Every modified path is called under the console semaphore except reset_vc when it is called from fn_SAK or do_SAK both of which appear to be in interrupt context. In addition I need to be careful because in the presence of an oops the console_sem may be arbitrarily dropped. Which leads me to conclude the current locking is inadequate for my needs. Given the weird cases we could hit because of oops printing instead of introducing an extra spin lock to protect the data and keep the pid to signal and the signal to send in sync, I have opted to use xchg on just the struct pid * pointer instead. Due to console_sem we will stay in sync between vt_pid and vt_mode except for a small window during a SAK, or oops handling. SAK handling should kill any user space process that care, and oops handling we are broken anyway. Besides the worst that can happen is that I try to send the wrong signal. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81af8d67d4fc35b1ee6e0feb1f1b34b3a33eeb44 Author: Eric W. Biederman Date: Mon Oct 2 02:17:13 2006 -0700 [PATCH] vt: rework the console spawning variables This is such a rare path it took me a while to figure out how to test this after soring out the locking. This patch does several things. - The variables used are moved into a structure and declared in vt_kern.h - A spinlock is added so we don't have SMP races updating the values. - Instead of raw pid_t value a struct_pid is used to guard against pid wrap around issues, if the daemon to spawn a new console dies. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5feb8f5f8403d8874a04aac443692dfe83bd63d2 Author: Eric W. Biederman Date: Mon Oct 2 02:17:12 2006 -0700 [PATCH] pid: implement pid_nr As we stop storing pid_t's and move to storing struct pid *. We need a way to get the pid_t from the struct pid to report to user space what we have stored. Having a clean well defined way to do this is especially important as we move to multiple pid spaces as may need to report a different value to the caller depending on which pid space the caller is in. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbf73147e2d46611fbdcbc126f887c614c32350b Author: Eric W. Biederman Date: Mon Oct 2 02:17:11 2006 -0700 [PATCH] pid: export the symbols needed to use struct pid * pids aren't something that drivers should care about. However there are a lot of helper layers in the kernel that do care, and are built as modules. Before I can convert them to using struct pid instead of pid_t I need to export the appropriate symbols so they can continue to be built. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4b92fc112f7be5cce308128236ff75cc98535c3 Author: Eric W. Biederman Date: Mon Oct 2 02:17:10 2006 -0700 [PATCH] pid: implement signal functions that take a struct pid * Currently the signal functions all either take a task or a pid_t argument. This patch implements variants that take a struct pid *. After all of the users have been update it is my intention to remove the variants that take a pid_t as using pid_t can be more work (an extra hash table lookup) and difficult to get right in the presence of multiple pid namespaces. There are two kinds of functions introduced in this patch. The are the general use functions kill_pgrp and kill_pid which take a priv argument that is ultimately used to create the appropriate siginfo information, Then there are _kill_pgrp_info, kill_pgrp_info, kill_pid_info the internal implementation helpers that take an explicit siginfo. The distinction is made because filling out an explcit siginfo is tricky, and will be even more tricky when pid namespaces are introduced. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558cb325485aaf655130f140e8ddd25392f6c972 Author: Eric W. Biederman Date: Mon Oct 2 02:17:09 2006 -0700 [PATCH] pid: add do_each_pid_task To avoid pid rollover confusion the kernel needs to work with struct pid * instead of pid_t. Currently there is not an iterator that walks through all of the tasks of a given pid type starting with a struct pid. This prevents us replacing some pid_t instances with struct pid. So this patch adds do_each_pid_task which walks through the set of task for a given pid type starting with a struct pid. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c935f47c03399c78e64c71b757eb36fa917ff6 Author: Eric W. Biederman Date: Mon Oct 2 02:17:09 2006 -0700 [PATCH] pid: implement access helpers for a tacks various process groups In the last round of cleaning up the pid hash table a more general struct pid was introduced, that can be referenced counted. With the more general struct pid most if not all places where we store a pid_t we can now store a struct pid * and remove the need for a hash table lookup, and avoid any possible problems with pid roll over. Looking forward to the pid namespaces struct pid * gives us an absolute form a pid so we can compare and use them without caring which pid namespace we are in. This patchset introduces the infrastructure needed to use struct pid instead of pid_t, and then it goes on to convert two different kernel users that currently store a pid_t value. There are a lot more places to go but this is enough to get the basic idea. Before we can merge a pid namespace patch all of the kernel pid_t users need to be examined. Those that deal with user space processes need to be converted to using a struct pid *. Those that deal with kernel processes need to converted to using the kthread api. A rare few that only use their current processes pid values get to be left alone. This patch: task_session returns the struct pid of a tasks session. task_pgrp returns the struct pid of a tasks process group. task_tgid returns the struct pid of a tasks thread group. task_pid returns the struct pid of a tasks process id. These can be used to avoid unnecessary hash table lookups, and to implement safe pid comparisions in the face of a pid namespace. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6c7a1f34e92b0b561024ead9fa70623683025e4 Author: Eric W. Biederman Date: Mon Oct 2 02:17:07 2006 -0700 [PATCH] proc: give the root directory a task Helper functions in base.c like proc_pident_readdir and proc_pident_lookup assume the directories have an associated task, and cannot currently be used on the /proc root directory because it does not have such a task. This small changes allows for base.c to be simplified and later when multiple pid spaces are introduced it makes getting the needed context information trivial. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20cdc894c45d2e4ab0c69e95a56b7c5ed36ae0dd Author: Eric W. Biederman Date: Mon Oct 2 02:17:07 2006 -0700 [PATCH] proc: modify proc_pident_lookup to be completely table driven Currently proc_pident_lookup gets the names and types from a table and then has a huge switch statement to get the inode and file operations it needs. That is silly and is becoming increasingly hard to maintain so I just put all of the information in the table. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28a6d67179da6964d1640d379c5e5d4f46dd0042 Author: Eric W. Biederman Date: Mon Oct 2 02:17:05 2006 -0700 [PATCH] proc: reorder the functions in base.c There were enough changes in my last round of cleaning up proc I had to break up the patch series into smaller chunks, and my last chunk never got resent. This patchset gives proc dynamic inode numbers (the static inode numbers were a pain to maintain and prevent all kinds of things), and removes the horrible switch statements that had to be kept in sync with everything else. Being fully table driver takes us 90% of the way of being able to register new process specific attributes in proc. This patch: Group the functions by what they implement instead of by type of operation. As it existed base.c was quickly approaching the point where it could not be followed. No functionality or code changes asside from adding/removing forward declartions are implemented in this patch. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0804ef4b0de7121261f77c565b20a11ac694e877 Author: Eric W. Biederman Date: Mon Oct 2 02:17:04 2006 -0700 [PATCH] proc: readdir race fix (take 3) The problem: An opendir, readdir, closedir sequence can fail to report process ids that are continually in use throughout the sequence of system calls. For this race to trigger the process that proc_pid_readdir stops at must exit before readdir is called again. This can cause ps to fail to report processes, and it is in violation of posix guarantees and normal application expectations with respect to readdir. Currently there is no way to work around this problem in user space short of providing a gargantuan buffer to user space so the directory read all happens in on system call. This patch implements the normal directory semantics for proc, that guarantee that a directory entry that is neither created nor destroyed while reading the directory entry will be returned. For directory that are either created or destroyed during the readdir you may or may not see them. Furthermore you may seek to a directory offset you have previously seen. These are the guarantee that ext[23] provides and that posix requires, and more importantly that user space expects. Plus it is a simple semantic to implement reliable service. It is just a matter of calling readdir a second time if you are wondering if something new has show up. These better semantics are implemented by scanning through the pids in numerical order and by making the file offset a pid plus a fixed offset. The pid scan happens on the pid bitmap, which when you look at it is remarkably efficient for a brute force algorithm. Given that a typical cache line is 64 bytes and thus covers space for 64*8 == 200 pids. There are only 40 cache lines for the entire 32K pid space. A typical system will have 100 pids or more so this is actually fewer cache lines we have to look at to scan a linked list, and the worst case of having to scan the entire pid bitmap is pretty reasonable. If we need something more efficient we can go to a more efficient data structure for indexing the pids, but for now what we have should be sufficient. In addition this takes no additional locks and is actually less code than what we are doing now. Also another very subtle bug in this area has been fixed. It is possible to catch a task in the middle of de_thread where a thread is assuming the thread of it's thread group leader. This patch carefully handles that case so if we hit it we don't fail to return the pid, that is undergoing the de_thread dance. Thanks to KAMEZAWA Hiroyuki for providing the first fix, pointing this out and working on it. [oleg@tv-sign.ru: fix it] Signed-off-by: Eric W. Biederman Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Oleg Nesterov Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bc2d61a9638dab670d8361e928d1a5a291173ef Author: Randy Dunlap Date: Mon Oct 2 02:17:02 2006 -0700 [PATCH] list module taint flags in Oops/panic When listing loaded modules during an oops or panic, also list each module's Tainted flags if non-zero (P: Proprietary or F: Forced load only). If a module is did not taint the kernel, it is just listed like usbcore but if it did taint the kernel, it is listed like wizmodem(PF) Example: [ 3260.121718] Unable to handle kernel NULL pointer dereference at 0000000000000000 RIP: [ 3260.121729] [] :dump_test:proc_dump_test+0x99/0xc8 [ 3260.121742] PGD fe8d067 PUD 264a6067 PMD 0 [ 3260.121748] Oops: 0002 [1] SMP [ 3260.121753] CPU 1 [ 3260.121756] Modules linked in: dump_test(P) snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device ide_cd generic ohci1394 snd_hda_intel snd_hda_codec snd_pcm snd_timer snd ieee1394 snd_page_alloc piix ide_core arcmsr aic79xx scsi_transport_spi usblp [ 3260.121785] Pid: 5556, comm: bash Tainted: P 2.6.18-git10 #1 [Alternatively, I can look into listing tainted flags with 'lsmod', but that won't help in oopsen/panics so much.] [akpm@osdl.org: cleanup] Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a58cbd7c249f3079dd62d6391a33b9f43f2bfbef Author: Dean Nelson Date: Mon Oct 2 02:17:01 2006 -0700 [PATCH] make genpool allocator adhere to kernel-doc standards The exported kernel interfaces of genpool allocator need to adhere to the requirements of kernel-doc. Signed-off-by: Dean Nelson Cc: Steve Wise Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 322acc96d4bd3debea11cd0160b18bd5d7ff0d73 Author: Steve Wise Date: Mon Oct 2 02:17:00 2006 -0700 [PATCH] LIB: add gen_pool_destroy() Modules using the genpool allocator need to be able to destroy the data structure when unloading. Signed-off-by: Steve Wise Cc: Randy Dunlap Cc: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482 Author: Dave Kleikamp Date: Mon Oct 2 09:55:27 2006 -0500 JFS: White space cleanup Removed trailing spaces & tabs, and spaces preceding tabs. Also a couple very minor comment cleanups. Signed-off-by: Dave Kleikamp (cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit) commit 087387f90f577f5a0ab68d33ef326c9bb6d80dda Author: Akinobu Mita Date: Thu Sep 14 09:22:38 2006 -0500 [PATCH] JFS: return correct error when i-node allocation failed I have seen confusing behavior on JFS when I injected many intentional slab allocation errors. The cp command failed with no disk space error with enough disk space. This patch makes: - change the return value in case slab allocation failures happen from -ENOSPC to -ENOMEM - ialloc() return error code so that the caller can know the reason of failures Signed-off-by: Akinobu Mita Signed-off-by: Dave Kleikamp (cherry picked from 2b46f77976f798f3fe800809a1d0ed38763c71c8 commit) commit 2a6968a9784551c216f9379a728d4104dbad98a8 Author: Tony Breeds Date: Mon Sep 11 08:19:19 2006 -0500 JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog() Signed-off-by: Tony Breeds Signed-off-by: Dave Kleikamp (cherry picked from bdc3d9e5af7d9c105be734dd7b5c3f1d9425a15a commit) commit d00223f1693173c7b51f867dd52049955a92d0ed Author: Steven Whitehouse Date: Mon Oct 2 10:28:05 2006 -0400 [GFS2] Fix code style/indent in ops_file.c Fix a couple of minor issues. Signed-off-by: Steven Whitehouse commit 930cc237d67dc62464fe71529631d16f51d7aee3 Author: Andrew Morton Date: Sat Sep 30 23:38:51 2006 -0700 [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix Fix GFS for streamline-generic_file_-interfaces-and-filemap.patch Signed-off-by: Andrew Morton Signed-off-by: Steven Whitehouse commit 9c9eb21eee1790804ce407fd820f65be0b4fdd03 Author: Badari Pulavarty Date: Sat Sep 30 23:38:50 2006 -0700 [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits) This patch removes readv() and writev() methods and replaces them with aio_read()/aio_write() methods. Signed-off-by: Badari Pulavarty Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Steven Whitehouse commit d14b272bc63f35a8f20b4b1df16c080b8d24f8f1 Author: Richard Purdie Date: Wed Sep 20 22:54:21 2006 +0100 [ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support Add the ability to have pxafb use only certain fixed video modes (selected on a per platform basis). This is useful on production hardware such as the Zaurus cxx00 models where the valid modes are known in advance and any other modes could result in hardware damage. Following this, add support for the cxx00 QVGA mode. Mode information is passed to the lcd_power call to allowing the panel drivers to configure the display hardware accordingly (corgi_lcd already contains the functionality for the cxx00 panel). This mirrors the setup already used by w100fb. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 5e980823581682d1566e7b5089cf827ddd5f3c94 Author: Li Yang Date: Fri Sep 29 18:15:52 2006 +0800 [POWERPC] Fix rheap alignment problem Honor alignment parameter in the rheap allocator. This is needed by qe_lib. Remove compile warning. Signed-off-by: Pantelis Antoniou Signed-off-by: Li Yang Acked-by: Kumar Galak Signed-off-by: Paul Mackerras commit 07bd1c4a82d1787d6acc32b5e3873cca24f39769 Author: David Woodhouse Date: Wed Sep 27 08:18:55 2006 +0100 [POWERPC] Use check_legacy_ioport() for ISAPnP Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 61e37ca22b717a9edc3e5e7c7f3603fad464c76d Author: Olaf Hering Date: Tue Sep 26 22:28:36 2006 +0200 [POWERPC] Avoid NULL pointer in gpio1_interrupt gpio1_interrupt() may dereference a NULL pointer if ioremap() fails. But, maybe no gpio interrupt happens in the first place? Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 76a5027c374a638e55de5d8c4485ea0201254870 Author: Amol Lad Date: Mon Oct 2 09:48:23 2006 +0100 [MTD] Cleanup of 'ioremap balanced with iounmap for drivers/mtd subsystem' Updated version of patch, in response to comments from Francois Romieu Remove gratuitous casts from iounmap and initialisation of variables. Signed-off-by: Amol Lad Signed-off-by: David Woodhouse commit 553a8012088b3452c7d66ff60d2d06ad0c9bea00 Author: Frederik Deweerdt Date: Mon Oct 2 09:42:25 2006 +0100 [MTD] fix nftl_write warning Building 2.6.18-mm2 issues the following warning if CONFIG_NFTL_RW is not set: CC [M] drivers/mtd/nftlcore.o drivers/mtd/nftlcore.c:183: warning: 'nftl_write' defined but not used The following patch only compiles nftl_write if CONFIG_NFTL_RW is set. Signed-off-by: Frederik Deweerdt Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit a8ed4f7ec3aa472134d7de6176f823b2667e450b Author: Kim Phillips Date: Tue Sep 26 17:46:51 2006 -0500 [POWERPC] Enable generic rtc hook for the MPC8349 mITX Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 7a69af63e788a324d162201a0b23df41bcf158dd Author: Kim Phillips Date: Tue Sep 26 17:46:37 2006 -0500 [POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class Add powerpc get/set_rtc_time interface to new generic rtc class. This abstracts rtc chip specific code from the platform code for rtc-over-i2c platforms. Specific RTC chip support is now configured under Device Drivers -> Real Time Clock. Setting time of day from the RTC on startup is also configurable. this time without the potentially platform breaking initcall. Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 1a70d6529ad9f5978af846440f8a809784d6e813 Author: Steve French Date: Mon Oct 2 05:59:18 2006 +0000 [CIFS] Fix compiler warning with previous patch Signed-off-by: Steve French commit 947a50679570ef7a66e3e3107e95943a1cb14d08 Author: Steve French Date: Mon Oct 2 05:55:25 2006 +0000 [CIFS] Fix typo Signed-off-by: Steve French commit b815f1e559e7cbdf3e561cf0c7cffc4a4a57a013 Author: Steve French Date: Mon Oct 2 05:53:29 2006 +0000 [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about not setting time on close Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit bb0885900de49b5822d7e8c91c1adf9a0fcc228b Author: Ashutosh Naik Date: Sun Oct 1 22:07:14 2006 -0400 Input: wistron - add support for Acer TravelMate 2424NWXCi The key mappings are the same as the older Acer TravelMate 240. Signed-off-by: Ashutosh Naik Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit cde45f19ca0d2ff1ede01528a7629388d4139309 Author: Reiner Herrmann Date: Sun Oct 1 21:58:51 2006 -0400 Input: wistron - fix setting up special buttons If either wifi or bluetooth button has been detected, the code would break off the loop. But there are laptops that have both types of buttons, so the loop has to continue checking. Signed-off-by: Reiner Herrmann Signed-off-by: Dmitry Torokhov commit 04b314b2c3732bb5aa752fdbb3076de16decdab6 Author: Yoichi Yuasa Date: Sun Oct 1 19:47:08 2006 +0900 [MIPS] Remove unused galileo-boars header files Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit b772da30b4b22230c214f37429edcd7ddbf641e1 Author: Yoichi Yuasa Date: Sun Oct 1 19:43:27 2006 +0900 [MIPS] Rename SERIAL_PORT_DEFNS for EV64120 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 998ec2901aea9f412d2dc3e29a3c20f377793916 Author: Yoichi Yuasa Date: Sun Oct 1 19:35:28 2006 +0900 [MIPS] Add UART IRQ number for EV64120 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit b00f3774f2e073d399ffbd0475337466938e9273 Author: Yoichi Yuasa Date: Fri Sep 29 18:27:07 2006 +0900 [MIPS] Remove excite_flash.c excite_flashtest.c is unused. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit aa400804e0181d9c451b3b4ddba25f0a088e8c13 Author: Yoichi Yuasa Date: Fri Sep 29 18:17:51 2006 +0900 [MIPS] Update i8259 resources. Updated i8259 resources to same as i386. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 1924600cdb3143cdcc32b6fa43325739503659b9 Author: Atsushi Nemoto Date: Fri Sep 29 18:02:51 2006 +0900 [MIPS] Make unwind_stack() can dig into interrupted context If the PC was ret_from_irq or ret_from_exception, there will be no more normal stackframe. Instead of stopping the unwinding, use PC and RA saved by an exception handler to continue unwinding into the interrupted context. This also simplifies the CONFIG_STACKTRACE code. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 23126692e30ec22760e0ef932c3c2fff00d440bb Author: Atsushi Nemoto Date: Thu Sep 28 19:15:33 2006 +0900 [MIPS] Stacktrace build-fix and improvement Fix build error due to stacktrace API change. Now save_stack_trace() tries to save all kernel context, including interrupts and exception. Also some asm code are changed a bit so that we can detect the end of current context easily. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit c8cc9618c55a341dda39357cce5ff39f7ad17132 Author: Aurelien Jarno Date: Wed Sep 27 23:07:25 2006 +0200 [MIPS] QEMU: Add support for little endian mips This very small patch adds support for little endian on the virtual QEMU mips platform. The status of this platform is the same as the big endian one, ie it is possible to boot a system with init=/bin/sh. Signed-off-by: Aurelien Jarno Signed-off-by: Ralf Baechle commit c59a0f15be6e586aa0fe1fb5c7f740005c36ec56 Author: Atsushi Nemoto Date: Sat Sep 2 00:43:07 2006 +0900 [MIPS] Remove __flush_icache_page __flash_icache_page is unused, so kill it. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1a6183f2e6f0fa2d1898f0228559df15a89a1ffe Author: Atsushi Nemoto Date: Tue Sep 26 23:44:16 2006 +0900 [MIPS] lockdep: update defconfigs Add those lines to all defconfigs. CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y This is a patch againt linux-mips.org git tree. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1df0f0ff7e56f6dcb1351b9490d55ebf91ff4bd8 Author: Atsushi Nemoto Date: Tue Sep 26 23:44:01 2006 +0900 [MIPS] lockdep: Add STACKTRACE_SUPPORT and enable LOCKDEP_SUPPORT Implement stacktrace interface by using unwind_stack() and enable lockdep support in Kconfig. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit eae6c0da9df81300895949897c0451423340ac40 Author: Atsushi Nemoto Date: Tue Sep 26 23:43:40 2006 +0900 [MIPS] lockdep: fix TRACE_IRQFLAGS_SUPPORT In handle_sys and its variants, we must reload some registers which might be clobbered by trace_hardirqs_on(). Also we must make sure trace_hardirqs_on() called in kernel level (not exception level). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 75fde2eddcfcd1dcc87a72dc6cd3c859420b6148 Author: Matthew Garrett Date: Sun Oct 1 19:27:38 2006 +0100 [SERIAL] add PNP IDs for FPI based touchscreens The Compaq TC1000 and Fujitsu Stylistic range of tablet machines use touchscreens from FPI. These are implemented as serial interfaces, generally exposed in the ACPIPNP information on the system. This patch adds them to the 8250_pnp driver tables, avoiding the need to mess around with setserial to set them up. I haven't been able to confirm what FUJ02B5, FUJ02BA and FUJ02BB are. FUJ02B1 refers to the controller for the system hotkeys. FUJ02BC appears to be the last in the range - after this, they moved to Wacom-based systems. Signed-off-by: Matthew Garrett Signed-off-by: Russell King commit d834c16516d1ebec4766fc58c059bf01311e6045 Author: Linus Torvalds Date: Sun Oct 1 13:17:44 2006 -0700 pccard_store_cis: fix wrong error handling The test for the error from pcmcia_replace_cis() was incorrect, and would always trigger (because if an error didn't happen, the "ret" value would not be zero, it would be the passed-in count). Reported and debugged by Fabrice Bellet Rather than just fix the single broken test, make the code in question use an understandable code-sequence instead, fixing the whole function to be more readable. Signed-off-by: Linus Torvalds commit f70cfa9bef432d7aeb4e35c093ac27fd6f071d7e Author: Mike Christie Date: Sat Sep 30 20:42:31 2006 -0400 [SCSI] scsi_devinfo: scsi2 HP and Hitachi entries When SCSI-2 they can support luns past 7 and sparse luns. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 12427d99489966185dc12a0b6f725d682a3277ca Author: Mike Christie Date: Sat Sep 30 20:42:30 2006 -0400 [SCSI] scsi_devinfo: add nec iStorage support the report luns opcode . Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5f619c5ba509994c9203bfd18f5246b4457e2c22 Author: Mike Christie Date: Sat Sep 30 20:42:29 2006 -0400 [SCSI] scsi_devinfo: add Tornado This is from RHEL4. I do not have any info from our bugzilla. All I could find was something like this thread http://lkml.org/lkml/2005/1/7/346 Report lun for linux does not work. It may be our lun format code or it may be the device. It is probably not worth it to add anything special for this device, so the patch just adds BLIST_NOREPORTLUN. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 3441afc672bc9bfc137ae7717ac1db4b9c28cc8b Author: Mike Christie Date: Sat Sep 30 20:42:28 2006 -0400 [SCSI] scsi_devinfo: add EMC Invista This is from RHEL4. This box can support scsi2 and can also support BLIST_SPARSELUN | BLIST_LARGELUN. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 6470f2ba641cf93d357854cdc63a65350352bb97 Author: Arne Redlich Date: Sat Sep 30 15:49:40 2006 +0200 [SCSI] trivial scsi_execute_async fix In scsi_execute_async()'s error path, a struct scsi_io_context allocated with kmem_cache_alloc() is kfree()'d. Obviously kmem_cache_free() should be used instead. Signed-off-by: Arne Redlich Signed-off-by: James Bottomley commit fb4f66be59f3dcc66fda2e681f1fc77b5cc4508d Author: Ed Lin Date: Wed Sep 27 19:23:41 2006 +0800 [SCSI] stex: add new device (id 0x8650) support A new device (id 0x8650, nickname 'yosemite') support is added. It's basically the same, except for following items: - mapping of id and lun by firmware - special handling for some commands in interrupt routine - change of internal copy function for these special commands - different reset handling code - different shutdown notification command Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit f903d7b7a80b7c3103335d506533790a322da87b Author: Ed Lin Date: Wed Sep 27 19:23:33 2006 +0800 [SCSI] stex: cancel unused field in struct req_msg The payload_sz field in struct req_msg is not big enough to indicate the size of req_msg, as its type is u8. It is confirmed that this field is not used by firmware, so cancel it here. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit 80c6e3c0b5eb855b69270658318f5ccf04d7b1ff Author: Eric Sesterhenn Date: Tue Sep 26 13:22:13 2006 +0200 [SCSI] fix scsi_device_types overrun in scsi.c this overrun was spotted by coverity (cid #1403). If type == ARRAY_SIZE(scsi_device_types), we are off by one. Signed-off-by: Eric Sesterhenn Signed-off-by: James Bottomley commit 7b75b990e3cb33fd529640d589e77950e72a607c Author: Denis Vlasenko Date: Mon Sep 25 16:57:42 2006 -0700 [SCSI] aic7xxx: fix byte I/O order in ahd_inw Comment says "Read high byte first as some registers increment..." but code doesn't guarantee that, I think: return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port)); Compiler can reorder it. Make the order explicit. Signed-off-by: Denis Vlasenko Signed-off-by: Andrew Morton Fixed rejections and added aic7xxx code Signed-off-by: James Bottomley commit 203cf2fc13a5db1fb202c294948fa9cb43bf69fa Author: Steve French Date: Sun Oct 1 19:59:41 2006 +0000 [CIFS] Fix readdir of large directories for backlevel servers (were not setting all of resume key) Signed-off-by: Steve French commit d8d64d6b29d331f1217c77999f5104fe68b0ef3a Author: Simon Tatham Date: Mon Sep 25 16:51:28 2006 -0700 [SERIAL] Magic SysRq SAK does nothing on serial consoles Make sysrq-K work on serial console by passing in the tty. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit e480af09c49736848f749a43dff2c902104f6691 Author: Dave Jones Date: Mon Sep 25 16:51:26 2006 -0700 [SERIAL] tickle NMI watchdog on serial output. Serial is _slow_ sometimes. So slow, that the NMI watchdog kicks in. NMI Watchdog detected LOCKUP on CPU2CPU 2 Modules linked in: loop usb_storage md5 ipv6 parport_pc lp parport autofs4 i2c_dev i2c_core rfcomm l2cap bluetooth sunrpc pcdPid: 3138, comm: gpm Not tainted 2.6.11-1.1290_FC4smp RIP: 0010:[] {serial_in+106} RSP: 0018:ffff81003afc3d50 EFLAGS: 00000002 RAX: 0000000000000020 RBX: 0000000000000020 RCX: 0000000000000000 RDX: 00000000000003fd RSI: 0000000000000005 RDI: ffffffff804dcd60 RBP: 00000000000024fc R08: 000000000000000a R09: 0000000000000033 R10: ffff81001beb7c20 R11: 0000000000000020 R12: ffffffff804dcd60 R13: ffffffff804ade76 R14: 000000000000002b R15: 000000000000002c FS: 00002aaaaaac4920(0000) GS:ffffffff804fca00(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00002aaaaabcb000 CR3: 000000003c0d0000 CR4: 00000000000006e0 Process gpm (pid: 3138, threadinfo ffff81003afc2000, task ffff81003eb63780) Stack: ffffffff80275f2e 0000000000000000 ffffffff80448380 0000000000007d6b 000000000000002c fffffffffffffbbf 0000000000000292 0000000000008000 ffffffff80138e8c 0000000000007d97 Call Trace:{serial8250_console_write+270} {__call_console_drivers+76} {release_console_sem+315} {con_open+149} {tty_open+537} {chrdev_open+387} {dentry_open+260} {filp_open+68} {get_unused_fd+227} {sys_open+76} {tracesys+209} Code: 0f b6 c0 c3 66 90 41 57 49 89 f7 41 56 41 be 00 01 00 00 41 console shuts up ... I initially did the patch below a year ago for the Fedora kernel, and have been keeping it up to date since. I recently got the same thing happening on a vanilla kernel, so figured it was time to repost this. Signed-off-by: Dave Jones Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 4e9011d50d77ce7d234272e203235d8ecffd61a1 Author: Andrew Morton Date: Sun Oct 1 02:22:41 2006 -0700 [PATCH] rtc-sysfs fix It's not clear how this thinko got through.. Cc: Olaf Hering Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a292308255ad381dd74541be468c4aec240a615 Author: Jeff Garzik Date: Sun Oct 1 12:16:00 2006 -0400 [MTD] fix printk warning gcc spits out this warning: drivers/mtd/mtd_blkdevs.c: In function ‘do_blktrans_request’: drivers/mtd/mtd_blkdevs.c:72: warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type ‘unsigned int’ This could be fixed any number of ways, including use of BUG(). rq_data_dir() only returns 0 or 1, so this entire case is superfluous. I did the most simple fix. Signed-off-by: Jeff Garzik Signed-off-by: David Woodhouse commit a6b93a908508810c5d51dd9b390283345af6f2d9 Author: Russell King Date: Sun Oct 1 17:17:40 2006 +0100 [SERIAL] Fix oops when removing suspended serial port A serial card might have been removed when the system is resumed. This results in a suspended port being shut down, which results in the ports shutdown method being called twice in a row. This causes BUGs. Avoid this by tracking the suspended state separately from the initialised state. Signed-off-by: Russell King commit fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd Author: Russell King Date: Sun Oct 1 17:14:07 2006 +0100 [SERIAL] Fix resume handling bug Unfortunately, pcmcia_dev_present() returns false when a device is suspended, so checking this on resume does not work too well. Omit this test. Signed-off-by: Russell King commit bcf5111a58c7db968c3fb9cd77e340a5e076f549 Author: Russell King Date: Wed Aug 30 10:27:15 2006 +0100 [SERIAL] Remove wrong asm/serial.h inclusions asm/serial.h is supposed to contain the definitions for the architecture specific 8250 ports for the 8250 driver. It may also define BASE_BAUD, but this is the base baud for the architecture specific ports _only_. Therefore, nothing other than the 8250 driver should be including this header file. In order to move towards this goal, here is a patch which removes some of the more obvious incorrect includes of the file. Acked-by: Paul Fulghum Acked-by: Tony Luck Acked-by: Ralf Baechle Acked-by: David Howells Signed-off-by: Russell King commit 1d5e799663046917a0eb085e716d818af20050b2 Author: Alexey Dobriyan Date: Mon Sep 25 16:51:27 2006 -0700 [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 255341c6fded73204b1ee6feb5fe16e125b27f62 Author: Jonathan McDowell Date: Mon Aug 14 23:05:32 2006 -0700 [SERIAL] OMAP1510 serial fix for 115200 baud The patch below is necessary for 115200 baud on an OMAP1510 internal UART. It's been in the linux-omap tree for some time and with it applied to a vanilla Linus git tree the serial console on the Amstrad Delta (which is OMAP1510 based and whose initial bootloader runs at 115200) works fine (it doesn't without it). Signed-off-by: Jonathan McDowell Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 80e3c2b659515ef236f33f691ff5b22ae90ae8e4 Author: Ram Gupta Date: Mon Aug 14 23:05:29 2006 -0700 [SERIAL] returning proper error from serial core driver Fix the issue of returning 0 even in case of error from uart_set_info function. Now it returns the error EBUSY when it can not set new port. Signed-off-by: Ram Gupta Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 6c6a2334a1e8af7c3eaab992732825fa9ade77cf Author: Sergei Shtylyov Date: Mon Sep 4 00:04:20 2006 +0400 [SERIAL] Make uart_line_info() correctly tell MMIO from I/O port /proc/tty/driver/serial incorrectly claims that UARTs having iotype of UPIO_MEM32, UPIO_AU, or UPIO_TSI are I/O mapped. Signed-off-by: Sergei Shtylyov Signed-off-by: Russell King commit a4b775735c0dff5a8d59a877ff0033526b469116 Author: Sergei Shtylyov Date: Mon Sep 11 20:32:58 2006 +0400 [SERIAL] suspend/resume handlers don't have level arg anymore 8250.c and serial_txx9.c port suspend/resume handler still have this obsolete argument documented... Signed-off-by: Sergei Shtylyov Signed-off-by: Russell King commit 0b30d668a20acd2ffd4268f7bbe799b0dd73d5cf Author: Sergei Shtylyov Date: Sat Sep 9 22:23:56 2006 +0400 [SERIAL] 8250 resourse management fixes I think register ranges obviously need to be claimed/released for all UARTs including those with UPIO_MEM32 and UPIO_TSI iotype. Also, serial8250_request_rsa_resources() returns false positives with UPIO_MEM32, UPIO_AU, and UPIO_TSI iotype -- I don't think this makes any sense. Signed-off-by: Sergei Shtylyov Signed-off-by: Russell King commit f3d106881b06a423455f95916e666acebe6503f2 Author: Russell King Date: Sat Sep 16 23:07:46 2006 +0100 [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 card Mauro Ziliani reports that this card has a higher clock rate. Rather than tweak the 8250 driver to handle this, add a quirk to pass the correct clock rate to the driver. Signed-off-by: Russell King commit 20f130495c07cd01fb423c3dec7f045038118dec Author: Russell King Date: Sat Sep 16 23:04:37 2006 +0100 [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirk According to the existing code, Nokia only make single-port cards, but are detected as multi-port cards. Handle this in roughly the same way via the config quirk - forcing it to be a real single port card (info->multi=0) changes the way we allocate the IO memory, which might stop the card working. Signed-off-by: Russell King commit efd92dfaad962c4fbaf4251b28578c97bd3aa85f Author: Russell King Date: Sat Sep 16 23:00:54 2006 +0100 [SERIAL] serial_cs: add configuration quirk Add a quirk primerily to handle tweaks to the link->conf structure, eg as required for Socket cards. Signed-off-by: Russell King commit 7ef057fa707897c19725d7e07123e57f6aea79db Author: Russell King Date: Sat Sep 16 22:45:41 2006 +0100 [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirk Move the Oxford Semi OX950 / Possio GCC wakeup handling to a quirk wakeup handler. Signed-off-by: Russell King commit eee3a883cebefca6c450c3c1c18a996e23001c2c Author: Russell King Date: Sat Sep 16 21:34:11 2006 +0100 [SERIAL] serial_cs: convert IBM post-init handling to a quirk Move IBM quirk handling into its own quirk entry. Note that doing quirk handling after we've registered the ports is racy, but since I don't know if moving this will have an undesired effect, it's probably better to leave where it is. Signed-off-by: Russell King commit a8244b564ccc46dabf2367008aecf2b380a9be8d Author: Russell King Date: Sat Sep 16 21:26:16 2006 +0100 [SERIAL] serial_cs: allow wildcarded quirks Some quirks we will introduce next apply to (eg) all cards of one manufacturer. Therefore, we need a way to list these in the quirk table - use ~0 - this is not a possible device ID value. Signed-off-by: Russell King commit 1fbbac4bcb03033d325c71fc7273aa0b9c1d9a03 Author: Russell King Date: Sat Sep 16 21:09:41 2006 +0100 [SERIAL] serial_cs: convert multi-port table to quirk table - rename multi_id table to serial_quirk / quirks[] - use named initialisers - store a pointer to the quirk table in the serial_info structure so we can use the quirk table entry later. - apply multi-port quirk after the multi-port guessing code, but only if it's != -1. Signed-off-by: Russell King commit 43549ad7a74e33947f3ba1756a7713086d32e97c Author: Russell King Date: Sat Sep 16 20:53:05 2006 +0100 [SERIAL] serial_cs: Use clean up multiport card detection - Use ARRAY_SIZE() instead of home grown based version. - use parse->manfid.card rather than le16_to_cpu(buf[1]) - manfid.card is already converted to this format. - use info->prodid in subsequent tests rather than parse->manfid.card. Signed-off-by: Russell King commit de6cc84f723ab4373d1f83e64771392d6f784c81 Author: Russell King Date: Wed Aug 30 15:30:39 2006 +0100 [SERIAL] Remove m32r_sio dependency on asm/serial.h m32r_sio re-uses a custom defined BASE_BAUD from asm/serial.h, and replaces SERIAL_PORT_DFNS with its own driver private copy. Since asm/serial.h is supposed to define 8250-based ports using these symbols, this isn't a sane idea. Hence, eliminate asm/serial.h from m32r_sio.c. Acked-by: Hirokazu Takata Signed-off-by: Russell King commit 02a0fa676cd453ce4254c2eee838307ffc5c37f4 Author: Alan Cox Date: Mon Sep 25 23:45:51 2006 +0100 [SCSI] Switch ips to pci_register from pci_module Signed-off-by: Alan Cox Signed-off-by: James Bottomley commit 15a7c3bbe344d75e4891c7d30595899c12ccfaa1 Author: Jeff Garzik Date: Sun Oct 1 10:38:22 2006 -0400 [libata] pata_artop: kill gcc warning gcc complains thusly: drivers/ata/pata_artop.c: In function ‘artop_init_one’: drivers/ata/pata_artop.c:429: warning: ‘info’ may be used uninitialized in this function While this warning is indeed bogus, even with improved static analysis and value range propagation, gcc will probably never be able to detect this. Add a BUG_ON() to trap invalid driver_data entries in the PCI table. Signed-off-by: Jeff Garzik commit 2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8 Author: Jeff Garzik Date: Sun Oct 1 07:32:20 2006 -0400 [netdrvr] hp100: encapsulate all non-module code The previous '#ifndef MODULE' block did not cover all the static-build-only code. Now it does. Signed-off-by: Jeff Garzik commit de897881e474cae06cf06c830fcadc916c53ce64 Author: Jeff Garzik Date: Sun Oct 1 07:31:09 2006 -0400 drivers/net/wireless/{airo,ipw2100}: fix error handling bugs airo: * fix oops, if !CONFIG_PROC_FS (create_proc_entry always returns NULL) * handle pci_register_driver() failure. if it fails, we really do want to exit, rather than (as a comment indicates) return success because-we-are-a-library. * #if 0 have_isa_dev variable, which is assigned a value but never used ipw2100: * handle sysfs_create_group() failure * handle driver_create_file() failure Signed-off-by: Jeff Garzik commit b7a00ecd557859c4037b6465fdd6c9a49b1fa649 Author: Jeff Garzik Date: Sun Oct 1 07:27:46 2006 -0400 [netdrvr] phy: Fix bugs in error handling The recent __must_check stuff flagged some error handling bugs. phy/fixed.c: * handle device_bind_driver() failure phy/phy_device.c: * handle device_bind_driver() failure * release rwsem upon failure Signed-off-by: Jeff Garzik commit 99c8b9477f2b8c4f625545c41f0318570fa38894 Author: Robert P. J. Day Date: Mon Sep 25 15:55:51 2006 -0400 kbuild: trivial documentation fixes Signed-off-by: "Robert P. J. Day" Signed-off-by: Sam Ravnborg commit 9a3d0fe84f9fe296a86ea9315092d31986bc7a3a Author: Sam Ravnborg Date: Sun Oct 1 11:48:53 2006 +0200 kconfig: fix saving alternate kconfig file in parent dir This fixes bugzilla entry: 7182 http://bugzilla.kernel.org/show_bug.cgi?id=7182 With this patch we no longer append the directory part twice before saving the config file. This patch has been sent to Roman Zippel for review with no feedback. It is so obviously simple that this should be OK to apply it anyway. Signed-off-by: Sam Ravnborg commit ea837f1c050344c3f884531a195c6e339b1a54e8 Author: Sam Ravnborg Date: Sun Oct 1 11:35:24 2006 +0200 kbuild: make modpost processing configurable On request from Al Viro make modpost processing configurable. KBUILD_MODPOST_WARN can be set to make modpost warn instead of error out in case on unresolved symbols in final module link. KBUILD_MODPOST_NOFINAL can be set to avoid the final and timeconsuming .c file generation and link of .ko files. This is solely useful for speeding up when doing compile checks with for example allmodconfig Signed-off-by: Sam Ravnborg commit 5a73fdc5ea836d2edc5e02890b51185fe304d7d3 Author: Zachary Amsden Date: Sat Sep 30 23:29:38 2006 -0700 [PATCH] Some config.h removals During tracking down a PAE compile failure, I found that config.h was being included in a bunch of places in i386 code. It is no longer necessary, so drop it. Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 789e6ac0a7cbbb38402293256a295302fd8a1100 Author: Zachary Amsden Date: Sat Sep 30 23:29:38 2006 -0700 [PATCH] paravirt: update pte hook Add a pte_update_hook which notifies about pte changes that have been made without using the set_pte / clear_pte interfaces. This allows shadow mode hypervisors which do not trap on page table access to maintain synchronized shadows. It also turns out, there was one pte update in PAE mode that wasn't using any accessor interface at all for setting NX protection. Considering it is PAE specific, and the accessor is i386 specific, I didn't want to add a generic encapsulation of this behavior yet. Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a93cb055a23f3172c1e6a22ac1dc4f1c07929b08 Author: Zachary Amsden Date: Sat Sep 30 23:29:37 2006 -0700 [PATCH] paravirt: remove set pte atomic Now that ptep_establish has a definition in PAE i386 3-level paging code, the only paging model which is insane enough to have multi-word hardware PTEs which are not efficient to set atomically, we can remove the ghost of set_pte_atomic from other architectures which falesly duplicated it, and remove all knowledge of it from the generic pgtable code. set_pte_atomic is now a private pte operator which is specific to i386 Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6d861e3c963b4077c83e078e3e300c4b81f93e7 Author: Zachary Amsden Date: Sat Sep 30 23:29:36 2006 -0700 [PATCH] paravirt: optimize ptep establish for pae The ptep_establish macro is only used on user-level PTEs, for P->P mapping changes. Since these always happen under protection of the pagetable lock, the strong synchronization of a 64-bit cmpxchg is not needed, in fact, not even a lock prefix needs to be used. We can simply instead clear the P-bit, followed by a normal set. The write ordering is still important to avoid the possibility of the TLB snooping a partially written PTE and getting a bad mapping installed. Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23002d88be309a7c78db69363c9d933a29a3b0bb Author: Zachary Amsden Date: Sat Sep 30 23:29:35 2006 -0700 [PATCH] paravirt: kpte flush Create a new PTE function which combines clearing a kernel PTE with the subsequent flush. This allows the two to be easily combined into a single hypercall or paravirt-op. More subtly, reverse the order of the flush for kmap_atomic. Instead of flushing on establishing a mapping, flush on clearing a mapping. This eliminates the possibility of leaving stale kmap entries which may still have valid TLB mappings. This is required for direct mode hypervisors, which need to reprotect all mappings of a given page when changing the page type from a normal page to a protected page (such as a page table or descriptor table page). But it also provides some nicer semantics for real hardware, by providing extra debug-proofing against using stale mappings, as well as ensuring that no stale mappings exist when changing the cacheability attributes of a page, which could lead to cache conflicts when two different types of mappings exist for the same page. Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25e4df5bae333a06cd2c9b88baf14432652dc9f7 Author: Zachary Amsden Date: Sat Sep 30 23:29:34 2006 -0700 [PATCH] paravirt: combine flush accessed dirty.patch Remove ptep_test_and_clear_{dirty|young} from i386, and instead use the dominating functions, ptep_clear_flush_{dirty|young}. This allows the TLB page flush to be contained in the same macro, and allows for an eager optimization - if reading the PTE initially returned dirty/accessed, we can assume the fact that no subsequent update to the PTE which cleared accessed / dirty has occurred, as the only way A/D bits can change without holding the page table lock is if a remote processor clears them. This eliminates an extra branch which came from the generic version of the code, as we know that no other CPU could have cleared the A/D bit, so the flush will always be needed. We still export these two defines, even though we do not actually define the macros in the i386 code: #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY The reason for this is that the only use of these functions is within the generic clear_flush functions, and we want a strong guarantee that there are no other users of these functions, so we want to prevent the generic code from defining them for us. Signed-off-by: Zachary Amsden Cc: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6606c3e0da5360799e07ae24b05080cc85c68e72 Author: Zachary Amsden Date: Sat Sep 30 23:29:33 2006 -0700 [PATCH] paravirt: lazy mmu mode hooks.patch Implement lazy MMU update hooks which are SMP safe for both direct and shadow page tables. The idea is that PTE updates and page invalidations while in lazy mode can be batched into a single hypercall. We use this in VMI for shadow page table synchronization, and it is a win. It also can be used by PPC and for direct page tables on Xen. For SMP, the enter / leave must happen under protection of the page table locks for page tables which are being modified. This is because otherwise, you end up with stale state in the batched hypercall, which other CPUs can race ahead of. Doing this under the protection of the locks guarantees the synchronization is correct, and also means that spurious faults which are generated during this window by remote CPUs are properly handled, as the page fault handler must re-check the PTE under protection of the same lock. Signed-off-by: Zachary Amsden Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9888a1cae3f859db38b9604e3df1c02177161bb0 Author: Zachary Amsden Date: Sat Sep 30 23:29:31 2006 -0700 [PATCH] paravirt: pte clear not present Change pte_clear_full to a more appropriately named pte_clear_not_present, allowing optimizations when not-present mapping changes need not be reflected in the hardware TLB for protected page table modes. There is also another case that can use it in the fremap code. Signed-off-by: Zachary Amsden Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc907951446b9317b1887223caa4e083390de9f Author: Zachary Amsden Date: Sat Sep 30 23:29:30 2006 -0700 [PATCH] paravirt: remove read hazard from cow We don't want to read PTEs directly like this after they have been modified, as a lazy MMU implementation of direct page tables may not have written the updated PTE back to memory yet. Signed-off-by: Zachary Amsden Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd4c8ce41a2e2f0c5bf54343ab54e8e09faec021 Author: Andrew Morton Date: Sat Sep 30 23:29:29 2006 -0700 [PATCH] invalidate_inode_pages2(): ignore page refcounts The recent fix to invalidate_inode_pages() (git commit 016eb4a) managed to unfix invalidate_inode_pages2(). The problem is that various bits of code in the kernel can take transient refs on pages: the page scanner will do this when inspecting a batch of pages, and the lru_cache_add() batching pagevecs also hold a ref. Net result is transient failures in invalidate_inode_pages2(). This affects NFS directory invalidation (observed) and presumably also block-backed direct-io (not yet reported). Fix it by reverting invalidate_inode_pages2() back to the old version which ignores the page refcounts. We may come up with something more clever later, but for now we need a 2.6.18 fix for NFS. Cc: Chuck Lever Cc: Nick Piggin Cc: Peter Zijlstra Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d025c9db7f31fc0554ce7fb2dfc78d35a77f3487 Author: Andi Kleen Date: Sat Sep 30 23:29:28 2006 -0700 [PATCH] Support piping into commands in /proc/sys/kernel/core_pattern Using the infrastructure created in previous patches implement support to pipe core dumps into programs. This is done by overloading the existing core_pattern sysctl with a new syntax: |program When the first character of the pattern is a '|' the kernel will instead threat the rest of the pattern as a command to run. The core dump will be written to the standard input of that program instead of to a file. This is useful for having automatic core dump analysis without filling up disks. The program can do some simple analysis and save only a summary of the core dump. The core dump proces will run with the privileges and in the name space of the process that caused the core dump. I also increased the core pattern size to 128 bytes so that longer command lines fit. Most of the changes comes from allowing core dumps without seeks. They are fairly straight forward though. One small incompatibility is that if someone had a core pattern previously that started with '|' they will get suddenly new behaviour. I think that's unlikely to be a real problem though. Additional background: > Very nice, do you happen to have a program that can accept this kind of > input for crash dumps? I'm guessing that the embedded people will > really want this functionality. I had a cheesy demo/prototype. Basically it wrote the dump to a file again, ran gdb on it to get a backtrace and wrote the summary to a shared directory. Then there was a simple CGI script to generate a "top 10" crashes HTML listing. Unfortunately this still had the disadvantage to needing full disk space for a dump except for deleting it afterwards (in fact it was worse because over the pipe holes didn't work so if you have a holey address map it would require more space). Fortunately gdb seems to be happy to handle /proc/pid/fd/xxx input pipes as cores (at least it worked with zsh's =(cat core) syntax), so it would be likely possible to do it without temporary space with a simple wrapper that calls it in the right way. I ran out of time before doing that though. The demo prototype scripts weren't very good. If there is really interest I can dig them out (they are currently on a laptop disk on the desk with the laptop itself being in service), but I would recommend to rewrite them for any serious application of this and fix the disk space problem. Also to be really useful it should probably find a way to automatically fetch the debuginfos (I cheated and just installed them in advance). If nobody else does it I can probably do the rewrite myself again at some point. My hope at some point was that desktops would support it in their builtin crash reporters, but at least the KDE people I talked too seemed to be happy with their user space only solution. Alan sayeth: I don't believe that piping as such as neccessarily the right model, but the ability to intercept and processes core dumps from user space is asked for by many enterprise users as well. They want to know about, capture, analyse and process core dumps, often centrally and in automated form. [akpm@osdl.org: loff_t != unsigned long] Signed-off-by: Andi Kleen Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e239ca540594cff00adcce163dc332b27015d8e5 Author: Andi Kleen Date: Sat Sep 30 23:29:27 2006 -0700 [PATCH] Create call_usermodehelper_pipe() A new member in the ever growing family of call_usermode* functions is born. The new call_usermodehelper_pipe() function allows to pipe data to the stdin of the called user mode progam and behaves otherwise like the normal call_usermodehelp() (except that it always waits for the child to finish) Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6cbd281d189977b38eac7eb2a4678de19b6b483 Author: Andi Kleen Date: Sat Sep 30 23:29:26 2006 -0700 [PATCH] Some cleanup in the pipe code Split the big and hard to read do_pipe function into smaller pieces. This creates new create_write_pipe/free_write_pipe/create_read_pipe functions. These functions are made global so that they can be used by other parts of the kernel. The resulting code is more generic and easier to read and has cleaner error handling and less gotos. [akpm@osdl.org: cleanup] Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65da4d81f48e092f71feaf04bf2ccd096b5a5171 Author: Amol Lad Date: Sat Sep 30 23:29:25 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/sunsu.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af907dc8cd4157d629e48533b3400786467340d5 Author: Amol Lad Date: Sat Sep 30 23:29:25 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/mux.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a141a04330bd6eadf7081a0860dc786be7d09c46 Author: Amol Lad Date: Sat Sep 30 23:29:24 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/mpsc.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Cc: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be618f550cb499db263e2ce22c5ad4f4dbfd53e6 Author: Amol Lad Date: Sat Sep 30 23:29:23 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/mpc52xx_uart.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6257b3bdfde4295c04872d710c2419ff8efc1b86 Author: Amol Lad Date: Sat Sep 30 23:29:22 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/ip22zilog.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4664132613caf40bfbf17b7e0ab3340a8b8f526 Author: Amol Lad Date: Sat Sep 30 23:29:21 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/ioc4_serial.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Cc: Brent Casavant Cc: Pat Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9964d5c9067fe58fecb7ba10b2de4771d2005d9 Author: Amol Lad Date: Sat Sep 30 23:29:21 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/8250_gsc.c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f12ad7d59ab77591e4ab2dacd6faa9ea9afffb99 Author: Amol Lad Date: Sat Sep 30 23:29:20 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/serial/8250_acorn,c ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16c564bb3cdecbc39eab5c0de3fe94ed58ba4163 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:19 2006 -0700 [PATCH] Generic ioremap_page_range: x86_64 conversion Convert x86_64 to use generic ioremap_page_range() [akpm@osdl.org: build fix] Signed-off-by: Haavard Skinnemoen Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9540fc42305859705b0232a10c8dec3ad866bd40 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:18 2006 -0700 [PATCH] Generic ioremap_page_range: m32r conversion Convert m32r to use generic ioremap_page_range() Signed-off-by: Haavard Skinnemoen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a148ecfdf04d5fcb840324eef45d63ed674c73b9 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:17 2006 -0700 [PATCH] Generic ioremap_page_range: i386 conversion Convert i386 to use generic ioremap_page_range() [bunk@stusta.de: build fix] Signed-off-by: Haavard Skinnemoen Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e32cbc3df44838cc93a679aca3561f75b4964c57 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:17 2006 -0700 [PATCH] Generic ioremap_page_range: cris conversion Convert CRIS to use generic ioremap_page_range() Signed-off-by: Haavard Skinnemoen Acked-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c8eb360daa6286e3f9bd32a22e5d9c69e86dd1 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:16 2006 -0700 [PATCH] Generic ioremap_page_range: avr32 conversion Convert AVR32 to use generic ioremap_page_range() Signed-off-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 801f92ad5a0c630646f6746f3ed1663fcab185d1 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:15 2006 -0700 [PATCH] Generic ioremap_page_range: alpha conversion Convert Alpha to use generic ioremap_page_range() by turning __alpha_remap_area_pages() into an inline wrapper around ioremap_page_range(). Signed-off-by: Haavard Skinnemoen Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db71daabad0821996483dfe309c4bc81d6755a70 Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:14 2006 -0700 [PATCH] Generic ioremap_page_range: flush_cache_vmap The existing implementation of ioremap_page_range(), which was taken from i386, does this: flush_cache_all(); /* modify page tables */ flush_tlb_all(); I think this is a bit defensive, so this patch changes the generic implementation to do: /* modify page tables */ flush_cache_vmap(start, end); instead, which is similar to what vmalloc() does. This should still be correct because we never modify existing PTEs. According to James Bottomley: The problem the flush_tlb_all() is trying to solve is to avoid stale tlb entries in the ioremap area. We're just being conservative by flushing on both map and unmap. Technically what vmalloc/vfree does (only flush the tlb on unmap) is just fine because it means that the only tlb entries in the remap area must belong to in-use mappings. Signed-off-by: Haavard Skinnemoen Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Mikael Starvik Cc: Andi Kleen Cc: Cc: Ralf Baechle Cc: Kyle McMartin Cc: Martin Schwidefsky Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74588d8ba34ff1bda027cfa737972af01ab00c8b Author: Haavard Skinnemoen Date: Sat Sep 30 23:29:12 2006 -0700 [PATCH] Generic ioremap_page_range: implementation This patch adds a generic implementation of ioremap_page_range() in lib/ioremap.c based on the i386 implementation. It differs from the i386 version in the following ways: * The PTE flags are passed as a pgprot_t argument and must be determined up front by the arch-specific code. No additional PTE flags are added. * Uses set_pte_at() instead of set_pte() [bunk@stusta.de: warning fix] ]dhowells@redhat.com: nommu build fix] Signed-off-by: Haavard Skinnemoen Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Mikael Starvik Cc: Andi Kleen Cc: Cc: Ralf Baechle Cc: Kyle McMartin Cc: Martin Schwidefsky Cc: Paul Mundt Signed-off-by: Adrian Bunk Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc03613decef0cc4d2f3a24f19fa5a868745715f Author: Fernando Vazquez Date: Sat Sep 30 23:29:10 2006 -0700 [PATCH] stack overflow safe kdump: safe smp_send_nmi_allbutself() Re-implement smp_send_nmi_allbutself() so that calls to smp_processor_id (through send_IPI_allbutself) can be replaced with safe_smp_processor_id without affecting other parts of the kernel (as suggested by Eric Biederman). Signed-off-by: Fernando Vazquez Looks-reasonable-to: Andi Kleen Acked-by: "Eric W. Biederman" Cc: Vivek Goyal Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce53af9496c625a8ae33526713be34a23756db19 Author: Fernando Vazquez Date: Sat Sep 30 23:29:09 2006 -0700 [PATCH] stack overflow safe kdump: crash: use safe_smp_processor_id() Substitute "smp_processor_id" with the stack overflow-safe "safe_smp_processor_id" in the reboot path to the second kernel. [akpm@osdl.org: build fix] Signed-off-by: Fernando Vazquez Looks-reasonable-to: Andi Kleen Acked-by: "Eric W. Biederman" Cc: Vivek Goyal Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2654c08caa12a06237b28f85446ae2d223c30144 Author: Fernando Vazquez Date: Sat Sep 30 23:29:08 2006 -0700 [PATCH] stack overflow safe kdump: safe_smp_processor_id(): voyager "safe_smp_processor_id" implementation for i386-Voyager. Signed-off-by: Fernando Vazquez Looks-reasonable-to: Andi Kleen Acked-by: "Eric W. Biederman" Cc: Vivek Goyal Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc2bc768a009b9ad8711894c544dc6b0d8c0ce57 Author: Fernando Vazquez Date: Sat Sep 30 23:29:07 2006 -0700 [PATCH] stack overflow safe kdump: safe_smp_processor_id() This is a the first of a series of patch-sets aiming at making kdump more robust against stack overflows. This patch set does the following: * Add safe_smp_processor_id function to i386 architecture (this function was inspired by the x86_64 function of the same name). * Substitute "smp_processor_id" with the stack overflow-safe "safe_smp_processor_id" in the reboot path to the second kernel. This patch: On the event of a stack overflow critical data that usually resides at the bottom of the stack is likely to be stomped and, consequently, its use should be avoided. In particular, in the i386 and IA64 architectures the macro smp_processor_id ultimately makes use of the "cpu" member of struct thread_info which resides at the bottom of the stack. x86_64, on the other hand, is not affected by this problem because it benefits from the use of the PDA infrastructure. To circumvent this problem I suggest implementing "safe_smp_processor_id()" (it already exists in x86_64) for i386 and IA64 and use it as a replacement for smp_processor_id in the reboot path to the dump capture kernel. This is a possible implementation for i386. Signed-off-by: Fernando Vazquez Looks-reasonable-to: Andi Kleen Acked-by: "Eric W. Biederman" Cc: Vivek Goyal Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce71ec36840368b877fb63bd14c8e67ab62d08b1 Author: Dave Hansen Date: Sat Sep 30 23:29:06 2006 -0700 [PATCH] r/o bind mounts: monitor zeroing of i_nlink Some filesystems, instead of simply decrementing i_nlink, simply zero it during an unlink operation. We need to catch these in addition to the decrement operations. Signed-off-by: Dave Hansen Acked-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17ff785691503f63ec648df82a7fdaece7695561 Author: Mark Fasheh Date: Sat Sep 30 23:29:05 2006 -0700 [PATCH] r/o bind mounts: clean up OCFS2 nlink handling OCFS2 does some operations on i_nlink, then reverts them if some of its operations fail to complete. This does not fit in well with the drop_nlink() logic where we expect i_nlink to stay at zero once it gets there. So, delay all of the nlink operations until we're sure that the operations have completed. Also, introduce a small helper to check whether an inode has proper "unlinkable" i_nlink counts no matter whether it is a directory or regular inode. This patch is broken out from the others because it does contain some logical changes. Signed-off-by: Dave Hansen Signed-off-by: Mark Fasheh Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8c76e6f45c111c32a4b3e50a2adc9210737b0d8 Author: Dave Hansen Date: Sat Sep 30 23:29:04 2006 -0700 [PATCH] r/o bind mount prepwork: inc_nlink() helper This is mostly included for parity with dec_nlink(), where we will have some more hooks. This one should stay pretty darn straightforward for now. Signed-off-by: Dave Hansen Acked-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a53c3a783c2fa9b969628e65695c11c3e51e673 Author: Dave Hansen Date: Sat Sep 30 23:29:03 2006 -0700 [PATCH] r/o bind mounts: unlink: monitor i_nlink When a filesystem decrements i_nlink to zero, it means that a write must be performed in order to drop the inode from the filesystem. We're shortly going to have keep filesystems from being remounted r/o between the time that this i_nlink decrement and that write occurs. So, add a little helper function to do the decrements. We'll tie into it in a bit to note when i_nlink hits zero. Signed-off-by: Dave Hansen Acked-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aab520e2f6c80160cabd187a8d0292d1cec8ff68 Author: Dave Hansen Date: Sat Sep 30 23:29:02 2006 -0700 [PATCH] r/o bind mount prepwork: move open_namei()'s vfs_create() The code around vfs_create() in open_namei() is getting a bit too complex. Right now, there is at least the reference count on the dentry, and the i_mutex to worry about. Soon, we'll also have mnt_writecount. So, break the vfs_create() call out of open_namei(), and into a helper function. This duplicates the call to may_open(), but that isn't such a bad thing since the arguments (acc_mode and flag) were being heavily massaged anyway. Signed-off-by: Dave Hansen Acked-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6902d925d568cd5bfda8a1a328bf08d26d1bab46 Author: Dave Hansen Date: Sat Sep 30 23:29:01 2006 -0700 [PATCH] r/o bind mounts: prepare for write access checks: collapse if() We're shortly going to be adding a bunch more permission checks in these functions. That requires adding either a bunch of new if() conditions, or some gotos. This patch collapses existing if()s and uses gotos instead to prepare for the upcoming changes. Signed-off-by: Dave Hansen Acked-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db5fed26b2e0beed939b773dd5896077a1794d65 Author: Jay Lan Date: Sat Sep 30 23:29:00 2006 -0700 [PATCH] csa accounting taskstats update ChangeLog: Feedbacks from Andrew Morton: - define TS_COMM_LEN to 32 - change acct_stimexpd field of task_struct to be of cputime_t, which is to be used to save the tsk->stime of last timer interrupt update. - a new Documentation/accounting/taskstats-struct.txt to describe fields of taskstats struct. Feedback from Balbir Singh: - keep the stime of a task to be zero when both stime and utime are zero as recoreded in task_struct. Misc: - convert accumulated RSS/VM from platform dependent pages-ticks to MBytes-usecs in the kernel Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jes Sorensen Cc: Chris Sturtivant Cc: Tony Ernst Cc: Guillaume Thouvenin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f0ab5147951267134612570604cf8341901a80c Author: Jay Lan Date: Sat Sep 30 23:28:59 2006 -0700 [PATCH] csa: convert CONFIG tag for extended accounting routines There were a few accounting data/macros that are used in CSA but are #ifdef'ed inside CONFIG_BSD_PROCESS_ACCT. This patch is to change those ifdef's from CONFIG_BSD_PROCESS_ACCT to CONFIG_TASK_XACCT. A few defines are moved from kernel/acct.c and include/linux/acct.h to kernel/tsacct.c and include/linux/tsacct_kern.h. Signed-off-by: Jay Lan Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jes Sorensen Cc: Chris Sturtivant Cc: Tony Ernst Cc: Guillaume Thouvenin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9acc1853519a0473620d424105f9d49ea5b4e62e Author: Jay Lan Date: Sat Sep 30 23:28:58 2006 -0700 [PATCH] csa: Extended system accounting over taskstats Add extended system accounting handling over taskstats interface. A CONFIG_TASK_XACCT flag is created to enable the extended accounting code. Signed-off-by: Jay Lan Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jes Sorensen Cc: Chris Sturtivant Cc: Tony Ernst Cc: Guillaume Thouvenin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3cef7a99469afc159fec3a61b42dc7ca5b6824f Author: Jay Lan Date: Sat Sep 30 23:28:55 2006 -0700 [PATCH] csa: basic accounting over taskstats Add some basic accounting fields to the taskstats struct, add a new kernel/tsacct.c to handle basic accounting data handling upon exit. A handle is added to taskstats.c to invoke the basic accounting data handling. Signed-off-by: Jay Lan Cc: Shailabh Nagar Cc: Balbir Singh Cc: Jes Sorensen Cc: Chris Sturtivant Cc: Tony Ernst Cc: Guillaume Thouvenin Cc: "Michal Piotrowski" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d1bdca9b06acb3df07329eaff72d5eaf1543287 Author: Balbir Singh Date: Sat Sep 30 23:28:54 2006 -0700 [PATCH] Fix getdelays.c - cpumask length and error reporting Fix the length passed while (un)registering cpumask. We were passing sizeof the array, make it strlen(). Error value printed in fatal errors should be derived from the message. The message contains an nlmsgerr embedded with an error value. We must report that value to the user. Signed-off-by: Balbir Singh Cc: Jamal Hadi Cc: Shailabh Nagar Cc: Thomas Graf Cc: "David S. Miller" Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ae646845b603e9df5711084436d389f8371ffb3 Author: Balbir Singh Date: Sat Sep 30 23:28:53 2006 -0700 [PATCH] Fix taskstats size calculation (use the new genetlink utility functions) The addition of the CSA patch pushed the size of struct taskstats to 256 bytes. This exposed a problem with prepare_reply(), we were not allocating space for the netlink and genetlink header. It worked earlier because alloc_skb() would align the skb to SMP_CACHE_BYTES, which added some additonal bytes. Signed-off-by: Balbir Singh Cc: Jamal Hadi Cc: Shailabh Nagar Cc: Thomas Graf Cc: "David S. Miller" Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17db952cd16cecc76937b138c685ae3d198ab17c Author: Balbir Singh Date: Sat Sep 30 23:28:51 2006 -0700 [PATCH] Add genetlink utilities for payload length calculation Add two utility helper functions genlmsg_msg_size() and genlmsg_total_size(). These functions are derived from their netlink counterparts. Signed-off-by: Balbir Singh Cc: Jamal Hadi Cc: Shailabh Nagar Cc: Thomas Graf Cc: "David S. Miller" Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31608214fe21dc31d8046679054ab033b1fe5cf1 Author: Chen, Kenneth W Date: Sat Sep 30 23:28:50 2006 -0700 [PATCH] clean up unused kiocb variables Signed-off-by: Ken Chen Acked-by: Zach Brown Cc: Suparna Bhattacharya Cc: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed4e51fb60c3863c134a5e9f6006b29805ead97 Author: Badari Pulavarty Date: Sat Sep 30 23:28:49 2006 -0700 [PATCH] Add vector AIO support This work is initially done by Zach Brown to add support for vectored aio. These are the core changes for AIO to support IOCB_CMD_PREADV/IOCB_CMD_PWRITEV. [akpm@osdl.org: huge build fix] Signed-off-by: Zach Brown Signed-off-by: Christoph Hellwig Signed-off-by: Badari Pulavarty Acked-by: Benjamin LaHaise Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 543ade1fc901db4c3dbe9fb27241fb977f1f3eea Author: Badari Pulavarty Date: Sat Sep 30 23:28:48 2006 -0700 [PATCH] Streamline generic_file_* interfaces and filemap cleanups This patch cleans up generic_file_*_read/write() interfaces. Christoph Hellwig gave me the idea for this clean ups. In a nutshell, all filesystems should set .aio_read/.aio_write methods and use do_sync_read/ do_sync_write() as their .read/.write methods. This allows us to cleanup all variants of generic_file_* routines. Final available interfaces: generic_file_aio_read() - read handler generic_file_aio_write() - write handler generic_file_aio_write_nolock() - no lock write handler __generic_file_aio_write_nolock() - internal worker routine Signed-off-by: Badari Pulavarty Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee0b3e671baff681d69fbf0db33b47603c0a8280 Author: Badari Pulavarty Date: Sat Sep 30 23:28:47 2006 -0700 [PATCH] Remove readv/writev methods and use aio_read/aio_write instead This patch removes readv() and writev() methods and replaces them with aio_read()/aio_write() methods. Signed-off-by: Badari Pulavarty Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 027445c37282bc1ed26add45e573ad2d3e4860a5 Author: Badari Pulavarty Date: Sat Sep 30 23:28:46 2006 -0700 [PATCH] Vectorize aio_read/aio_write fileop methods This patch vectorizes aio_read() and aio_write() methods to prepare for collapsing all aio & vectored operations into one interface - which is aio_read()/aio_write(). Signed-off-by: Badari Pulavarty Signed-off-by: Christoph Hellwig Cc: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ea0f9499d15c49df23e7aac4332d830c40e12d0 Author: Jeff Mahoney Date: Sat Sep 30 23:28:45 2006 -0700 [PATCH] reiserfs: eliminate minimum window size for bitmap searching When a file system becomes fragmented (using MythTV, for example), the bigalloc window searching ends up causing huge performance problems. In a file system presented by a user experiencing this bug, the file system was 90% free, but no 32-block free windows existed on the entire file system. This causes the allocator to scan the entire file system for each 128k write before backing down to searching for individual blocks. In the end, finding a contiguous window for all the blocks in a write is an advantageous special case, but one that can be found naturally when such a window exists anyway. This patch removes the bigalloc window searching, and has been proven to fix the test case described above. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a2618e6a972f305496daa257a56a09dd3acca29 Author: Jeff Mahoney Date: Sat Sep 30 23:28:44 2006 -0700 [PATCH] reiserfs: use generic_file_open for open() checks The other common disk-based file systems (I checked ext[23], xfs, jfs) check to ensure that opens of files > 2 GB fail unless O_LARGEFILE is specified. They check via generic_file_open or their own open routine. ReiserFS doesn't have an f_op->open defined, and as such, it's possible to open files > 2 GB without O_LARGEFILE. This patch adds the f_op->open member to conform with the expected behavior. Signed-off-by: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5065227b46235ec0131b383cc2f537069b55c6b6 Author: Jeff Mahoney Date: Sat Sep 30 23:28:44 2006 -0700 [PATCH] reiserfs: on-demand bitmap loading This is the patch the three previous ones have been leading up to. It changes the behavior of ReiserFS from loading and caching all the bitmaps as special, to treating the bitmaps like any other bit of metadata and just letting the system-wide caches figure out what to hang on to. Buffer heads are allocated on the fly, so there is no need to retain pointers to all of them. The caching of the metadata occurs when the data is read and updated, and is considered invalid and uncached until then. I needed to remove the vs-4040 check for performing a duplicate operation on a particular bit. The reason is that while the other sites for working with bitmaps are allowed to schedule, is_reusable() is called from do_balance(), which will panic if a schedule occurs in certain places. The benefit of on-demand bitmaps clearly outweighs a sanity check that depends on a compile-time option that is discouraged. [akpm@osdl.org: warning fix] Signed-off-by: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f01046b35d940079822827498a7dd6d3eec8c6b Author: Jeff Mahoney Date: Sat Sep 30 23:28:43 2006 -0700 [PATCH] reiserfs: reorganize bitmap loading functions This patch moves the bitmap loading code from super.c to bitmap.c The code is also restructured somewhat. The only difference between new format bitmaps and old format bitmaps is where they are. That's a two liner before loading the block to use the correct one. There's no need for an entirely separate code path. The load path is generally the same, with the pattern being to throw out a bunch of requests and then wait for them, then cache the metadata from the contents. Again, like the previous patches, the purpose is to set up for later ones. Update: There was a bug in the previously posted version of this that resulted in corruption. The problem was that bitmap 0 on new format file systems must be treated specially, and wasn't. A stupid bug with an easy fix. This is hopefully the last fix for the disaster that is the reiserfs bitmap patch set. If a bitmap block was full, first_zero_hint would end up at zero since it would never be changed from it's zeroed out value. This just sets it beyond the end of the bitmap block. If any bits are freed, it will be reset to a valid bit. When info->free_count = 0, then we already know it's full. Signed-off-by: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b3dc17bc0c0997bde9f5d7691ec0cae24258cf7 Author: Jeff Mahoney Date: Sat Sep 30 23:28:42 2006 -0700 [PATCH] reiserfs: clean up bitmap block buffer head references Similar to the SB_JOURNAL cleanup that was accepted a while ago, this patch uses a temporary variable for buffer head references from the bitmap info array. This makes the code much more readable in some areas. It also uses proper reference counting, doing a get_bh() after using the pointer from the array and brelse()'ing it later. This may seem silly, but a later patch will replace the simple temporary variables with an actual read, so the reference freeing will be used then. Signed-off-by: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1fabd3ccf02901374bffa434e0af472749a5bd9 Author: Jeff Mahoney Date: Sat Sep 30 23:28:40 2006 -0700 [PATCH] reiserfs: fix is_reusable bitmap check to not traverse the bitmap info array There is a check in is_reusable to determine if a particular block is a bitmap block. It verifies this by going through the array of bitmap block buffer heads and comparing the block number to each one. Bitmap blocks are at defined locations on the disk in both old and current formats. Simply checking against the known good values is enough. This is a trivial optimization for a non-production codepath, but this is the first in a series of patches that will ultimately remove the buffer heads from that array. Signed-off-by: Jeff Mahoney Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ef386092d7c2891bd7acefb2a87f878f7e9a0d6 Author: Atsushi Nemoto Date: Sat Sep 30 23:28:31 2006 -0700 [PATCH] kill wall_jiffies With 2.6.18-rc4-mm2, now wall_jiffies will always be the same as jiffies. So we can kill wall_jiffies completely. This is just a cleanup and logically should not change any real behavior except for one thing: RTC updating code in (old) ppc and xtensa use a condition "jiffies - wall_jiffies == 1". This condition is never met so I suppose it is just a bug. I just remove that condition only instead of kill the whole "if" block. [heiko.carstens@de.ibm.com: s390 build fix and cleanup] Signed-off-by: Atsushi Nemoto Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Cc: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bc42f90a3f4721c89dbe865e6c95da8565b41c Author: Adrian Bunk Date: Sat Sep 30 23:28:29 2006 -0700 [PATCH] kernel/time/ntp.c: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global function static: - ntp_update_frequency() - make the following needlessly global variables static: - time_state - time_offset - time_constant - time_reftime - remove the following read-only global variable: - time_precision Signed-off-by: Adrian Bunk Cc: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0883d899ef862c1b0f8b2c2d38098470c193a3dd Author: Roman Zippel Date: Sat Sep 30 23:28:29 2006 -0700 [PATCH] ntp: cleanup defines and comments Remove a few unused defines and remove obsolete information from comments. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f19923937321244e7dc334767eb4b67e0e3d5c74 Author: Roman Zippel Date: Sat Sep 30 23:28:28 2006 -0700 [PATCH] ntp: convert to the NTP4 reference model This converts the kernel ntp model into a model which matches the nanokernel reference implementations. The previous patches already increased the resolution and precision of the computations, so that this conversion becomes quite simple. explains: The original NTP kernel interface was defined in units of microseconds. That's what Linux implements. As computers have gotten faster and can now split microseconds easily, a new kernel interface using nanosecond units was defined ("the nanokernel", confusing as that name is to OS hackers), and there's an STA_NANO bit in the adjtimex() status field to tell the application which units it's using. The current ntpd supports both, but Linux loses some possible timing resolution because of quantization effects, and the ntpd hackers would really like to be able to drop the backwards compatibility code. Ulrich Windl has been maintaining a patch set to do the conversion for years, but it's hard to keep in sync. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04b617e71e363e640e88be1e43f53fa6a3afef9f Author: Roman Zippel Date: Sat Sep 30 23:28:27 2006 -0700 [PATCH] ntp: convert time_freq to nsec value This converts time_freq to a scaled nsec value and adds around 6bit of extra resolution. This pushes the time_freq to its 32bit limits so the calculatons have to be done with 64bit. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97eebe138caaf78354b1fad233e63bafdcc4fd54 Author: Roman Zippel Date: Sat Sep 30 23:28:26 2006 -0700 [PATCH] ntp: remove time_tolerance time_tolerance isn't changed at all in the kernel, so simply remove it, this simplifies the next patch, as it avoids a number of conversions. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f807f8d2137ba728d22820103131038639b68a9 Author: Roman Zippel Date: Sat Sep 30 23:28:25 2006 -0700 [PATCH] ntp: add time_adjust to tick length This folds update_ntp_one_tick() into second_overflow() and adds time_adjust to the tick length, this makes time_next_adjust unnecessary. This slightly changes the adjtime() behaviour, instead of applying it to the next tick, it's applied to the next second. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d3675cc3d04d7fd4bb11e8c1ea79e5ade4f5e44 Author: Roman Zippel Date: Sat Sep 30 23:28:25 2006 -0700 [PATCH] ntp: prescale time_offset This converts time_offset into a scaled per tick value. This avoids now completely the crude compensation in second_overflow(). Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc6a43e46f1b6de22701f97bec022e97088cfa90 Author: Roman Zippel Date: Sat Sep 30 23:28:24 2006 -0700 [PATCH] ntp: add time_freq to tick length This adds the frequency part to ntp_update_frequency(). Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab8783b688f33c40ed7b37b814a4a1e7d341ce11 Author: Roman Zippel Date: Sat Sep 30 23:28:23 2006 -0700 [PATCH] ntp: add time_adj to tick length This makes time_adj local to second_overflow() and integrates it into the tick length instead of adding it everytime. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0ee75561beadc4db4d9a899c8ef4a7db50aa0ab Author: Roman Zippel Date: Sat Sep 30 23:28:22 2006 -0700 [PATCH] ntp: add ntp_update_frequency This introduces ntp_update_frequency() and deinlines ntp_clear() (as it's not performance critical). ntp_update_frequency() calculates the base tick length using tick_usec and adds a base adjustment, in case the frequency doesn't divide evenly by HZ. Signed-off-by: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7ee8de956fc250fe31e2fa91f6da980fabe317 Author: john stultz Date: Sat Sep 30 23:28:22 2006 -0700 [PATCH] NTP: Move all the NTP related code to ntp.c Move all the NTP related code to ntp.c [akpm@osdl.org: cleanups, build fix] Signed-off-by: John Stultz Cc: Ingo Molnar Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c902e0a0102f1095eec4b3511c13c84ca2bc4577 Author: Josh Triplett Date: Sat Sep 30 23:28:21 2006 -0700 [PATCH] Pass sparse the lock expression given to lock annotations The lock annotation macros __acquires, __releases, __acquire, and __release all currently throw away the lock expression passed as an argument. Now that sparse can parse __context__ and __attribute__((context)) with a context expression, pass the lock expression down to sparse as the context expression. This requires a version of sparse from GIT commit 37475a6c1c3e66219e68d912d5eb833f4098fd72 or later. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df3fe8defedc52745526914e12eb4ba0b8a9f6ca Author: Corey Minyard Date: Sat Sep 30 23:28:20 2006 -0700 [PATCH] ipmi: don't start kipmid if the IPMI driver can use interrupts If the driver has interrupts available to it, there is really no reason to have a kernel daemon push the IPMI state machine. Note that I have experienced machines where the interrupts do not work correctly. This was a long time ago and hopefully things are better now. If some machines still have broken interrupts, a blacklist will need to be added. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcb9c39236a27c2288a7059aa504abb57427df7c Author: David Brownell Date: Sat Sep 30 23:28:19 2006 -0700 [PATCH] omap_cf works again (sync with linux-omap tree) This syncs the omap_cf driver with the one from the linux-omap tree. Changes include fixing build warnings (section mismatch, unused return value) and coping with various pcmcia core changes related to managing i/o memory and irq resources. Signed-off-by: David Brownell Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 391b1fe67d193df75144a92b146613c36491ef0d Author: Atsushi Nemoto Date: Sat Sep 30 23:28:18 2006 -0700 [PATCH] RTC: rtc-ds1553, rtc-ds1742 update Check return value of sysfs_create_bin_file(). Fix polarity of RTC_BATT_FLAG bit in DS1742. Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90b4d648f02a653b192be7f0feb0a933b7525e6a Author: David Brownell Date: Sat Sep 30 23:28:17 2006 -0700 [PATCH] AT91rm9200 RTC can issue system wakeup events This lets the at91rm9200 RTC alarm be a system wakeup irq, according to the setting of /sys/devices/platform/at91_rtc/power/wakeup. User code can set the alarm, put the system into a low power mode, and then rely on it waking up no later than the specified moment. Signed-off-by: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff8371ac9a5a55c956991fed8e5f58640c7a32f3 Author: David Brownell Date: Sat Sep 30 23:28:17 2006 -0700 [PATCH] constify rtc_class_ops: update drivers Update RTC framework so that drivers can constify their method tables, moving them from ".data" to ".rodata". Then update the drivers. Signed-off-by: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db621f174d2c017d960089ea8cbc91c0763f1069 Author: David Brownell Date: Sat Sep 30 23:28:16 2006 -0700 [PATCH] RTC class: error checks The rtc_is_valid_tm() routine needs to treat some of the fields it checks as unsigned, to prevent wrongly accepting invalid rtc_time structs; this is the same approach used elsewhere in the RTC code for such tests. Conversely, rtc_proc_show() is missing one invalid-day-of-month test that rtc_is_valid_tm() makes: there is no day zero. Signed-off-by: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 818a8674b0388d90e33a5d1b13946b40dda7032a Author: David Brownell Date: Sat Sep 30 23:28:15 2006 -0700 [PATCH] RTC class uses subsys_init This makes RTC core components use "subsys_init" instead of "module_init", as appropriate for subsystem infrastructure. This is mostly useful for statically linking drivers in other parts of the tree that may provide an RTC interface as a secondary functionality (e.g. part of a multifunction chip); they won't need to worry so much about drivers/Makefile link order. Signed-off-by: David Brownell Cc: Alessandro Zummo Acked-by: Oleg Verych Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e86ecb659f11b36b5e189214b19cb31ef5dfd72 Author: David Brownell Date: Sat Sep 30 23:28:14 2006 -0700 [PATCH] RTC class: Kconfig improvements Small updates to make the RTC class Kconfig text be more informative. This should help folk used to the drivers/char/rtc.c support, or a single RTC, be slightly less surprised by the differences. Also, adds a new RTC_DEBUG option to predefine DEBUG in the framework and its drivers, while debugging. That's getting to be a standard idiom, and it's pretty useful. Signed-off-by: David Brownell Cc: Alessandro Zummo Acked-by: Oleg Verych Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0847062ad57e6d2d77875104d66f413a89769809 Author: Randy Dunlap Date: Sat Sep 30 23:28:13 2006 -0700 [PATCH] fix EMBEDDED + SYSCTL menu SYSCTL should still depend on EMBEDDED. This unbreaks the EMBEDDED menu (from the recent SYSCTL_SYCALL menu option patch). Fix typos in new SYSCTL_SYSCALL menu. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1713e903c680de4934837689abecc5df02f463ac Author: Jean-Baptiste Maneyrol Date: Sat Sep 30 23:28:12 2006 -0700 [PATCH] rtc driver rtc-pcf8563 century bit inversed The century bit PCF8563_MO_C in the month register is misinterpreted. It is set to 1 for the 20th century and 0 for 21th, and the driver is expecting the opposite behavior. Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 365e02237b164701897244aab7412b21c5e622af Author: Jiri Slaby Date: Sat Sep 30 23:28:11 2006 -0700 [PATCH] Char: specialix, kill unneeded page alloc The driver is allocating a page but doesn't actually use it for anything. (History from the old ->write method before Linus cleaned it up) Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e9a4738c9fadb7cbdcabc1e3b415159f3741ed9 Author: Peter Zijlstra Date: Sat Sep 30 23:28:10 2006 -0700 [PATCH] completions: lockdep annotate on stack completions All on stack DECLARE_COMPLETIONs should be replaced by: DECLARE_COMPLETION_ONSTACK Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 397d6140e93156ecb9cafcd9be0db10ff3c12ab3 Author: Eric Sesterhenn Date: Sat Sep 30 23:28:09 2006 -0700 [PATCH] Remove unnecessary check in drivers/rtc/rtc-v3020.c Looks like the probe function always gets a valid pdev, and checking it after dereferencing it is pretty useless. This patch removes the check (cid #1365) Signed-off-by: Eric Sesterhenn Cc: Alessandro Zummo Cc: Raphael Assenat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a2711116073db258224afd2cc0f478bdf305575 Author: Rolf Eike Beer Date: Sat Sep 30 23:28:09 2006 -0700 [PATCH] Remove BUG_ON(unlikely) in include/linux/aio.h BUG_ON() does this unlikely check itself, as bugs in Linux are unlikely anyway :) Signed-off-by: Rolf Eike Beer Acked-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ba0bdfd040b2893bcddfec7165b545d22fc2dc7 Author: Jan Altenberg Date: Sat Sep 30 23:28:08 2006 -0700 [PATCH] typo fixes for rt-mutex-design.txt Address some simple typos in rt-mutex-design.txt It also changes the indentation of the cmpxchg example (the cmpxchg example was indented by spaces, while all other code snippets were indented by tabs). Acked-by: Steven Rostedt Signed-off-by: Jan Altenberg Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 710b8b5f4341e72a5f5f6fa58d1f73a0db64bf93 Author: Soos Peter Date: Sat Sep 30 23:28:06 2006 -0700 [PATCH] hdaps: support Lenovo ThinkPad T60 Support hdaps on Lenovo ThinkPad T60. It was tested with pivot utility from http://www.kernel.org/pub/linux/kernel/people/rml/hdaps and it seems to be OK. Cc: Jean Delvare Cc: Greg Kroah-Hartman Cc: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 095d030cff0eafd29ee31e022d374874146a5b4c Author: Eric Sesterhenn Date: Sat Sep 30 23:28:05 2006 -0700 [PATCH] Off-by-one in drivers/char/mwave/mwavedd.c This fixes two off by ones in the mwave driver, found via find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(" Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cfee2b3c21d71a8c20884dbb77ed343558db87f Author: Alan Cox Date: Sat Sep 30 23:28:03 2006 -0700 [PATCH] trident: fix pci_dev reference counting and buglet Switch trident to use pci_get/put_dev properly. Also fix a bug where the driver erroneously passed pdev not NULL to a second search. This happened to always work except with pci=reverse because of chip ordering. Signed-off-by: Alan Cox Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2e9c7d07fcc8966d6aa50a77afa66c9919bd5a8 Author: Peter Zijlstra Date: Sat Sep 30 23:28:02 2006 -0700 [PATCH] sysrq: disable lockdep on reboot SysRq : Emergency Sync Emergency Sync complete SysRq : Emergency Remount R/O Emergency Remount complete SysRq : Resetting BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted) Call Trace: [] show_trace+0xae/0x319 [] dump_stack+0x15/0x17 [] trace_hardirqs_on+0xbc/0x13d [] sysrq_handle_reboot+0x9/0x11 [] __handle_sysrq+0x99/0x130 [] handle_sysrq+0x17/0x19 [] kbd_event+0x32e/0x57d [] input_event+0x42d/0x45b [] atkbd_interrupt+0x44d/0x53d [] serio_interrupt+0x49/0x86 [] i8042_interrupt+0x202/0x21a [] handle_IRQ_event+0x2c/0x64 [] __do_IRQ+0xaf/0x114 [] do_IRQ+0xf8/0x107 [] ret_from_intr+0x0/0xf DWARF2 unwinder stuck at ret_from_intr+0x0/0xf Leftover inexact backtrace: [] mwait_idle+0x3f/0x54 [] cpu_idle+0xa2/0xc5 [] rest_init+0x2b/0x2d [] start_kernel+0x24a/0x24c [] _sinittext+0x28b/0x292 Since we're shutting down anyway, don't bother being smart, just turn the thing off. Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74ae3221818eaf3884ceac931ba3cd2c00045483 Author: Alan Cox Date: Sat Sep 30 23:28:00 2006 -0700 [PATCH] cardbus: switch to ref counting/hotplug safe API Signed-off-by: Alan Cox Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df10f4edd5f097251c62f1d4a3adea778100b4a8 Author: Alan Cox Date: Sat Sep 30 23:27:59 2006 -0700 [PATCH] i2o: Switch to pci_get API Use the safe ref-counted API for the bridge check Signed-off-by: Alan Cox Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1aff0ecafb5e94515dc37849fd32a810554f34f4 Author: Alan Cox Date: Sat Sep 30 23:27:59 2006 -0700 [PATCH] ip2: use newer pci_get functions This is one of a series of patches I plan to gradually trickle into the tree which eliminates almost all remaining use of pci_find_* and lets me build a pci_find_* free kernel for all but some obscure ISDN and SCSI drivers. This is important as all pci_find_* users are not hotplug safe - even if they are not the device being plugged. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30cbc22217bb3d5d4c74c88127fbf595460bdb76 Author: Olaf Hering Date: Sat Sep 30 23:27:57 2006 -0700 [PATCH] update legacy io handling for pmac ppc can boot one single binary on prep, chrp and pmac boards. ppc64 can boot one single binary on pseries and G5 boards. pmac has no legacy io, probing for PC style legacy hardware (or accessing the legacy io area regulary) may lead to a hard crash: * add check for parport_pc, exit on pmac. 32bit chrp has no ->check_legacy_ioport, the probe is always called. 64bit chrp has check_legacy_ioport, check for a "parallel" node * add check for isapnp, only PReP boards may have real ISA slots. 32bit PReP will have no ->check_legacy_ioport, the probe is always called. * update code in i8042_platform_init. Run ->check_legacy_ioport first, always call request_region. No functional change. Remove whitespace before i8042_reset init. Signed-off-by: Olaf Hering Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Adam Belay Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c69c31270c35a6b8421a8e4ba81de1247ac6df95 Author: Corey Minyard Date: Sat Sep 30 23:27:56 2006 -0700 [PATCH] IPMI: per-channel command registration This patch adds the ability to register for a command per-channel in the IPMI driver. If your BMC supports multiple channels, incoming messages can be useful to have the ability to register to receive commands on a specific channel instead the current behaviour of all channels. Signed-off-by: David Barksdale Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54f67f631dfc25ca7a8b19200e34013abc974337 Author: Petr Vandrovec Date: Sat Sep 30 23:27:55 2006 -0700 [PATCH] Move ncpfs 32bit compat ioctl to ncpfs The ncp specific compat ioctls are clearly local to one file system, so the code can better live there. This version of the patch moves everything into the generic ioctl handler and uses it for both 32 and 64 bit calls. Signed-off-by: Arnd Bergmann Signed-off-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89bbc03c01f68e627a2b120963f136e2815f0d84 Author: Thomas Petazzoni Date: Sat Sep 30 23:27:54 2006 -0700 [PATCH] Prevent multiple inclusion of linux/sysrq.h Prevent multiple inclusions of include/linux/sysrq.h using traditional #ifndef..#endif. Signed-off-by: Thomas Petazzoni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 643f720cea989d2913fc0120a2384fecc1be1f9a Author: Pierre Ossman Date: Sat Sep 30 23:27:52 2006 -0700 [PATCH] mmc (mainly): add "or later" clause to licence statement. Clarify my (Pierre's) position on which GPL versions apply. The patch only touches the source files where I am the only major author. The people who have made the minor commits to the files have been contacted and have no issues with this change. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb48388337182013bce811b9c336e8e64b0c858b Author: Olaf Hering Date: Sat Sep 30 23:27:51 2006 -0700 [PATCH] remove SYSRQ_KEY and related defines from ppc/sh/h8300 Remove unused global SYSRQ_KEY from ppc and powerpc Remove unused define SYSRQ_KEY from sh/sh64 and h8300 Remove unused pckbd_sysrq_xlate and kbd_sysrq_xlate usage Signed-off-by: Olaf Hering Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4e040887b8f136d00e253dcf584667d8cd560a6 Author: Jiri Slaby Date: Sat Sep 30 23:27:50 2006 -0700 [PATCH] isicom: correct firmware loading - loading of firmware didn't fail when something went wrong (returned 0). - pointer to frame was incremented only by sizeof(frame) excluding its data contents -- bad idea. - tell the card we're ready just after checking is complete, not before. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f27100872b21e4cc70d07b96eeb3611b30bce63 Author: Diego Calleja Date: Sat Sep 30 23:27:49 2006 -0700 [PATCH] HOWTO: mention bughunting Signed-off-by: Diego Calleja Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 328a338f6f9943a0a77292315a25628b22f79fed Author: Rolf Eike Beer Date: Sat Sep 30 23:27:48 2006 -0700 [PATCH] rtc: remove superfluous call to call to cdev_del() If cdev_add() fails there is no good reason to call cdev_del(). Signed-off-by: Rolf Eike Beer Cc: Alessandro Zummo Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc088d10d02978641c7a2eecd18caf1e01e597b3 Author: Metathronius Galabant Date: Sat Sep 30 23:27:47 2006 -0700 [PATCH] cciss: remove unneeded spaces in output for attached volumes It removes the awkwards spaces after the "=" when displaying the geometry of the attached volumes. Before: cciss: using DAC cycles blocks= 286734240 block_size= 512 heads= 255, sectors= 32, cylinders= 35139 After: cciss: using DAC cycles blocks=286734240 block_size=512 heads=255, sectors=32, cylinders=35139 Signed-off-by: Metathronius Galabant Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a077c1a075473910928676ed95acb393259d9310 Author: Paul Fulghum Date: Sat Sep 30 23:27:46 2006 -0700 [PATCH] synclink_gt: increase max devices Increase maximum number of devices. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb10dc9ac7eea2c891df6b79b9ef1fbe59cb5429 Author: Paul Fulghum Date: Sat Sep 30 23:27:45 2006 -0700 [PATCH] synclink_gt: add bisync and monosync modes Add bisync and monosync serial protocol support to the synclink_gt driver. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c1fcfe229e99752c74efb945a4a3f560be04204 Author: Martin Schwidefsky Date: Sat Sep 30 23:27:45 2006 -0700 [PATCH] Directed yield: direct yield of spinlocks for s390. Use the new diagnose 0x9c in the spinlock implementation for s390. It yields the remaining timeslice of the virtual cpu that tries to acquire a lock to the virtual cpu that is the current holder of the lock. Signed-off-by: Martin Schwidefsky Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdc39363d33506b0e067d41fc91f89d186bdf7f7 Author: Martin Schwidefsky Date: Sat Sep 30 23:27:44 2006 -0700 [PATCH] Directed yield: direct yield of spinlocks for powerpc Powerpc already has a directed yield for CONFIG_PREEMPT="n". To make it work with CONFIG_PREEMPT="y" as well the _raw_{spin,read,write}_relax primitives need to be defined to call __spin_yield() for spinlocks and __rw_yield() for rw-locks. Acked-by: Paul Mackerras Signed-off-by: Martin Schwidefsky Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef6edc9746dc2bfdacf44eefd5f881179971c478 Author: Martin Schwidefsky Date: Sat Sep 30 23:27:43 2006 -0700 [PATCH] Directed yield: cpu_relax variants for spinlocks and rw-locks On systems running with virtual cpus there is optimization potential in regard to spinlocks and rw-locks. If the virtual cpu that has taken a lock is known to a cpu that wants to acquire the same lock it is beneficial to yield the timeslice of the virtual cpu in favour of the cpu that has the lock (directed yield). With CONFIG_PREEMPT="n" this can be implemented by the architecture without common code changes. Powerpc already does this. With CONFIG_PREEMPT="y" the lock loops are coded with _raw_spin_trylock, _raw_read_trylock and _raw_write_trylock in kernel/spinlock.c. If the lock could not be taken cpu_relax is called. A directed yield is not possible because cpu_relax doesn't know anything about the lock. To be able to yield the lock in favour of the current lock holder variants of cpu_relax for spinlocks and rw-locks are needed. The new _raw_spin_relax, _raw_read_relax and _raw_write_relax primitives differ from cpu_relax insofar that they have an argument: a pointer to the lock structure. Signed-off-by: Martin Schwidefsky Cc: Ingo Molnar Cc: Paul Mackerras Cc: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3e5fc91d9828a9b94a3992de47d47d2d2e34ec6 Author: Paul Collins Date: Sat Sep 30 23:27:41 2006 -0700 [PATCH] leds: turn LED off when changing triggers I was playing with LED triggers when I noticed that changing from heartbeat (or ide-disk) to "none" at the right moment would leave the LED stuck on. This is easy to reproduce by doing "find / >/dev/null" with the ide-disk trigger enabled and then switching to "none". Here is a patch that fixes the problem by explicitly turning the LED off after removing the existing trigger. Signed-off-by: Paul Collins Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd7bcea35e7efb108c34ee2b3840942a3749cadb Author: Jim Cromie Date: Sat Sep 30 23:27:40 2006 -0700 [PATCH] Doc/lockdep-design: explain display of {state-bits} Signed-off-by: Jim Cromie Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce584f913870bbad8779a1130d4be48698560bf0 Author: Andrew Morton Date: Sat Sep 30 23:27:39 2006 -0700 [PATCH] submit checklist: mention headers_check Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c53421b18f205c5f97c604ae55c6a921f034b0f6 Author: Alexey Dobriyan Date: Sat Sep 30 23:27:37 2006 -0700 [PATCH] proper flags type of spin_lock_irqsave() Convert various spin_lock_irqsave() callers to correctly use `unsigned long'. Signed-off-by: Alexey Dobriyan Cc: Miles Bader Cc: "Luck, Tony" Acked-by: Kyle McMartin Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5579f8c7d7e2c9eb62b566c511b21091a778157 Author: Josef 'Jeff' Sipek Date: Sat Sep 30 23:27:35 2006 -0700 [PATCH] VFS: Use SEEK_{SET, CUR, END} instead of hardcoded values VFS: Use SEEK_{SET,CUR,END} instead of hardcoded values Signed-off-by: Josef 'Jeff' Sipek Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4636d93b461779cd95156cc5f5d53690a5d6a07b Author: Josef 'Jeff' Sipek Date: Sat Sep 30 23:27:34 2006 -0700 [PATCH] EICON ISDN: Removed unused definitions for OS_SEEK_* EICON ISDN: Removed unused definitions for OS_SEEK_* Signed-off-by: Josef 'Jeff' Sipek Cc: Karsten Keil Acked-by: Armin Schindler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 930ff81c595e7923575cd7c0b8d7284ac1b3815e Author: Josef 'Jeff' Sipek Date: Sat Sep 30 23:27:33 2006 -0700 [PATCH] MBCS: Use SEEK_{SET, CUR, END} instead of hardcoded values MBCS: Use SEEK_{SET,CUR,END} instead of hardcoded values Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edceeaf50be1764db4aa7c1b19e540067a051e77 Author: Alan Cox Date: Sat Sep 30 23:27:32 2006 -0700 [PATCH] via* : switch to pci_get_device refcounted PCI API If we can clean up these remainders we can finally delete pci_find_* Signed-off-by: Alan Cox Cc: Greg KH Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40cddf2cbd02aa830254afcd5a1a21b4e882a189 Author: Alan Cox Date: Sat Sep 30 23:27:30 2006 -0700 [PATCH] sis5513: Switch to pci refcounting Mirrors the drivers/ata version, hold a reference to the host bridge while we are doing setup. Signed-off-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 970a61363be4a6633de0fbbe6fe3a249238c4acc Author: Alan Cox Date: Sat Sep 30 23:27:29 2006 -0700 [PATCH] serverworks: Switch to pci refcounted interfaces As we don't support hotplug we end up leaking an isa_dev reference which if unload was ever added we would drop at the end of unloading. This is fine because we do genuinely need the isa_dev pointer until unload. Signed-off-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1424e5044882f92b8c51540033b229723e1f2651 Author: Alan Cox Date: Sat Sep 30 23:27:28 2006 -0700 [PATCH] piix: Use refcounted interface when searching for a 450NX Simple conversion Signed-off-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a78b464a283e55feb286647d9662f5cb8f235500 Author: Alan Cox Date: Sat Sep 30 23:27:27 2006 -0700 [PATCH] cs46xx OSS: switch to pci_get_device Fairly trivial change in this case Signed-off-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14fef6414be49d59f4784eeef8d9c3f468993205 Author: Alan Cox Date: Sat Sep 30 23:27:26 2006 -0700 [PATCH] via82cxxx_audio: Use pci_get_device pci_find_device is not refcounting and should be getting killed off. Signed-off-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2443ab6c485701576e9116ee44817e66adafd5a Author: Ross Biro Date: Sat Sep 30 23:27:25 2006 -0700 [PATCH] allow /proc/config.gz to be built as a module The driver for /proc/config.gz consumes rather a lot of memory and it is in fact possible to build it as a module. In some ways this is a bit risky, because the .config which is used for compiling kernel/configs.c isn't necessarily the same as the .config which was used to build vmlinux. But OTOH the potential memory savings are decent, and it'd be fairly dumb to build your configs.o with a different .config. Signed-off-by: Andrew Morton Cc: "Randy.Dunlap" Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 756184b7d771992f4fb1998d62aebcaf3e028076 Author: Cal Peake Date: Sat Sep 30 23:27:24 2006 -0700 [PATCH] CodingStyle cleanup for kernel/sys.c Fix up kernel/sys.c to be consistent with CodingStyle and the rest of the file. Signed-off-by: Cal Peake Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7bce3097c0f9bbed76ee6fd03742f2624031a45 Author: Alan Cox Date: Sat Sep 30 23:27:24 2006 -0700 [PATCH] serial: Fix up offenders peering at baud bits directly Stop some other people peering into the baud bits on their own and make them use the tty_get_baud_rate() helper as a preperation for the move to the new termios. Corrected dependancy previous one had on new termios structs Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00988a3514bbc0cce781c067cf52559741d88b80 Author: Mike Miller (OS Dev) Date: Sat Sep 30 23:27:23 2006 -0700 [PATCH] cciss: support for >2TB logical volumes Add support for logical volumes >2TB. All SAS/SATA controllers support large volumes. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82b0547cfae1fb2ee26cad588f6d49a347d24740 Author: Alexey Dobriyan Date: Sat Sep 30 23:27:22 2006 -0700 [PATCH] Create fs/utimes.c * fs/open.c is getting bit crowdy * preparation to lutimes(2) Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52978be636374c4bfb61220b37fa12f55a071c46 Author: Alexey Dobriyan Date: Sat Sep 30 23:27:21 2006 -0700 [PATCH] kmemdup: some users Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a2f67b459bb7846d4a15924face63eb2683acc2 Author: Alexey Dobriyan Date: Sat Sep 30 23:27:20 2006 -0700 [PATCH] kmemdup: introduce One of idiomatic ways to duplicate a region of memory is dst = kmalloc(len, GFP_KERNEL); if (!dst) return -ENOMEM; memcpy(dst, src, len); which is neat code except a programmer needs to write size twice. Which sometimes leads to mistakes. If len passed to kmalloc is smaller that len passed to memcpy, it's straight overwrite-beyond-end. If len passed to memcpy is smaller than len passed to kmalloc, it's either a) legit behaviour ;-), or b) cloned buffer will contain garbage in second half. Slight trolling of commit lists shows several duplications bugs done exactly because of diverged lenghts: Linux: [CRYPTO]: Fix memcpy/memset args. [PATCH] memcpy/memset fixes OpenBSD: kerberosV/src/lib/asn1: der_copy.c:1.4 If programmer is given only one place to play with lengths, I believe, such mistakes could be avoided. With kmemdup, the snippet above will be rewritten as: dst = kmemdup(src, len, GFP_KERNEL); if (!dst) return -ENOMEM; This also leads to smaller code (kzalloc effect). Quick grep shows 200+ places where kmemdup() can be used. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9442e691e4aec85eba43ac60a3e77c77fd2e73a4 Author: Takashi Iwai Date: Sat Sep 30 23:27:19 2006 -0700 [PATCH] maximum latency tracking: ALSA support Add maximum latency tracking to the ALSA subsystem for PCM playback. In ALSA, the playback application controls the buffer size and thus indirectly the period of latency that it can deal with. This patch uses 75% of the total available latency as threshold to announce to the latency subsystem; While 75% is a crude heuristic it's a quite reasonable one; the remaining 25% can be used for all driver processing for the next samples which is also proportional to the size of the buffer. With ogg123 a latency setting of about 4msec was seen (at 44Khz), while with the "play" command a much longer maximum tolerable latency was seen. Other, more multimedia oriented players as well as games, will have a lot smaller buffers to allow better synchronization and those will actually get into the latency domains where there is impact on the power management rules. Signed-off-by: Takashi Iwai Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c87579e65ee4f419b2369407f82326d38b5d2d8 Author: Arjan van de Ven Date: Sat Sep 30 23:27:17 2006 -0700 [PATCH] maximum latency tracking infrastructure Add infrastructure to track "maximum allowable latency" for power saving policies. The reason for adding this infrastructure is that power management in the idle loop needs to make a tradeoff between latency and power savings (deeper power save modes have a longer latency to running code again). The code that today makes this tradeoff just does a rather simple algorithm; however this is not good enough: There are devices and use cases where a lower latency is required than that the higher power saving states provide. An example would be audio playback, but another example is the ipw2100 wireless driver that right now has a very direct and ugly acpi hook to disable some higher power states randomly when it gets certain types of error. The proposed solution is to have an interface where drivers can * announce the maximum latency (in microseconds) that they can deal with * modify this latency * give up their constraint and a function where the code that decides on power saving strategy can query the current global desired maximum. This patch has a user of each side: on the consumer side, ACPI is patched to use this, on the producer side the ipw2100 driver is patched. A generic maximum latency is also registered of 2 timer ticks (more and you lose accurate time tracking after all). While the existing users of the patch are x86 specific, the infrastructure is not. I'd like to ask the arch maintainers of other architectures if the infrastructure is generic enough for their use (assuming the architecture has such a tradeoff as concept at all), and the sound/multimedia driver owners to look at the driver facing API to see if this is something they can use. [akpm@osdl.org: cleanups] Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Acked-by: Jesse Barnes Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 130c6b98984a058068ea595c465fba2beb48b9ef Author: Richard Knutsson Date: Sat Sep 30 23:27:15 2006 -0700 [PATCH] fs/partitions: Conversion to generic boolean Conversion of booleans to: generic-boolean.patch (2006-08-23) Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d81715fc5dfa1680ad47d7edf3ac4a74c5bf104 Author: Richard Knutsson Date: Sat Sep 30 23:27:14 2006 -0700 [PATCH] fs/jfs: Conversion to generic boolean Conversion of booleans to: generic-boolean.patch (2006-08-23) Signed-off-by: Richard Knutsson Cc: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c49c31115067bc7c9a51ffdc735a515151dfa3eb Author: Richard Knutsson Date: Sat Sep 30 23:27:12 2006 -0700 [PATCH] fs/ntfs: Conversion to generic boolean Conversion of booleans to: generic-boolean.patch (2006-08-23) Signed-off-by: Richard Knutsson Signed-off-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e21828743247270d09a86756a0c11702500dbfb Author: Richard Knutsson Date: Sat Sep 30 23:27:11 2006 -0700 [PATCH] Generic boolean This patch defines: * a generic boolean-type, named 'bool' * aliases to 0 and 1, named 'false' and 'true' Removing colliding definitions of 'bool', 'false' and 'true'. Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be5b7a8987f23281b146f22b13e2079f448c69c7 Author: Andrew Morton Date: Sat Sep 30 23:27:10 2006 -0700 [PATCH] arch/i386/pci/mmconfig.c tweaks - Add soothing comment - uninline thrice-called function Cc: OGAWA Hirofumi Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45e0b78b0532f92c01e363dd4287617c5be4574f Author: Keith Mannthey Date: Sat Sep 30 23:27:09 2006 -0700 [PATCH] hot-add-mem x86_64: use CONFIG_MEMORY_HOTPLUG_RESERVE The api for hot-add memory already has a construct for finding nodes based on an address, memory_add_physaddr_to_nid. This patch allows the fucntion to do something besides return 0. It uses the nodes_add infomation to lookup to node info for a hot add event. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53947027ad90542ddb2bb746e3175827c270610a Author: Keith Mannthey Date: Sat Sep 30 23:27:08 2006 -0700 [PATCH] hot-add-mem x86_64: use CONFIG_MEMORY_HOTPLUG_SPARSE Migate CONFIG_MEMORY_HOTPLUG to CONFIG_MEMORY_HOTPLUG_SPARSE where needed. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c2676a5870ab15cbeea9f826266bc946fe3cc26 Author: Keith Mannthey Date: Sat Sep 30 23:27:07 2006 -0700 [PATCH] hot-add-mem x86_64: memory_add_physaddr_to_nid node fixup In cases where the acpi memory-add event does not containe the pxm (node) infomation allow the driver to look up node info based on the address. The acpi_get_node call returns -1 if it can't decode the pxm info, this causes add_memory to panic. acpi_get_node would have to decode the resource from the handle (a lenghty proposition). This seems to be the cleanist point to interject the hook. [kamezawa.hiroyu@jp.fujitsu.com: build fixes] [y-goto@jp.fujitsu.com: build fixes] Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4942e998b40b8f6080930ec16442444e9930aee5 Author: Keith Mannthey Date: Sat Sep 30 23:27:06 2006 -0700 [PATCH] hot-add-mem x86_64: memory_add_physaddr_to_nid enable The api for hot-add memory already has a construct for finding nodes based on an address, memory_add_physaddr_to_nid. This patch allows the fucntion to do something besides return 0. It uses the nodes_add infomation to lookup to node info for a hot add event. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71efa8fdc55e70ec6687c897a30759f0a2c2ad7e Author: Keith Mannthey Date: Sat Sep 30 23:27:05 2006 -0700 [PATCH] hot-add-mem x86_64: Enable SPARSEMEM in srat.c Enable x86_64 srat.c to share code between both reserve and sparsemem based add memory paths. Both paths need the hot-add area node locality infomration (nodes_add). This code refactors the code path to allow this. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec69acbb1191df671ff8e07c8e146619a5c53f70 Author: Keith Mannthey Date: Sat Sep 30 23:27:05 2006 -0700 [PATCH] hot-add-mem x86_64: Kconfig changes Create Kconfig namespace for MEMORY_HOTPLUG_RESERVE and MEMORY_HOTPLUG_SPARSE. This is needed to create a disticiton between the 2 paths. Selecting the high level opiton of MEMORY_HOTPLUG will get you MEMORY_HOTPLUG_SPARSE if you have sparsemem enabled or MEMORY_HOTPLUG_RESERVE if you are x86_64 with discontig and ACPI numa support. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f28c5edc06ecd8068b38b7662ad19f4d20d741af Author: Keith Mannthey Date: Sat Sep 30 23:27:04 2006 -0700 [PATCH] hot-add-mem x86_64: fixup externs Fix up externs in memory_hotplug.c. Cleanup. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 236561e5df009f79f1939e3ca269b9b6f18092f5 Author: Alan Cox Date: Sat Sep 30 23:27:03 2006 -0700 [PATCH] PCI quirks update This fixes two things Firstly someone mistakenly used "errata" for the singular. This causes Dave Woodhouse to emit diagnostics whenever the string is read, and so should be fixed. Secondly the AMD AGP tunnel has an erratum which causes hangs if you try and do direct PCI to AGP transfers in some cases. We have a flag for PCI/PCI failures but we need a different flag for this really as in this case we don't want to stop PCI/PCI transfers using things like IOAT and the new RAID offload work. I'll post some updates to make proper use of the PCIAGP flag in the media/video drivers to Mauro. Signed-off-by: Alan Cox Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fcd03e07008ec0f667dfb7626171165699ea5c2 Author: Gavin Lambert Date: Sat Sep 30 23:27:01 2006 -0700 [PATCH] NOMMU: don't try and give NULL to fput() Don't try and give NULL to fput() in the error handling in do_mmap_pgoff() as it'll cause an oops. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab8e92efcf3f7972f30033cad75f180aef4f3abc Author: Andrew Morton Date: Sat Sep 30 23:26:59 2006 -0700 [PATCH] list_del-debug fix These two BUG_ON()s are redundant and undesired: we're checking for this condition further on in the function, only better. Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfeeb0f57940b143a55dcc7ee88e8842108d9145 Author: Dave Jones Date: Sat Sep 30 23:19:38 2006 -0400 [CPUFREQ] Make acpi-cpufreq unsticky again. This caused suspend/resume regressions. Signed-off-by: Dave Jones commit 18f75ca0dc0d5b6a2ec15d89d517b3c67e0f1c87 Author: Steve French Date: Sun Oct 1 03:13:01 2006 +0000 [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit 1bdfd554be94def718323659173517c5d4a69d25 Author: Jeff Garzik Date: Sat Sep 30 21:28:22 2006 -0400 [PATCH] SCSI: fix request flag-related build breakage The ->flags in struct request was split into two variables, in a recent changeset. The merge of this change forgot to update SCSI's libsas, probably because libsas was a very recent merge. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit cb5d9e0948122dd8b808550574d95bd60674ba3b Author: Andrew Morton Date: Sat Sep 30 21:23:44 2006 -0400 [PATCH] scsi: device_reprobe() can fail device_reprobe() should return an error code. When it does so, scsi_device_reprobe() should propagate it back. Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit 51d7513a8a54e4210d358ff1dbd34daab99a6638 Author: Jens Axboe Date: Sat Sep 30 21:14:05 2006 +0200 [PATCH] Only enable CONFIG_BLOCK option for embedded It's too easy for people to shoot themselves in the foot, and it only makes sense for embedded folks anyway. Signed-off-by: Jens Axboe commit 059af497c23492cb1ddcbba11c09dad385960bc0 Author: Jens Axboe Date: Thu Sep 21 20:37:22 2006 +0200 [PATCH] blk_queue_start_tag() shared map race fix If we share the tag map between two or more queues, then we cannot use __set_bit() to set the bit. In fact we need to make sure we atomically acquire this tag, so loop using test_and_set_bit() to protect from that. Noticed by Mike Christie Signed-off-by: Jens Axboe commit 0fe23479577124bd2687e6783e39fa0fa4c28005 Author: Jens Axboe Date: Mon Sep 4 15:41:16 2006 +0200 [PATCH] Update axboe@suse.de email address As people often look for the copyright in files to see who to mail, update the link to a neutral one. Signed-off-by: Jens Axboe commit 50be345560f1ffdcb15cc0e146416b80529a2ef2 Author: Milan Broz Date: Mon Sep 4 15:37:57 2006 +0200 [PATCH] fix creating zero sized bio mempools in low memory system In the very low memory systems is in the init_bio call scale parameter set to zero and it leads to creating zero sized mempool. This patch prevents pool_entries parameter become zero, so the created pool have at least 1 entry. Mempool with 0 entries lead to incorrect behaviour of mempool_free. (Alloc requests are not waken up and system stalls in mempool_alloc->ioschedule). Signed-off-by: Milan Broz Signed-off-by: Jens Axboe commit bcfd8d36151e531e1c6c731f1fbf792509a1c494 Author: Andrew Morton Date: Thu Aug 31 12:56:06 2006 +0200 [PATCH] CONFIG_BLOCK: blk_congestion_wait() fix Don't just do nothing: it'll cause busywaits all over writeback and page reclaim. For now, take a fixed-length nap. Will improve when NFS starts waking up throttled processes. Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 5e6d12b2c8be2cac099df6dcb8b26884f24d2621 Author: Andrew Morton Date: Thu Aug 31 12:55:23 2006 +0200 [PATCH] CONFIG_BLOCK internal.h cleanups - forward declare struct superblock - use inlines, not macros Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 65934a9a028b88e83e2b0f8b36618fe503349f8e Author: David Howells Date: Tue Aug 29 19:06:31 2006 +0100 [PATCH] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6] This makes CONFIG_USB_STORAGE depend on CONFIG_SCSI rather than selecting it, as selecting it makes CONFIG_USB_STORAGE override the dependencies of SCSI, causing it to turn on even if they aren't all met. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 9361401eb7619c033e2394e4f9f6d410d6719ac7 Author: David Howells Date: Sat Sep 30 20:45:40 2006 +0200 [PATCH] BLOCK: Make it possible to disable the block layer [try #6] Make it possible to disable the block layer. Not all embedded devices require it, some can make do with just JFFS2, NFS, ramfs, etc - none of which require the block layer to be present. This patch does the following: (*) Introduces CONFIG_BLOCK to disable the block layer, buffering and blockdev support. (*) Adds dependencies on CONFIG_BLOCK to any configuration item that controls an item that uses the block layer. This includes: (*) Block I/O tracing. (*) Disk partition code. (*) All filesystems that are block based, eg: Ext3, ReiserFS, ISOFS. (*) The SCSI layer. As far as I can tell, even SCSI chardevs use the block layer to do scheduling. Some drivers that use SCSI facilities - such as USB storage - end up disabled indirectly from this. (*) Various block-based device drivers, such as IDE and the old CDROM drivers. (*) MTD blockdev handling and FTL. (*) JFFS - which uses set_bdev_super(), something it could avoid doing by taking a leaf out of JFFS2's book. (*) Makes most of the contents of linux/blkdev.h, linux/buffer_head.h and linux/elevator.h contingent on CONFIG_BLOCK being set. sector_div() is, however, still used in places, and so is still available. (*) Also made contingent are the contents of linux/mpage.h, linux/genhd.h and parts of linux/fs.h. (*) Makes a number of files in fs/ contingent on CONFIG_BLOCK. (*) Makes mm/bounce.c (bounce buffering) contingent on CONFIG_BLOCK. (*) set_page_dirty() doesn't call __set_page_dirty_buffers() if CONFIG_BLOCK is not enabled. (*) fs/no-block.c is created to hold out-of-line stubs and things that are required when CONFIG_BLOCK is not set: (*) Default blockdev file operations (to give error ENODEV on opening). (*) Makes some /proc changes: (*) /proc/devices does not list any blockdevs. (*) /proc/diskstats and /proc/partitions are contingent on CONFIG_BLOCK. (*) Makes some compat ioctl handling contingent on CONFIG_BLOCK. (*) If CONFIG_BLOCK is not defined, makes sys_quotactl() return -ENODEV if given command other than Q_SYNC or if a special device is specified. (*) In init/do_mounts.c, no reference is made to the blockdev routines if CONFIG_BLOCK is not defined. This does not prohibit NFS roots or JFFS2. (*) The bdflush, ioprio_set and ioprio_get syscalls can now be absent (return error ENOSYS by way of cond_syscall if so). (*) The seclvl_bd_claim() and seclvl_bd_release() security calls do nothing if CONFIG_BLOCK is not set, since they can't then happen. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit d366e40a1cabd453be6e2609caa7e12f9ca17b1f Author: David Howells Date: Tue Aug 29 19:06:29 2006 +0100 [PATCH] BLOCK: Remove no-longer necessary linux/buffer_head.h inclusions [try #6] Remove inclusions of linux/buffer_head.h that are no longer necessary due to the transfer of a number of things out of there. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 4cb50dc2eaeddb0bc20bc4cd108c4fec99f5045a Author: David Howells Date: Tue Aug 29 19:06:27 2006 +0100 [PATCH] BLOCK: Remove no-longer necessary linux/mpage.h inclusions [try #6] Remove inclusions of linux/mpage.h that are no longer necessary due to the transfer of generic_writepages(). Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 188f83dfe0eeecd1427d0d255cc97dbf7ef6b4b7 Author: David Howells Date: Thu Aug 31 12:50:04 2006 +0200 [PATCH] BLOCK: Move the msdos device ioctl compat stuff to the msdos driver [try #6] Move the msdos device ioctl compat stuff from fs/compat_ioctl.c to the msdos driver so that the msdos header file doesn't need to be included. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 52a700c5675f399c07e6e57328291e57f13ef3bb Author: David Howells Date: Tue Aug 29 19:06:23 2006 +0100 [PATCH] BLOCK: Move the Ext3 device ioctl compat stuff to the Ext3 driver [try #6] Move the Ext3 device ioctl compat stuff from fs/compat_ioctl.c to the Ext3 driver so that the Ext3 header file doesn't need to be included. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit e322ff07fb2d0f05c02d85e7c6b30d23f308c20f Author: David Howells Date: Tue Aug 29 19:06:20 2006 +0100 [PATCH] BLOCK: Move the Ext2 device ioctl compat stuff to the Ext2 driver [try #6] Move the Ext2 device ioctl compat stuff from fs/compat_ioctl.c to the Ext2 driver so that the Ext2 header file doesn't need to be included. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 52b499c438ff60991eb3855ca090782569b3e8cf Author: David Howells Date: Tue Aug 29 19:06:18 2006 +0100 [PATCH] BLOCK: Move the ReiserFS device ioctl compat stuff to the ReiserFS driver [try #6] Move the ReiserFS device ioctl compat stuff from fs/compat_ioctl.c to the ReiserFS driver so that the ReiserFS header file doesn't need to be included. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 36695673b012096228ebdc1b39a6a5850daa474e Author: David Howells Date: Tue Aug 29 19:06:16 2006 +0100 [PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6] Move common FS-specific ioctls from linux/ext2_fs.h to linux/fs.h as FS_IOC_* and FS_IOC32_* and have the users of them use those as a base. Also move the GETFLAGS/SETFLAGS flags to linux/fs.h as FS_*_FL macros, and then have the other users use them as a base. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 863d5b822c02d0e7215fb84ca79e9f8c3e35f04e Author: David Howells Date: Tue Aug 29 19:06:14 2006 +0100 [PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6] Move the loop device ioctl compat stuff from fs/compat_ioctl.c to the loop driver so that the loop header file doesn't need to be included. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit b71e8a4ce03b3098c7801ee5e6e08d1a39a226c2 Author: David Howells Date: Tue Aug 29 19:06:11 2006 +0100 [PATCH] BLOCK: Move __invalidate_device() to block_dev.c [try #6] Move __invalidate_device() from fs/inode.c to fs/block_dev.c so that it can more easily be disabled when the block layer is disabled. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 811d736f9e8013966e1a5a930c0db09508bdbb15 Author: David Howells Date: Tue Aug 29 19:06:09 2006 +0100 [PATCH] BLOCK: Dissociate generic_writepages() from mpage stuff [try #6] Dissociate the generic_writepages() function from the mpage stuff, moving its declaration to linux/mm.h and actually emitting a full implementation into mm/page-writeback.c. The implementation is a partial duplicate of mpage_writepages() with all BIO references removed. It is used by NFS to do writeback. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 7b0de42d7c5a471741ede4e71727d88000e6ea59 Author: David Howells Date: Tue Aug 29 19:06:07 2006 +0100 [PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6] Move blockdev_superblock extern declaration from fs/fs-writeback.c to a headerfile and remove the dependence on it by wrapping it in a macro. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 07f3f05c1e3052b8656129b2a5aca9f888241a34 Author: David Howells Date: Sat Sep 30 20:52:18 2006 +0200 [PATCH] BLOCK: Move extern declarations out of fs/*.c into header files [try #6] Create a new header file, fs/internal.h, for common definitions local to the sources in the fs/ directory. Move extern definitions that should be in header files from fs/*.c to fs/internal.h or other main header files where they span directories. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 65e6f5bc8149165efb9d7bdbd142bb837d5edfeb Author: David Howells Date: Tue Aug 29 19:06:03 2006 +0100 [PATCH] BLOCK: Don't call block_sync_page() from AFS [try #6] The AFS filesystem no longer needs to override its sync_page() op. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 831058dec3735665fe91bd0d37b6a8cf56b91abd Author: David Howells Date: Tue Aug 29 19:06:00 2006 +0100 [PATCH] BLOCK: Separate the bounce buffering code from the highmem code [try #6] Move the bounce buffer code from mm/highmem.c to mm/bounce.c so that it can be more easily disabled when the block layer is disabled. !!!NOTE!!! There may be a bug in this code: Should init_emergency_pool() be contingent on CONFIG_HIGHMEM? Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit b398f6bff93a247d2a7099e92905374966e4558f Author: David Howells Date: Tue Aug 29 19:05:58 2006 +0100 [PATCH] BLOCK: Stop fallback_migrate_page() from using page_has_buffers() [try #6] Stop fallback_migrate_page() from using page_has_buffers() since that might not be available. Use PagePrivate() instead since that's more general. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 0d67a46df0125e20d14f12dbd3646f1f1bf23e8c Author: David Howells Date: Tue Aug 29 19:05:56 2006 +0100 [PATCH] BLOCK: Remove duplicate declaration of exit_io_context() [try #6] Remove the duplicate declaration of exit_io_context() from linux/sched.h. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit cf9a2ae8d49948f861b56e5333530e491a9da190 Author: David Howells Date: Tue Aug 29 19:05:54 2006 +0100 [PATCH] BLOCK: Move functions out of buffer code [try #6] Move some functions out of the buffering code that aren't strictly buffering specific. This is a precursor to being able to disable the block layer. (*) Moved some stuff out of fs/buffer.c: (*) The file sync and general sync stuff moved to fs/sync.c. (*) The superblock sync stuff moved to fs/super.c. (*) do_invalidatepage() moved to mm/truncate.c. (*) try_to_release_page() moved to mm/filemap.c. (*) Moved some related declarations between header files: (*) declarations for do_invalidatepage() and try_to_release_page() moved to linux/mm.h. (*) __set_page_dirty_buffers() moved to linux/buffer_head.h. Signed-Off-By: David Howells Signed-off-by: Jens Axboe commit 4090959aee403817ff386415f9bc602c1a0882ef Author: Martin Peschke Date: Tue Aug 29 19:52:55 2006 +0200 [PATCH] blktrace: cleanup using on_each_cpu This patch kills a few lines of code in blktrace by making use of on_each_cpu(). Signed-off-by: Martin Peschke Signed-off-by: Jens Axboe commit cf342e52e3117391868fb4bd900ce772a27a5a1a Author: Oleg Nesterov Date: Tue Aug 29 09:17:41 2006 +0200 [PATCH] Don't need to disable interrupts for tasklist_lock Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit 25034d7a83cf77667f3d65822484b305d4be6b25 Author: Oleg Nesterov Date: Tue Aug 29 09:15:14 2006 +0200 [PATCH] exit_io_context: don't disable irqs We don't need to disable irqs to clear current->io_context, it is protected by ->alloc_lock. Even IF it was possible to submit I/O from IRQ on behalf of current this irq_disable() can't help: current_io_context() will re-instantiate ->io_context after irq_enable(). We don't need task_lock() or local_irq_disable() to clear ioc->task. This can't prevent other CPUs from playing with our io_context anyway. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit 9bf09c23853bb8009625c2ec60dc6beb9472d3ca Author: Jens Axboe Date: Sat Sep 30 20:31:11 2006 +0200 [PATCH] SCSI: scsi_done_q is unused It is a leftover from before the softirq completion was migrated to the block layer. Signed-off-by: Jens Axboe commit 7457e6e2d7406c7009e9ad03db1335fe93b5fb71 Author: Jens Axboe Date: Sun Jul 23 02:12:01 2006 +0200 [PATCH] blktrace: support for logging metadata reads Signed-off-by: Jens Axboe commit 374f84ac39ec7829a57a66efd5125d3561ff0e00 Author: Jens Axboe Date: Sun Jul 23 01:42:19 2006 +0200 [PATCH] cfq-iosched: use metadata read flag Give meta data reads preference over regular reads, as the process often needs to get that out of the way to do the io it was actually interested in. Signed-off-by: Jens Axboe commit caa38fb0f481a3cb732b115cb59bfa6b59b6daaf Author: Jens Axboe Date: Sun Jul 23 01:41:26 2006 +0200 [PATCH] ext3: make meta data reads use READ_META Signed-off-by: Jens Axboe commit 5404bc7a87b9949cf61e0174b21f80e73239ab25 Author: Jens Axboe Date: Thu Aug 10 09:01:02 2006 +0200 [PATCH] Allow file systems to differentiate between data and meta reads We can use this information for making more intelligent priority decisions, and it will also be useful for blktrace. Signed-off-by: Jens Axboe commit da20a20f3b5c175648fa797c899dd577e4dacb51 Author: Jens Axboe Date: Fri Jul 21 20:30:28 2006 +0200 [PATCH] ll_rw_blk: allow more flexibility for read_ahead_kb store It can make sense to set read-ahead larger than a single request. We should not be enforcing such policy on the user. Additionally, using the BLKRASET ioctl doesn't impose such a restriction. So additionally we now expose identical behaviour through the two. Issue also reported by Anton Signed-off-by: Jens Axboe commit bf57225670bcbeb357182d800736b4782cde7295 Author: Jens Axboe Date: Wed Jul 19 20:29:12 2006 +0200 [PATCH] cfq-iosched: improve queue preemption Don't touch the current queues, just make sure that the wanted queue is selected next. Simplifies the logic. Signed-off-by: Jens Axboe commit dc72ef4ae35c2016fb594bcc85ce871376682174 Author: Jens Axboe Date: Thu Jul 20 14:54:05 2006 +0200 [PATCH] Add blk_start_queueing() helper CFQ implements this on its own now, but it's really block layer knowledge. Tells a device queue to start dispatching requests to the driver, taking care to unplug if needed. Also fixes the issue where as/cfq will invoke a stopped queue, which we really don't want. Signed-off-by: Jens Axboe commit 981a79730d586335ef8f942c83bdf2b1de6d4e3d Author: Jens Axboe Date: Wed Jul 19 14:56:28 2006 +0200 [PATCH] cfq-iosched: kill the empty_list No point in having a place holder list just for empty queues, so remove it. It's not used for anything other than to keep ->cfq_list busy. Signed-off-by: Jens Axboe commit 53b03744e5699832e6c5b04f2ec506d8b0c50c38 Author: Jens Axboe Date: Fri Jul 28 09:48:51 2006 +0200 [PATCH] cfq-iosched: Kill O(N) runtime of cfq_resort_rr_list() Currently it scales with number of processes in that priority group, which is potentially not very nice as it's called quite often. Basically we always need to do tail inserts, except for the case of a new process. So just mark/detect a queue as such. Signed-off-by: Jens Axboe commit b5deef901282628d88c784f4c9d2f0583ec3b355 Author: Jens Axboe Date: Wed Jul 19 23:39:40 2006 +0200 [PATCH] Make sure all block/io scheduler setups are node aware Some were kmalloc_node(), some were still kmalloc(). Change them all to kmalloc_node(). Signed-off-by: Jens Axboe commit a3b05e8f58c95dfccbf2c824d0c68e5990571f24 Author: Jens Axboe Date: Fri Jul 28 09:36:46 2006 +0200 [PATCH] Kill various deprecated/unused block layer defines/functions Signed-off-by: Jens Axboe commit 1ea25ecb7256978947c258f08a30c878eebe9edb Author: Jens Axboe Date: Tue Jul 18 22:24:11 2006 +0200 [PATCH] Audit block layer inlines Kill a few inlines that bring in too much code to more than one location Shrinks kernel text by about 300 bytes on 32-bit x86. Signed-off-by: Jens Axboe commit 4050cf1674c632c73801a561689543d4887df2ef Author: Jens Axboe Date: Wed Jul 19 05:07:12 2006 +0200 [PATCH] cfq-iosched: use new io context counting mechanism It's ok if the read path is a lot more costly, as long as inc/dec is really cheap. The inc/dec will happen for each created/freed io context, while the reading only happens when a disk queue exits. Signed-off-by: Jens Axboe commit e4313dd423148fa729571b50c06cbc0bedf5c494 Author: Jens Axboe Date: Wed Jul 19 05:10:01 2006 +0200 [PATCH] as-iosched: use new io context counting mechanism It's ok if the read path is a lot more costly, as long as inc/dec is really cheap. The inc/dec will happen for each created/freed io context, while the reading only happens when a disk queue exits. Signed-off-by: Jens Axboe commit 4a893e837bb470867d74c05d6c6b97bba5a96185 Author: Jens Axboe Date: Sat Jul 22 15:37:43 2006 +0200 [PATCH] elevator: define ioc counting mechanism None of the in-kernel primitives for handling "atomic" counting seem to be a good fit. We need something that is essentially free for incrementing/decrementing, while the read side may be more expensive as we only ever need to do that when a device is removed from the kernel. Use a per-cpu variable for maintaining a per-cpu ioc count and define a reading mechanism that just sums up the values. Signed-off-by: Jens Axboe commit fc46379daf90dce57bf765c81d3b39f55150aac2 Author: Jens Axboe Date: Tue Aug 29 09:05:44 2006 +0200 [PATCH] cfq-iosched: kill cfq_exit_lock cfq_exit_lock is protecting two things now: - The per-ioc rbtree of cfq_io_contexts - The per-cfqd linked list of cfq_io_contexts The per-cfqd linked list can be protected by the queue lock, as it is (by definition) per cfqd as the queue lock is. The per-ioc rbtree is mainly used and updated by the process itself only. The only outside use is the io priority changing. If we move the priority changing to not browsing the rbtree, we can remove any locking from the rbtree updates and lookup completely. Let the sys_ioprio syscall just mark processes as having the iopriority changed and lazily update the private cfq io contexts the next time io is queued, and we can remove this locking as well. Signed-off-by: Jens Axboe commit 89850f7ee905410c89f9295e89dc4c33502a34ac Author: Jens Axboe Date: Sat Jul 22 16:48:31 2006 +0200 [PATCH] cfq-iosched: cleanups, fixes, dead code removal A collection of little fixes and cleanups: - We don't use the 'queued' sysfs exported attribute, since the may_queue() logic was rewritten. So kill it. - Remove dead defines. - cfq_set_active_queue() can be rewritten cleaner with else if conditions. - Several places had cfq_exit_cfqq() like logic, abstract that out and use that. - Annotate the cfqq kmem_cache_alloc() so the allocator knows that this is a repeat allocation if it fails with __GFP_WAIT set. Allows the allocator to start freeing some memory, if needed. CFQ already loops for this condition, so might as well pass the hint down. - Remove cfqd->rq_starved logic. It's not needed anymore after we dropped the crq allocation in cfq_set_request(). - Remove uneeded parameter passing. Signed-off-by: Jens Axboe commit e6a1c874a064e7d07f24986aba7cd537b7f4a25d Author: Jens Axboe Date: Thu Aug 10 09:00:21 2006 +0200 [PATCH] struct request: shrink and optimize some more Move some members around and unionize completion_data and rb_node since they cannot ever be used at the same time. Signed-off-by: Jens Axboe commit 51da90fcb6acd580e87280eaf4eb1f788021807d Author: Jens Axboe Date: Tue Jul 18 04:14:45 2006 +0200 [PATCH] ll_rw_blk: cleanup __make_request() - Don't assign variables that are only used once. - Kill spin_lock() prefetching, it's opportunistic at best. Signed-off-by: Jens Axboe commit cb78b285c8f9d59b0d4e4f6a54c2977ce1d9b880 Author: Jens Axboe Date: Fri Jul 28 09:32:57 2006 +0200 [PATCH] Drop useless bio passing in may_queue/set_request API It's not needed for anything, so kill the bio passing. Signed-off-by: Jens Axboe commit cdd6026217c0e4cda2efce1bdc318661bef1f66f Author: Jens Axboe Date: Fri Jul 28 09:32:07 2006 +0200 [PATCH] Remove ->rq_status from struct request After Christophs SCSI change, the only usage left is RQ_ACTIVE and RQ_INACTIVE. The block layer sets RQ_INACTIVE right before freeing the request, so any check for RQ_INACTIVE in a driver is a bug and indicates use-after-free. So kill/clean the remaining users, straight forward. Signed-off-by: Jens Axboe commit 49171e5c6f414d49a061b5c1c84967c2eb569822 Author: Jens Axboe Date: Thu Aug 10 08:59:11 2006 +0200 [PATCH] Remove struct request_list from struct request It is always identical to &q->rq, and we only use it for detecting whether this request came out of our mempool or not. So replace it with an additional ->flags bit flag. Signed-off-by: Jens Axboe commit c00895ab2f08df7044e58ee01c38bf0a661ea0eb Author: Jens Axboe Date: Sat Sep 30 20:29:12 2006 +0200 [PATCH] Remove ->waiting member from struct request As the comments indicates in blkdev.h, we can fold it into ->end_io_data usage as that is really what ->waiting is. Fixup the users of blk_end_sync_rq(). Signed-off-by: Jens Axboe commit 8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 Author: Jens Axboe Date: Tue Jul 18 21:07:29 2006 +0200 [PATCH] as-iosched: kill arq Get rid of the as_rq request type. With the added elevator_private2, we have enough room in struct request to get rid of any arq allocation/free for each request. Signed-off-by: Jens Axboe Signed-off-by: Nick Piggin commit 5e705374796e72b36e7bb9c59c8d46d2dc5db36a Author: Jens Axboe Date: Thu Jul 13 12:39:25 2006 +0200 [PATCH] cfq-iosched: kill crq Get rid of the cfq_rq request type. With the added elevator_private2, we have enough room in struct request to get rid of any crq allocation/free for each request. Signed-off-by: Jens Axboe commit ff7d145fd911266ae42af7552edc32681c01addb Author: Jens Axboe Date: Wed Jul 12 14:04:37 2006 +0200 [PATCH] Add one more pointer to struct request for IO scheduler usage Then we have enough room in the request to get rid of the dynamic allocations in CFQ/AS. Signed-off-by: Jens Axboe commit 5380a101d33d1d3a32c6b6bd2e17e5dd835842b0 Author: Jens Axboe Date: Thu Jul 13 12:37:56 2006 +0200 [PATCH] cfq-iosched: remove the crq flag functions/variable There's just one flag currently (SYNC), and that one can be grabbed from the request. Signed-off-by: Jens Axboe commit 8840faa1eebba22a9e2f86acddc0cf5145937df4 Author: Jens Axboe Date: Thu Jul 13 12:36:41 2006 +0200 [PATCH] deadline-iosched: remove elevator private drq request type A big win, we now save an allocation/free on each request! With the previous rb/hash abstractions, we can just reuse queuelist/donelist for the FIFO data and be done with it. Signed-off-by: Jens Axboe commit 9e2585a8a23f3a42f815b2a638725d85a921cd65 Author: Jens Axboe Date: Fri Jul 28 09:26:13 2006 +0200 [PATCH] as-iosched: remove arq->is_sync member We can track this in struct request. Signed-off-by: Jens Axboe Signed-off-by: Nick Piggin commit d4f2f4629ea6a003cd021a9ea1a8a23ec0cd70ac Author: Jens Axboe Date: Thu Jul 13 09:12:14 2006 +0200 [PATCH] as-iosched: reuse rq for fifo Saves some space in arq. Signed-off-by: Jens Axboe Signed-off-by: Nick Piggin commit 95e8810b283cfac50789126de4207f9909299de9 Author: Jens Axboe Date: Tue Jul 11 21:30:31 2006 +0200 [PATCH] cfq-iosched: convert to using the FIFO elevator defines Signed-off-by: Jens Axboe commit 1fbfdfcddff4df188b24d9d05271a76a85064583 Author: Jens Axboe Date: Tue Jul 11 21:49:15 2006 +0200 [PATCH] elevator: introduce a way to reuse rq for internal FIFO handling The io schedulers can use this instead of having to allocate space for it themselves. Signed-off-by: Jens Axboe commit b8aca35af5e9fbc2e41a3ba1b2e66f24e80ca9b6 Author: Jens Axboe Date: Thu Jul 13 12:34:24 2006 +0200 [PATCH] deadline-iosched: migrate to using the elevator rb functions This removes the rbtree handling from deadline. Signed-off-by: Jens Axboe commit 21183b07ee4be405362af8454f3647781c77df1b Author: Jens Axboe Date: Thu Jul 13 12:33:14 2006 +0200 [PATCH] cfq-iosched: migrate to using the elevator rb functions This removes the rbtree handling from CFQ. Signed-off-by: Jens Axboe commit e37f346e347e5035c80760df2be0fcb2824f6c16 Author: Jens Axboe Date: Tue Jul 18 21:06:01 2006 +0200 [PATCH] as-iosched: migrate to using the elevator rb functions This removes the rbtree handling from AS. Signed-off-by: Jens Axboe Signed-off-by: Nick Piggin commit 2e662b65f05d550b6799ed6bfa9963b82279e6b7 Author: Jens Axboe Date: Thu Jul 13 11:55:04 2006 +0200 [PATCH] elevator: abstract out the rbtree sort handling The rbtree sort/lookup/reposition logic is mostly duplicated in cfq/deadline/as, so move it to the elevator core. The io schedulers still provide the actual rb root, as we don't want to impose any sort of specific handling on the schedulers. Introduce the helpers and rb_node in struct request to help migrate the IO schedulers. Signed-off-by: Jens Axboe commit 10fd48f2376db52f08bf0420d2c4f580e39269e1 Author: Jens Axboe Date: Tue Jul 11 21:15:52 2006 +0200 [PATCH] rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev The conditions got reserved. Also make rb_next() and rb_prev() check for the empty condition. Signed-off-by: Jens Axboe commit 9817064b68fef7e4580c6df1ea597e106b9ff88b Author: Jens Axboe Date: Fri Jul 28 09:23:08 2006 +0200 [PATCH] elevator: move the backmerging logic into the elevator core Right now, every IO scheduler implements its own backmerging (except for noop, which does no merging). That results in duplicated code for essentially the same operation, which is never a good thing. This patch moves the backmerging out of the io schedulers and into the elevator core. We save 1.6kb of text and as a bonus get backmerging for noop as well. Win-win! Signed-off-by: Jens Axboe commit 4aff5e2333c9a1609662f2091f55c3f6fffdad36 Author: Jens Axboe Date: Thu Aug 10 08:44:47 2006 +0200 [PATCH] Split struct request ->flags into two parts Right now ->flags is a bit of a mess: some are request types, and others are just modifiers. Clean this up by splitting it into ->cmd_type and ->cmd_flags. This allows introduction of generic Linux block message types, useful for sending generic Linux commands to block devices. Signed-off-by: Jens Axboe commit 77ed74da26f50fa28471571ee7a2251b77526d84 Author: Jean Delvare Date: Sat Sep 30 17:18:59 2006 +0200 [PATCH] i2c: Prevent deadlock on i2c client registration Delay the call to adapter->client_register() until after we are certain that the client registration is a success. At this point the client is fully initialized and we no longer hold the adapter->clist mutex, so this should prevent the deadlocks if the client_register() callback needs to take that mutex too, as is the case for the bttv driver. This fixes bug #7234. Signed-off-by: Jean Delvare Signed-off-by: Linus Torvalds commit de7ed55dbb2f2c44be669d56c4adf28cbffb26ce Author: Steve French Date: Sat Sep 30 13:25:52 2006 +0000 [CIFS] Make use of newer QFSInfo dependent on capability bit instead of whether we negotiated legacy lanman dialect so we do not keep retrying for mount to WindowsME Signed-off-by: Steve French commit 360f654e7cda850034f3f6252a7a7cff3fa77356 Author: Tejun Heo Date: Sat Sep 30 19:45:00 2006 +0900 [PATCH] libata: turn off NCQ if queue depth is adjusted to 1 Turn off NCQ if queue depth is adjusted to 1. Signed-off-by: Jeff Garzik commit e5c9e081e9c980fa785cd9002c25a251cf3f090e Author: Tejun Heo Date: Sat Sep 30 19:44:39 2006 +0900 [PATCH] libata: cosmetic changes to constants Cosmetic changes to ATA_DFLAG_* constants for soon-to-follow NCQ-off patch. Signed-off-by: Jeff Garzik commit c5d311c7e93c7d84941028835bc6ae5e1bc4e73c Author: Lennert Buytenhek Date: Fri Sep 29 21:18:34 2006 +0100 [ARM] 3880/1: remove the last trace of iop31x support Remove the last trace of iop31x support from the kernel. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 730ee9f3594d8bcedb981dd184f310899fc931c6 Author: Lennert Buytenhek Date: Fri Sep 29 21:17:36 2006 +0100 [ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet Instantiate platform devices for the ep93xx ethernet driver in a couple of ep93xx board support files. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 2552fc27ff79b10b9678d92bcaef21df38bb7bb6 Author: Lennert Buytenhek Date: Fri Sep 29 21:14:05 2006 +0100 [ARM] 3809/3: get rid of 4 megabyte kernel image size limit We currently have a hardcoded 4 megabyte uncompressed kernel image size limit, which is easily exceeded by, for example, enabling some of the various kernel debugging options. When setting up the initial page tables (which is where this 4M limit is hardcoded), it's actually relatively easy to find out the true size of the uncompressed kernel image and create enough page table entries for things to fit, so this patch makes it so. In the decompressor, we also need to know the size of the uncompressed kernel image, to figure out whether there is any chance that uncompressing the kernel might overwrite the compressed kernel image stored elsewhere in memory. We don't have that info at this boot stage, though, so we approximate the size of the uncompressed kernel by taking the compressed kernel image size and allowing for a maximum 4x expansion. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 6ae5a6ef0340908fb7065a75231ae9980a910fbe Author: Russell King Date: Sat Sep 30 10:50:05 2006 +0100 [ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c XIP kernels need to know the start/end of text, but we were missing the declaration of _etext in mmu.c. Add it. Signed-off-by: Russell King commit e94c5bde703f2f9f86d098b6bf8275c64fab10eb Author: Sam Ravnborg Date: Mon Sep 25 17:35:43 2006 +0200 kconfig/menuconfig: do not let ncurses clutter screen on exit Do not initialize ncurses twice - it causes unpredicable results. My display was sometimes weird after running make menuconfig and I had to execute 'reset' to properly restore my display. Signed-off-by: Sam Ravnborg commit 737ecae264bc759e2033d99e99138f690f3beabf Author: Sam Ravnborg Date: Sat Sep 2 22:01:42 2006 +0200 kconfig/lxdialog: clear long menu lines Menulines that were wider than the available line width is now properly null terminated. While at it renamed the variable choice => line_y so it better reflect the usage in do_print_item(). Signed-off-by: Sam Ravnborg commit c29121b787f533d135ae47b5f3044adb66cbebef Author: Sam Ravnborg Date: Sat Sep 2 21:32:14 2006 +0200 kbuild: do not build mconf & lxdialog unless needed Due to a limitation in kbuild all objects referred by xxx-y or xxx-objs will be build when one of the targets needs to e build. This caused lxdialog to be build pulling in ncurses that is not always available. So avoid building mconf & lxdialog unless really needed. Signed-off-by: Sam Ravnborg commit 903947d286c93d3545ef6491bf66a0b797010c8d Author: Sam Ravnborg Date: Sun Jul 30 09:47:33 2006 +0200 kconfig/lxdialog: fix make mrproper No Makefile in scripts/kconfig/lxdialog anymore, so do not go there during make mrproper. Signed-off-by: Sam Ravnborg commit c8dc68ad0fbd934e78e913b8a8d7b45945db4930 Author: Sam Ravnborg Date: Sat Jul 29 22:48:57 2006 +0200 kconfig/lxdialog: support resize In all dialogs now properly catch KEY_RESIZE and take proper action. In mconf try to behave sensibly when a dialog routine returns -ERRDISPLAYTOOSMALL. The original check for a screnn size of 80x19 is kept for now. It may make sense to remove it later, but thats anyway what much text is adjusted for. Signed-off-by: Sam Ravnborg commit f3cbcdc955d0d2c8b4c52d6b73fc536b01b68c64 Author: Sam Ravnborg Date: Fri Jul 28 23:57:48 2006 +0200 kconfig/lxdialog: let behave as expected is used to step one back in the dialogs. When lxdialog became built-in pressing once would cause one step back and pressing would cause two steps back. This patch - based on concept from Roman Zippel - makes one a noop and pressing will cause one step backward. In addition the final yes/no dialog now has the option to go back to the the kernel configuration. So if you get too far out you can now go back to configuring the kernel without saving and starting all over again. Signed-off-by: Sam Ravnborg commit 2982de6993e6d9944f2215d7cb9b558b465a0c99 Author: Sam Ravnborg Date: Thu Jul 27 22:10:27 2006 +0200 kconfig/menuconfig: lxdialog is now built-in lxdialog was previously called as an external program causing screen to flicker when used. With this patch lxdialog is now built-in. It is loosly based om previous work by: Petr Baudis Following is a list of changes: o Moved build of dialog routings to kconfig Makefile o menubox + checklist uses a new item list to hold all menu items o in util.c implmented helper function to deal with item list o menubox now uses parameters to save scroll state (avoids temp file) o textbox now get text to be displayed as parameter and not a file o make sure to properly delete subwin's before main windows o killed unused files: lxdialog.c msgbox.c o modified return value for ESC to match direct calling o in a few places the code has been adjusted to 80 char wide o in textbox a small refactoring was made to make code remotely readable o in mconf removed all unused stuff (functions/variables) Following is a list of know short comings: a) pressing ESC twice will be interpreted as two ESC presses b) resize does not work. menuconfig needs to be restarted to be adjusted Signed-off-by: Sam Ravnborg commit 350b5b76384e77bcc58217f00455fdbec5cac594 Author: Sam Ravnborg Date: Mon Jul 24 22:19:51 2006 +0200 kconfig/lxdialog: add a new theme bluetitle which is now default The bluetitle theme is a slightly modified version of the colorscheme that -mm users has been used to. The bluetitle is more readable especially on some LCD screens so it is now default. Anyone that really wants the old color selection can get it by selecting the classic color theme: make MENUCONFIG_COLOR=classic menuconfig The bluetitle theme was modified by Roman Zippel to further improve readability on LCD screens. Signed-off-by: Sam Ravnborg commit 458972132a705c4a869002354f7f10f395d08c18 Author: Sam Ravnborg Date: Mon Jul 24 22:04:04 2006 +0200 kconfig/lxdialog: add support for color themes and add blackbg theme The blackbg theme was originally made by: Han Boetes It was copied from a patch by "Randy.Dunlap" which was also the inspiration source for the color theme support. Signed-off-by: Sam Ravnborg commit 98e5a1579e7d34fe3803240750a1c48efcd9cb15 Author: Sam Ravnborg Date: Mon Jul 24 21:40:46 2006 +0200 kconfig/lxdialog: refactor color support Clean up and refactor color support. All color support are now in util.c including color definitions. In the process introduced a global variable named 'dlg' which is used all over to set color - thats the reason why all files are changed. Signed-off-by: Sam Ravnborg commit 9ac00b7d96045fa3ce573e0ad5cdc0350ad8e1d2 Author: Steve French Date: Sat Sep 30 04:13:17 2006 +0000 [CIFS] Do not send newer QFSInfo to legacy servers which can not support it Fix dialect negotiation to save off when we have negotiated lanman. This allows us to avoid sending some somewhat newer requests that the server can not handle and go directly to the older version (infolevel) of the same call. Make sure we try to negotiate a level which allows us to get the server OS (which we check so we can detect Win9x vs. other legacy servers and eventually work around the Win9x DOS time bug (they reverse date/time fields). Signed-off-by: Steve French commit f46d3e11903e452924ef2996aa9aca2aae4427e2 Author: Steve French Date: Sat Sep 30 01:08:55 2006 +0000 [CIFS] Fix typo in name of new cifs_show_stats Signed-off-by: Steve French commit 175ec9e11cf18f8373b32f7a33e75a4cf7ce25e3 Author: Steve French Date: Sat Sep 30 01:07:38 2006 +0000 [CIFS] Rename server time zone field Server time zone is not really a time zone, rather a time adjustement in seconds. CC: Guenter Kukkukk Signed-off-by: Steve French commit 25ee4a98c662317a7973f3053567d4ec51857511 Author: Steve French Date: Sat Sep 30 00:54:23 2006 +0000 [CIFS] Handle legacy servers which return undefined time zone Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit 6656e3c4c8e0c80f2d2bfece574876d269f64861 Author: Chas Williams Date: Fri Sep 29 17:17:17 2006 -0700 [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 33a9c2d4b758279c5077fc15d221b385a574ae0b Author: Chas Williams Date: Fri Sep 29 17:16:48 2006 -0700 [ATM]: [lec] add reference counting to lec_arp entries Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 987e46bdf314c55e060570ff46723d770e461f0e Author: Chas Williams Date: Fri Sep 29 17:15:59 2006 -0700 [ATM]: [lec] use work queue instead of timer for lec arp expiry Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit edbc9b014fda4b13466b2e2ac53b940337548ab4 Author: Chas Williams Date: Fri Sep 29 17:15:15 2006 -0700 [ATM]: [lec] old_close is no longer used Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit d0732f649f090b31f976a9ce59a38e1191077909 Author: Chas Williams Date: Fri Sep 29 17:14:27 2006 -0700 [ATM]: [lec] convert lec_arp_table to hlist Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 1c9d3e72a7164c590437f2ab6c2c4f6da91f1703 Author: Chas Williams Date: Fri Sep 29 17:13:24 2006 -0700 [ATM]: [lec] header indent, comment and whitespace cleanup Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 1fa9961d631fcde21cc42678157129c6fae7fe6d Author: Chas Williams Date: Fri Sep 29 17:11:47 2006 -0700 [ATM]: [lec] indent, comment and whitespace cleanup [continued] Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit d44f77466cfdc6f1d1e3870e176afedab7f46a42 Author: Chas Williams Date: Fri Sep 29 17:11:14 2006 -0700 [ATM]: [lec] indent, comment and whitespace cleanup Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit f236218b7292bccb0f8754a0feb5d9e9a06fe5a2 Author: Vlad Yasevich Date: Fri Sep 29 17:10:03 2006 -0700 [SCTP]: Do not timestamp every SCTP packet. We only need the timestamp on COOKIE-ECHO chunks, so instead of always timestamping every SCTP packet, let common code timestamp if the socket option is set. For COOKIE-ECHO, simply get the time of day if we don't have a timestamp. This introduces a small possibility that the cookie may be considered expired, but it will be renegotiated. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit b56bab46f3220eb6b1f71c000faa44c6b13fb148 Author: Vlad Yasevich Date: Fri Sep 29 17:09:34 2006 -0700 [SCTP]: Use correct mask when disabling PMTUD. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit cd49788563d3b9e2ec0b316fa57aef1c0cb3bd4b Author: Sridhar Samudrala Date: Fri Sep 29 17:09:05 2006 -0700 [SCTP]: Include sk_buff overhead while updating the peer's receive window. Currently if the sender is sending small messages, it can cause a receiver to run out of receive buffer space even when the advertised receive window is still open and results in packet drops and retransmissions. Including a overhead while updating the sender's view of peer receive window will reduce the chances of receive buffer space overshooting the receive window. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 208edef6a5b6c50363c77efcf34c4b4020681029 Author: Sridhar Samudrala Date: Fri Sep 29 17:08:01 2006 -0700 [SCTP]: Enable Nagle algorithm by default. This allows more aggressive bundling of chunks when sending small messages. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit f9317a40c4e09e20ef01601fc9f5de9e6acb5b96 Author: Michael Chan Date: Fri Sep 29 17:06:23 2006 -0700 [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present. MSI is defined to be 32-bit write. The 5706 does 64-bit MSI writes with byte enables disabled on the unused 32-bit word. This is legal but causes problems on the AMD 8132 which will eventually stop responding after a while. Without this patch, the MSI test done by the driver during open will pass, but MSI will eventually stop working after a few MSIs are written by the device. AMD believes this incompatibility is unique to the 5706, and prefers to locally disable MSI rather than globally disabling it using pci_msi_quirk. Update version to 1.4.45. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 95d4e6be25a68cd9fbe8c0d356b585504d8db1c7 Author: Paul Moore Date: Fri Sep 29 17:05:05 2006 -0700 [NetLabel]: audit fixups due to delayed feedback Fix some issues Steve Grubb had with the way NetLabel was using the audit subsystem. This should make NetLabel more consistent with other kernel generated audit messages specifying configuration changes. Signed-off-by: Paul Moore Acked-by: Steve Grubb Signed-off-by: David S. Miller commit c84ef5305930d19bdd6cd576b3a3a73786a82e57 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Use early clobber in semaphores New code clobbers the result always early, so tell gcc about it Signed-off-by: Andi Kleen commit 34596dc9e59d7bece16fe5aba08116b49465da26 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it Signed-off-by: Andi Kleen commit 120b114237e2461fb4fa437c5c37edf014c916b9 Author: Vivek Goyal Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Re-positioning the bss segment [AK: This apparently broke some systems, but we need it to fix a compile problem with old binutils and in theory the patch is correct. So let's trying reenabling it again.] o Currently bss segment is being placed somewhere in the middle (after .data) section and after bss lots of init section and data sections are coming. Is it intentional? o One side affect of placing bss in the middle is that objcopy keeps the bss in raw binary image (vmlinux.bin) hence unnecessarily increasing the size of raw binary image. (In my case ~600K). It also increases the size of generated bzImage, though the increase is very small (896 bytes), probably a very high compression ratio for stream of zeros. o This patch moves the bss at the end hence reducing the size of bzImage by 896 bytes and size of vmlinux.bin by 600K. o This change benefits in the context of relocatable kernel patches. If kernel bss is not part of compressed data (vmlinux.bin) then it does not have to be decompressed and this area can be used by the decompressor for its execution hence keeping the memory requirements bounded and decompressor code does not stomp over any other data loaded beyond kernel image (As might be the case with bootloaders like kexec). Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen commit 9d0ef4fd61693acd3741ab7ee544246cda1f8738 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Use ARRAY_SIZE in setup.c Based on i386 patch from Bjorn. Signed-off-by: Andi Kleen commit b9629b82c81709eb0f9c98b8f9cc684f8e212ef3 Author: Bjorn Helgaas Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE() Code is easier to validate if array sizes aren't hidden behind extra #defines. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen commit 29cbc78b90a73ad80f2f58ba2927956cf663abed Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] x86: Clean up x86 NMI sysctls Use prototypes in headers Don't define panic_on_unrecovered_nmi for all architectures Cc: dzickus@redhat.com Signed-off-by: Andi Kleen commit 013bf2c50ed943e9c23a2145d3ea7c4d88cda310 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Refactor some duplicated code in mpparse.c No logic changes Signed-off-by: Andi Kleen commit d802ab981da67d433fbb48f5640b7e3a9ba9fd54 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Document iommu=panic Signed-off-by: Andi Kleen commit ded318ec80071557155604197ea45dcdb2a9ff2f Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Fix broken indentation in iommu_setup No functional changes; only white space. Signed-off-by: Andi Kleen commit ece668401250c1d0419ed078c1d26ccdd30d3289 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Allow disabling DAC using command line options Might or might not work around some reported bugs on VIA systems. Signed-off-by: Andi Kleen commit b885808e185a4ec2dfe16c84434f79e95f0245b0 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic Noticed by Al Viro Cc: viro@ftp.linux.org.uk Signed-off-by: Andi Kleen commit ae853e79faa27ca1a08c8ae3b5aee71ea98482f9 Author: Andi Kleen Date: Sat Sep 30 01:47:55 2006 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit 81b999b10b3246fd80691a7936a564deb99640b9 Author: Andi Kleen Date: Sat Sep 30 01:47:54 2006 +0200 [PATCH] Update defconfig Signed-off-by: Andi Kleen commit fbe96f92b3d9450e77a3a4bb1d46aa1bb908c1ab Author: David S. Miller Date: Wed Sep 27 19:52:35 2006 -0700 [SERIAL] sunzilog: Mark sunzilog_init_hw as __devinit. Signed-off-by: David S. Miller commit 3a1d5c84ed2fa4034f86e3b204129c139471516e Author: David S. Miller Date: Wed Sep 27 19:43:02 2006 -0700 [SPARC]: Don't zero out tail during copy_from_user_inatomic(). Actually, since we use the same code for all the copying types in and out of userspace, we check at runtime whether preemption is disabled. Signed-off-by: David S. Miller commit d6c641026dec68acfb4b0baa98aad960e963ed97 Author: Ollie Wild Date: Fri Sep 29 15:50:28 2006 -0700 [PATCH] uml build fix Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2148ccc437a9eac9f0d4b3c27cb1e41f6a48194c Author: David Woodhouse Date: Fri Sep 29 15:50:25 2006 -0700 [PATCH] MLSXFRM: fix mis-labelling of child sockets Accepted connections of types other than AF_INET, AF_INET6, AF_UNIX won't have an appropriate label derived from the peer, so don't use it. Signed-off-by: David Woodhouse Acked-by: Stephen Smalley Acked-by: James Morris Acked-by: Paul Moore Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0af79cd52334c586d058253b7d32ce74434de26 Author: Kevin Hilman Date: Fri Sep 29 00:14:09 2006 +0100 [ARM] 3874/1: Remove leftover usage of asm/timeofday.h Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit ae1390d8c3e2142e5cf6d192951d6e2b1fa213c5 Author: Yoichi Yuasa Date: Fri Sep 29 08:42:38 2006 +0200 [PATCH] i2c-sibyte: Fix modular build breakage Fix undefined reference in i2c_sibyte_exit(). drivers/built-in.o: In function `i2c_sibyte_exit': i2c-sibyte.c:(.exit.text+0x368): undefined reference to `i2c_del_bus' i2c-sibyte.c:(.exit.text+0x368): relocation truncated to fit: R_MIPS_26 against `i2c_del_bus' i2c-sibyte.c:(.exit.text+0x38c): undefined reference to `i2c_del_bus' i2c-sibyte.c:(.exit.text+0x38c): relocation truncated to fit: R_MIPS_26 against `i2c_del_bus' Signed-off-by: Yoichi Yuasa Signed-off-by: Jean Delvare Signed-off-by: Linus Torvalds commit 181b64803661209cda64e5e874ad75f373a69de8 Author: Paul Jackson Date: Fri Sep 29 02:01:48 2006 -0700 [PATCH] cpuset: fix obscure attach_task vs exiting race Fix obscure race condition in kernel/cpuset.c attach_task() code. There is basically zero chance of anyone accidentally being harmed by this race. It requires a special 'micro-stress' load and a special timing loop hacks in the kernel to hit in less than an hour, and even then you'd have to hit it hundreds or thousands of times, followed by some unusual and senseless cpuset configuration requests, including removing the top cpuset, to cause any visibly harm affects. One could, with perhaps a few days or weeks of such effort, get the reference count on the top cpuset below zero, and manage to crash the kernel by asking to remove the top cpuset. I found it by code inspection. The race was introduced when 'the_top_cpuset_hack' was introduced, and one piece of code was not updated. An old check for a possibly null task cpuset pointer needed to be changed to a check for a task marked PF_EXITING. The pointer can't be null anymore, thanks to the_top_cpuset_hack (documented in kernel/cpuset.c). But the task could have gone into PF_EXITING state after it was found in the task_list scan. If a task is PF_EXITING in this code, it is possible that its task->cpuset pointer is pointing to the top cpuset due to the_top_cpuset_hack, rather than because the top_cpuset was that tasks last valid cpuset. In that case, the wrong cpuset reference counter would be decremented. The fix is trivial. Instead of failing the system call if the tasks cpuset pointer is null here, fail it if the task is in PF_EXITING state. The code for 'the_top_cpuset_hack' that changes an exiting tasks cpuset to the top_cpuset is done without locking, so could happen at anytime. But it is done during the exit handling, after the PF_EXITING flag is set. So if we verify that a task is still not PF_EXITING after we copy out its cpuset pointer (into 'oldcs', below), we know that 'oldcs' is not one of these hack references to the top_cpuset. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 683e91cbd0582cb8e63daaf0429e0a62be9cc421 Author: Kirill Korotaev Date: Fri Sep 29 02:01:47 2006 -0700 [PATCH] SubmittingPatches: add a note about "format=flowed" when sending patches Add a note about "format=flowed" when sending patches and explain how to fix mozilla. Thunderbird has the similar options. Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03cbc358aab3faf34bfeaa02206fa660127e9b3f Author: Ingo Molnar Date: Fri Sep 29 02:01:46 2006 -0700 [PATCH] lockdep core: improve the lock-chain-hash With CONFIG_DEBUG_LOCK_ALLOC turned off i was getting sporadic failures in the locking self-test: ------------> | Locking API testsuite: ---------------------------------------------------------------------------- | spin |wlock |rlock |mutex | wsem | rsem | -------------------------------------------------------------------------- A-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-A-B-C deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-D-D-A deadlock: ok |FAILED| ok | ok | ok | ok | A-B-C-D-B-D-D-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-D-B-C-D-A deadlock: ok | ok | ok | ok | ok |FAILED| after much debugging it turned out to be caused by accidental chain-hash key collisions. The current hash is: #define iterate_chain_key(key1, key2) \ (((key1) << MAX_LOCKDEP_KEYS_BITS/2) ^ \ ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS/2)) ^ \ (key2)) where MAX_LOCKDEP_KEYS_BITS is 11. This hash is pretty good as it will shift by 5 bits in every iteration, where every new ID 'mixed' into the hash would have up to 11 bits. But because there was a 6 bits overlap between subsequent IDs and their high bits tended to be similar, there was a chance for accidental chain-hash collision for a low number of locks held. the solution is to shift by 11 bits: #define iterate_chain_key(key1, key2) \ (((key1) << MAX_LOCKDEP_KEYS_BITS) ^ \ ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \ (key2)) This keeps the hash perfect up to 5 locks held, but even above that the hash is still good because 11 bits is a relative prime to the total 64 bits, so a complete match will only occur after 64 held locks (which doesnt happen in Linux). Even after 5 locks held, entropy of the 5 IDs mixed into the hash is already good enough so that overlap doesnt generate a colliding hash ID. with this change the false positives went away. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 632dd2053a1146c826ceb6f26ab689389c05e751 Author: Vivek Goyal Date: Fri Sep 29 02:01:45 2006 -0700 [PATCH] Kcore elf note namesz field fix o As per ELF specifications, it looks like that elf note "namesz" field contains the length of "name" including the size of null character. And currently we are filling "namesz" without taking into the consideration the null character size. o Kexec-tools performs this check deligently hence I ran into the issue while trying to open /proc/kcore in kexec-tools for some info. Signed-off-by: Vivek Goyal Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 327dcaadc0bc08ad081aa8e36b6ec7ad7aa45e30 Author: Andrew Morton Date: Fri Sep 29 02:01:44 2006 -0700 [PATCH] expand_fdtable(): remove pointless unlock+lock This unlock/lock on a super-unlikely path isn't worth the kernel text. Cc: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74d392aaabfc890cc1f0e80fc5ff13e5d3bcf4c9 Author: Vadim Lobanov Date: Fri Sep 29 02:01:43 2006 -0700 [PATCH] Clean up expand_fdtable() and expand_files() Perform a code cleanup against the expand_fdtable() and expand_files() functions inside fs/file.c. It aims to make the flow of code within these functions simpler and easier to understand, via added comments and modest refactoring. Signed-off-by: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3706baa8b1ba0d71d52fd0c656752a6495f6364a Author: Alexey Dobriyan Date: Fri Sep 29 02:01:43 2006 -0700 [PATCH] Documentation/SubmittingDrivers: minor update * fix copright typo * remove trailing whitespace * remove Kernel Traffic from Resources. Zack, it was great reading! * Name Arjan by name and fix URL of "How to NOT" paper. * Remove "Last updated" tag. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb84a20e9e6b98dcb33023ad22241d79107a08a7 Author: Alan Cox Date: Fri Sep 29 02:01:41 2006 -0700 [PATCH] audit/accounting: tty locking Add tty locking around the audit and accounting code. The whole current->signal-> locking is all deeply strange but it's for someone else to sort out. Add rather than replace the lock for acct.c Signed-off-by: Alan Cox Acked-by: Arjan van de Ven Cc: Al Viro Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f412b24240d92212e50ebbaff2dff20c9e6f3d0 Author: Alan Cox Date: Fri Sep 29 02:01:40 2006 -0700 [PATCH] Fix locking for tty drivers when doing urgent characters If you send a priority character (as is done for flow control) then the tty driver can either have its own method for "jumping the queue" or the characrer can be queued normally. In the latter case we call the write method but without the atomic_write_lock taken elsewhere. Make this consistent. Note that the send_xchar method if implemented remains outside of the lock as it can jump ahead of a current write so must not be locked out by it. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67cc0161ecc9ebee6eba4af6cbfdba028090b1b9 Author: Alan Cox Date: Fri Sep 29 02:01:39 2006 -0700 [PATCH] specialix - remove private speed decoding Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1db27c11e9a0c6d659040ac0b7c64a339e248fa1 Author: Alan Cox Date: Fri Sep 29 02:01:38 2006 -0700 [PATCH] istallion: Remove private baud rate decoding, which is also broken in this case on some platforms Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d720bc4b8fc5d6d179ef094908d4fbb5e436ffad Author: Alan Cox Date: Fri Sep 29 02:01:38 2006 -0700 [PATCH] generic_serial: remove private decoding of baud rate bits The driver has no business doing this work itself any more and hasn't for some years. When the new speed stuff goes in this will break entirely so fix it up ready. Also remove a #if 0 around a comment.... Signed-off-by: Alan Cox Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13c73f045f2ac33219729678f4a9389d4ccab799 Author: Atsushi Nemoto Date: Fri Sep 29 02:01:37 2006 -0700 [PATCH] RTC: more XSTP/VDET support for rtc-rs5c348 driver If the chip detected "oscillator stop" condition, show an warning message. And initialize it with the Epoch time instead of leaving it with unknown date/time. Signed-off-by: Atsushi Nemoto Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9dd6ffc3d6b56417a2c4c917f51dab6470166e6 Author: Adrian Bunk Date: Fri Sep 29 02:01:36 2006 -0700 [PATCH] build sound/sound_firmware.c only for OSS All sound/sound_firmware.c contains is mod_firmware_load() that is a legacy API only used by some OSS drivers. This patch builds it into an own sound_firmware module that is only built depending on CONFIG_SOUND_PRIME making the kernel slightly smaller for ALSA users. [alan@lxorguk.ukuu.org.uk: comment fix] Signed-off-by: Adrian Bunk Acked-by: Takashi Iwai Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5582ca21af82929d5cd3613321ac9233c492ebc Author: Rusty Russell Date: Fri Sep 29 02:01:35 2006 -0700 [PATCH] stop_machine.c copyright I had to look back: this code was extracted from the module.c code in 2005. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39f0247d3823e4e0bf8f6838a10362864b1e1053 Author: Andreas Gruenbacher Date: Fri Sep 29 02:01:35 2006 -0700 [PATCH] Access Control Lists for tmpfs Add access control lists for tmpfs. Signed-off-by: Andreas Gruenbacher Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0c8bd164e1a0585d7e46896553136b4f488bd19 Author: Andreas Gruenbacher Date: Fri Sep 29 02:01:34 2006 -0700 [PATCH] Generic infrastructure for acls The patches solve the following problem: We want to grant access to devices based on who is logged in from where, etc. This includes switching back and forth between multiple user sessions, etc. Using ACLs to define device access for logged-in users gives us all the flexibility we need in order to fully solve the problem. Device special files nowadays usually live on tmpfs, hence tmpfs ACLs. Different distros have come up with solutions that solve the problem to different degrees: SUSE uses a resource manager which tracks login sessions and sets ACLs on device inodes as appropriate. RedHat uses pam_console, which changes the primary file ownership to the logged-in user. Others use a set of groups that users must be in in order to be granted the appropriate accesses. The freedesktop.org project plans to implement a combination of a console-tracker and a HAL-device-list based solution to grant access to devices to users, and more distros will likely follow this approach. These patches have first been posted here on 2 February 2005, and again on 8 January 2006. We have been shipping them in SLES9 and SLES10 with no problems reported. The previous submission is archived here: http://lkml.org/lkml/2006/1/8/229 http://lkml.org/lkml/2006/1/8/230 http://lkml.org/lkml/2006/1/8/231 This patch: Add some infrastructure for access control lists on in-memory filesystems such as tmpfs. Signed-off-by: Andreas Gruenbacher Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e6fd33b75602ced4c5d43e99a10a1d13f33d4f4 Author: Chris Snook Date: Fri Sep 29 02:01:33 2006 -0700 [PATCH] enforce RLIMIT_NOFILE in poll() POSIX states that poll() shall fail with EINVAL if nfds > OPEN_MAX. In this context, POSIX is referring to sysconf(OPEN_MAX), which is the value of current->signal->rlim[RLIMIT_NOFILE].rlim_cur in the linux kernel, not the compile-time constant which happens to also be named OPEN_MAX. In the current code, an application may poll up to max_fdset file descriptors, even if this exceeds RLIMIT_NOFILE. The current code also breaks applications which poll more than max_fdset descriptors, which worked circa 2.4.18 when the check was against NR_OPEN, which is 1024*1024. This patch enforces the limit precisely as POSIX defines, even if RLIMIT_NOFILE has been changed at run time with ulimit -n. To elaborate on the rationale for this, there are three cases: 1) RLIMIT_NOFILE is at the default value of 1024 In this (default) case, the patch changes nothing. Calls with nfds > 1024 fail with EINVAL both before and after the patch, and calls with nfds <= 1024 pass the check both before and after the patch, since 1024 is the initial value of max_fdset. 2) RLIMIT_NOFILE has been raised above the default In this case, poll() becomes more permissive, allowing polling up to RLIMIT_NOFILE file descriptors even if less than 1024 have been opened. The patch won't introduce new errors here. If an application somehow depends on poll() failing when it polls with duplicate or invalid file descriptors, it's already broken, since this is already allowed below 1024, and will also work above 1024 if enough file descriptors have been open at some point to cause max_fdset to have been increased above nfds. 3) RLIMIT_NOFILE has been lowered below the default In this case, the system administrator or the user has gone out of their way to protect the system from inefficient (or malicious) applications wasting kernel memory. The current code allows polling up to 1024 file descriptors even if RLIMIT_NOFILE is much lower, which is not what the user or administrator intended. Well-written applications which only poll valid, unique file descriptors will never notice the difference, because they'll hit the limit on open() first. If an application gets broken because of the patch in this case, then it was already poorly/maliciously designed, and allowing it to work in the past was a violation of POSIX and a DoS risk on low-resource systems. With this patch, poll() will permit exactly what POSIX suggests, no more, no less, and for any run-time value set with ulimit -n, not just 256 or 1024. There are existing apps which which poll a large number of file descriptors, some of which may be invalid, and if those numbers stradle 1024, they currently fail with or without the patch in -mm, though they worked fine under 2.4.18. Signed-off-by: Chris Snook Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c6ba51bdad0de0dc2a2e2415d4dac2d0db6c1a1 Author: Eric Sesterhenn Date: Fri Sep 29 02:01:32 2006 -0700 [PATCH] Uninitialized variable in drivers/net/wan/syncppp.c For len equal to 4, we never call sppp_lcp_conf_parse_options(), therefore rmagic does not get initialized. Signed-off-by: Eric Sesterhenn Acked-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04b1db9fd7eea63c9663072feece616ea41b0a79 Author: Ian S. Nelson Date: Fri Sep 29 02:01:31 2006 -0700 [PATCH] /sys/modules: allow full length section names I've been using systemtap for some debugging and I noticed that it can't probe a lot of modules. Turns out it's kind of silly, the sections section of /sys/module is limited to 32byte filenames and many of the actual sections are a a bit longer than that. [akpm@osdl.org: rewrite to use dymanic allocation] Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b5e0cbb4fb6e2a599d72652f56a9acb6af16bcf Author: Matthew Wilcox Date: Fri Sep 29 02:01:30 2006 -0700 [PATCH] SuperH list is moderated I just got a bounce telling me my contributions aren't welcome. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ddb88c0ab636e6ac0b5e409f6288a814dc87275 Author: Pavel Machek Date: Fri Sep 29 02:01:29 2006 -0700 [PATCH] network block device is mostly known as "NBD" People search maintainers for NBD and then decide it is not maintained. (akpm: ditto LVM. And other things, but I forget what they were) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e9cb8fdab0709c508cd9689bee6916a270191cc Author: Pavel Machek Date: Fri Sep 29 02:01:29 2006 -0700 [PATCH] SubmittingPatches cleanups This cleans up SubmittingPatches a bit. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1497b2749babb01458a6d9dfd4dfb493b3d388f2 Author: Andreas Mohr Date: Fri Sep 29 02:01:28 2006 -0700 [PATCH] lib/ts_fsm.c: constify structs Constify two structs. Correct some typos. Compile-tested and run-tested (module inserted) on 2.6.18-rc4-mm3. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4050914f7c2665736a82265a029466071a90094e Author: Akinobu Mita Date: Fri Sep 29 02:01:27 2006 -0700 [PATCH] rate limiting for the ldisc open failure messages This patch limits the messages when ldisc open faulures happen. It happens under memory pressure. Signed-off-by: Akinobu Mita Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a036cdd955b695b7e09e6505e6d6eba697f043e Author: Randy Dunlap Date: Fri Sep 29 02:01:26 2006 -0700 [PATCH] Mention Documenation/ABI/ requirements in Documentation/SubmitChecklist Mention Documenation/ABI/ requirements in Documentation/SubmitChecklist. Signed-off-by: Randy Dunlap Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f9e7949f86dfe2bd9a1ad0604f78e7683c059de Author: Hugh Dickins Date: Fri Sep 29 02:01:26 2006 -0700 [PATCH] valid_swaphandles() fix akpm draws my attention to the fact that sysctl(VM_PAGE_CLUSTER) might conceivably change page_cluster to 0 while valid_swaphandles() is in the middle of using it, leading to an embarrassingly long loop: take a local snapshot of page_cluster and work with that. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d1d43f6a43b703587e759145f69467e7c6553a7 Author: Chandra Seetharaman Date: Fri Sep 29 02:01:25 2006 -0700 [PATCH] call mm/page-writeback.c:set_ratelimit() when new pages are hot-added ratelimit_pages in page-writeback.c is recalculated (in set_ratelimit()) every time a CPU is hot-added/removed. But this value is not recalculated when new pages are hot-added. This patch fixes that problem by calling set_ratelimit() when new pages are hot-added. [akpm@osdl.org: cleanups] Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40c99aae23529f3d069ae08836ae46fadb3fd2bd Author: Chandra Seetharaman Date: Fri Sep 29 02:01:24 2006 -0700 [PATCH] remove static variable mm/page-writeback.c:total_pages page-writeback.c has a static local variable "total_pages", which is the total number of pages in the system. There is a global variable "vm_total_pages", which is the total number of pages the VM controls. Both are assigned from the return value of nr_free_pagecache_pages(). This patch removes the local variable and uses the global variable in that place. One more issue with the local static variable "total_pages" is that it is not updated when new pages are hot-added. Since vm_total_pages is updated when new pages are hot-added, this patch fixes that problem too. Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 153dcc54df826d2f8413c026313cba673c6bcc5b Author: Geoff Levand Date: Fri Sep 29 02:01:23 2006 -0700 [PATCH] mem driver: fix conditional on isa i/o support This change corrects the logic on the preprocessor conditionals that include support for ISA port i/o (/dev/ioports) into the mem character driver. This fixes the following error when building for powerpc platforms with CONFIG_PCI=n. drivers/built-in.o: undefined reference to `pci_io_base' Signed-off-by: Geoff Levand Acked-by: Linas Vepstas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 781b823e093b6ab3fd489f7d56ed869d27a78c1d Author: Kaz Kojima Date: Fri Sep 29 02:01:22 2006 -0700 [PATCH] SuperH maintainership change I think this is a time to step down from my SUPERH architecture maintainerships. The major development issues for this port seem to shift on the hardwares I can't access and I have no recent activity on kernel. I shouldn't qualify as a maintainer of SUPERH port now and there is no problem because Paul is actively maintaining it. The attached patch drops my name, address and web URL from MAINTAINERS file. Signed-off-by: Kazumoto Kojima Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e518ddb7ba44a3d852c0e41961365844c76eb2bf Author: Andreas Mohr Date: Fri Sep 29 02:01:22 2006 -0700 [PATCH] fs/namei.c: replace multiple current->fs by shortcut variable Replace current->fs by fs helper variable to reduce some indirection overhead and (at least at the moment, before the current_thread_info() %gs PDA improvement is available) get rid of more costly current references. Reduces fs/namei.o from 37786 to 37082 Bytes (704 Bytes saved). [akpm@osdl.org: cleanup] Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c16a02d6f5fcfe05dc6fd40aa80a8e1d055300db Author: Alan Stern Date: Fri Sep 29 02:01:21 2006 -0700 [PATCH] Add section on function return values to CodingStyle This patch (as776) adds a new chapter to Documentation/CodingStyle, explaining the circumstances under which a function should return 0 for failure and non-zero for success as opposed to a negative error code for failure and 0 for success. Signed-off-by: Alan Stern Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdf8cb0909b531f9ae8f9b9d7e4eb35ba3505f07 Author: Andreas Mohr Date: Fri Sep 29 02:01:20 2006 -0700 [PATCH] lib/rwsem.c: un-inline rwsem_down_failed_common() Un-inlining rwsem_down_failed_common() (two callsites) reduced lib/rwsem.o on my Athlon, gcc 4.1.2 from 5935 to 5480 Bytes (455 Bytes saved). I thus guess that reduced icache footprint (and better function caching) is worth more than any function call overhead. Signed-off-by: Andreas Mohr Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2752e401148a064a23a5a1e92d502d05017a560c Author: Jim Lewis Date: Fri Sep 29 02:01:19 2006 -0700 [PATCH] Add to MAINTAINERS file This patch adds Jim Lewis to the MAINTAINERS file for the Spidernet network driver. Signed-off-by: James K Lewis Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7422bf8a6feee6ec0c130fab7080df0cea86ebc Author: Serge E. Hallyn Date: Fri Sep 29 02:01:18 2006 -0700 [PATCH] loop: forward-port resource leak checks from Solar Forward port of the patch by Solar and ported by Julio. Compiles, boots, and passes my looptorturetest.sh. Signed-off-by: Serge E. Hallyn Cc: Julio Auto Cc: Solar Designer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdae9695870895dd6be4c7d6d31d8704ea27f064 Author: Andrew Morton Date: Fri Sep 29 02:01:17 2006 -0700 [PATCH] remove sound/oss/COPYING This appears to be a verbatim copy-n-paste of the GPL. Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1aac8bb824c658ddebd296b088a8bff5029c288 Author: Paul Jackson Date: Fri Sep 29 02:01:17 2006 -0700 [PATCH] cpuset: hotunplug cpus and mems in all cpusets The cpuset code handling hot unplug of CPUs or Memory Nodes was incorrect - it could remove a CPU or Node from the top cpuset, while leaving it still in some child cpusets. One basic rule of cpusets is that each cpusets cpus and mems are subsets of its parents. The cpuset hot unplug code violated this rule. So the cpuset hotunplug handler must walk down the tree, removing any removed CPU or Node from all cpusets. However, it is not allowed to make a cpusets cpus or mems become empty. They can only transition from empty to non-empty, not back. So if the last CPU or Node would be removed from a cpuset by the above walk, we scan back up the cpuset hierarchy, finding the nearest ancestor that still has something online, and copy its CPU or Memory placement. Signed-off-by: Paul Jackson Cc: Nathan Lynch Cc: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38837fc75acb7fa9b0e111b0241fe4fe76c5d4b3 Author: Paul Jackson Date: Fri Sep 29 02:01:16 2006 -0700 [PATCH] cpuset: top_cpuset tracks hotplug changes to node_online_map Change the list of memory nodes allowed to tasks in the top (root) nodeset to dynamically track what cpus are online, using a call to a cpuset hook from the memory hotplug code. Make this top cpus file read-only. On systems that have cpusets configured in their kernel, but that aren't actively using cpusets (for some distros, this covers the majority of systems) all tasks end up in the top cpuset. If that system does support memory hotplug, then these tasks cannot make use of memory nodes that are added after system boot, because the memory nodes are not allowed in the top cpuset. This is a surprising regression over earlier kernels that didn't have cpusets enabled. One key motivation for this change is to remain consistent with the behaviour for the top_cpuset's 'cpus', which is also read-only, and which automatically tracks the cpu_online_map. This change also has the minor benefit that it fixes a long standing, little noticed, minor bug in cpusets. The cpuset performance tweak to short circuit the cpuset_zone_allowed() check on systems with just a single cpuset (see 'number_of_cpusets', in linux/cpuset.h) meant that simply changing the 'mems' of the top_cpuset had no affect, even though the change (the write system call) appeared to succeed. With the following change, that write to the 'mems' file fails -EACCES, and the 'mems' file stubbornly refuses to be changed via user space writes. Thus no one should be mislead into thinking they've changed the top_cpusets's 'mems' when in affect they haven't. In order to keep the behaviour of cpusets consistent between systems actively making use of them and systems not using them, this patch changes the behaviour of the 'mems' file in the top (root) cpuset, making it read only, and making it automatically track the value of node_online_map. Thus tasks in the top cpuset will have automatic use of hot plugged memory nodes allowed by their cpuset. [akpm@osdl.org: build fix] [bunk@stusta.de: build fix] Signed-off-by: Paul Jackson Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af3ffa6758dbd2ab7ebe62dddf66b3aa94d64eeb Author: Pavel Machek Date: Fri Sep 29 02:01:14 2006 -0700 [PATCH] Fix typo in rtc kconfig Fix simple typo in RTC_HCTOSYS option. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b78483a4ba60d5d90930262a533a784e1d9df660 Author: Nick Piggin Date: Fri Sep 29 02:01:14 2006 -0700 [PATCH] oom: don't kill current when another OOM in progress A previous patch to allow an exiting task to OOM kill itself (and thereby avoid a little deadlock) introduced a problem. We don't want the PF_EXITING task, even if it is 'current', to access mem reserves if there is already a TIF_MEMDIE process in the system sucking up reserves. Also make the commenting a little bit clearer, and note that our current scheme of effectively single threading the OOM killer is not itself perfect. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01017a227044d64face2588fab9427a1da1bdb9f Author: Oleg Nesterov Date: Fri Sep 29 02:01:13 2006 -0700 [PATCH] oom_kill_task(): cleanup ->mm checks - It is not possible to have task->mm == &init_mm. - task_lock() buys nothing for 'if (!p->mm)' check. Signed-off-by: Oleg Nesterov Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 972c4ea59c9dbf82647ee9665d9e945241911a51 Author: Oleg Nesterov Date: Fri Sep 29 02:01:12 2006 -0700 [PATCH] select_bad_process(): cleanup 'releasing' check No logic changes, but imho easier to read. Signed-off-by: Oleg Nesterov Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28324d1df646521256e83389244adcce98e89ff2 Author: Oleg Nesterov Date: Fri Sep 29 02:01:12 2006 -0700 [PATCH] select_bad_process(): kill a bogus PF_DEAD/TASK_DEAD check The only one usage of TASK_DEAD outside of last schedule path, select_bad_process: for_each_task(p) { if (!p->mm) continue; ... if (p->state == TASK_DEAD) continue; ... TASK_DEAD state is set at the end of do_exit(), this means that p->mm was already set == NULL by exit_mm(), so this task was already rejected by 'if (!p->mm)' above. Note also that the caller holds tasklist_lock, this means that p can't pass exit_notify() and then set TASK_DEAD when p->mm != NULL. Also, remove open-coded is_init(). Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c394cc9fbb367f87faa2228ec2eabacd2d4701c6 Author: Oleg Nesterov Date: Fri Sep 29 02:01:11 2006 -0700 [PATCH] introduce TASK_DEAD state I am not sure about this patch, I am asking Ingo to take a decision. task_struct->state == EXIT_DEAD is a very special case, to avoid a confusion it makes sense to introduce a new state, TASK_DEAD, while EXIT_DEAD should live only in ->exit_state as documented in sched.h. Note that this state is not visible to user-space, get_task_state() masks off unsuitable states. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55a101f8f71a3d3dbda7b5c77083ffe47552f831 Author: Oleg Nesterov Date: Fri Sep 29 02:01:10 2006 -0700 [PATCH] kill PF_DEAD flag After the previous change (->flags & PF_DEAD) <=> (->state == EXIT_DEAD), we don't need PF_DEAD any longer. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29b884921634e1e01cbd276e1c9b8fc07a7e4a90 Author: Oleg Nesterov Date: Fri Sep 29 02:01:09 2006 -0700 [PATCH] set EXIT_DEAD state in do_exit(), not in schedule() schedule() checks PF_DEAD on every context switch and sets ->state = EXIT_DEAD to ensure that the exiting task will be deactivated. Note that this EXIT_DEAD is in fact a "random" value, we can use any bit except normal TASK_XXX values. It is better to set this state in do_exit() along with PF_DEAD flag and remove that check in schedule(). We are safe wrt concurrent try_to_wake_up() (for example ptrace, tkill), it can not change task's ->state: the 'state' argument of try_to_wake_up() can't have EXIT_DEAD bit. And in case when try_to_wake_up() sees a stale value of ->state == TASK_RUNNING it will do nothing. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8106b941ceab68cc5ff713df7b1276484554584 Author: Arjan van de Ven Date: Fri Sep 29 02:01:08 2006 -0700 [PATCH] lockdep: core, add enable/disable_irq_irqsave/irqrestore() APIs Introduce the disable_irq_nosync_lockdep_irqsave() and enable_irq_lockdep_irqrestore() APIs. These are needed for NE2000; basically NE2000 calls disable_irq and enable_irq as locking against the IRQ handler, but both in cases where interrupts are on and off. This means that lockdep needs to track the old state of the virtual irq flags on disable_irq, and restore these at enable_irq time. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ea36ddbd1abfe867f1e874a8312bfd811e5fd2c Author: Alexey Dobriyan Date: Fri Sep 29 02:01:07 2006 -0700 [PATCH] Ban register_filesystem(NULL); Everyone passes valid pointer there. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d826380b305971ff9825ef005ff039d655542bbb Author: Alexey Dobriyan Date: Fri Sep 29 02:01:06 2006 -0700 [PATCH] 9p: fix leak on error path If register_filesystem() fails mux workqueue must be killed. Signed-off-by: Alexey Dobriyan Cc: Eric Van Hensbergen Cc: Ron Minnich Cc: Latchesar Ionkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 368bdb3d616fa352971f45b423ae6344715e620b Author: Alexey Dobriyan Date: Fri Sep 29 02:01:05 2006 -0700 [PATCH] cramfs: make cramfs_uncompress_exit() return void It always returns 0, so relying on it is useless. The only caller isn't checking return value. In general, un-, de-, -free functions should return void. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4376e13ce07774be14e83fe501ef5c8500b83a1 Author: Alexey Dobriyan Date: Fri Sep 29 02:01:04 2006 -0700 [PATCH] freevxfs: fix leak on error path If register_filesystem() fails, vxfs_inode cache must be destroyed. Signed-off-by: Alexey Dobriyan Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50d44ed009a628e6d5c784fae18ea743d7cf199a Author: Alexey Dobriyan Date: Fri Sep 29 02:01:04 2006 -0700 [PATCH] cramfs: rewrite init_cramfs_fs() Two lines -- two bugs. :-( Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcc8e559ee5ae03fa6bdb8611d76d86d0083e793 Author: Josh Triplett Date: Fri Sep 29 02:01:03 2006 -0700 [PATCH] Pass a lock expression to __cond_lock, like __acquire and __release Currently, __acquire and __release take a lock expression, but __cond_lock takes only a condition, not the lock acquired if the expression evaluates to true. Change __cond_lock to accept a lock expression, and change all the callers to pass in a lock expression. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d2c502f141042f6e5d145aa40107685d751e5a3 Author: Randy Dunlap Date: Fri Sep 29 02:01:02 2006 -0700 [PATCH] doc: fix kernel-parameters 'quiet' Fix "quiet" parameter doc. No trailing '=' sign, no value after it. And it disables "most" kernel messages, not all of them. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7ca54f486d3b07f48b8bbc92705bde6ba98ee54 Author: Frederik Deweerdt Date: Fri Sep 29 02:01:02 2006 -0700 [PATCH] fix mem_write() return value At the beginning of the routine, "copied" is set to 0, but it is no good because in lines 805 and 812 it is set to other values. Finally, the routine returns as if it copied 12 (=ENOMEM) bytes less than it actually did. Signed-off-by: Frederik Deweerdt Acked-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87d7c8aca8670a772f74766c19e0345a606b67a9 Author: Jason Baron Date: Fri Sep 29 02:01:01 2006 -0700 [PATCH] block_dev.c mutex_lock_nested() fix In the case below we are locking the whole disk not a partition. This change simply brings the code in line with the piece above where when we are the 'first' opener, and we are a partition. Signed-off-by: Jason Baron Acked-by: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 303912e2a32aa73785b4c4dee15466d944a38a46 Author: Josh Triplett Date: Fri Sep 29 02:01:00 2006 -0700 [PATCH] Replace _spin_trylock with spin_trylock in the IRQ variants to use __cond_lock spin_trylock_irq and spin_trylock_irqsave use _spin_trylock, which does not use the __cond_lock wrapper annotation and thus does not affect the lock context; change them to use spin_trylock instead, which does use __cond_lock. Signed-off-by: Josh Triplett Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f50b93f066f8dc339de9b0eb78a22a75e6c8f8f Author: Josh Triplett Date: Fri Sep 29 02:00:59 2006 -0700 [PATCH] Make spinlock/rwlock annotations more accurate by using parameters, not types The lock annotations used on spinlocks and rwlocks currently use __{acquires,releases}(spinlock_t) and __{acquires,releases}(rwlock_t), respectively. This loses the information of which lock actually got acquired or released, and assumes a different type for the parameter of __acquires and __releases than the rest of the kernel. While the current implementations of __acquires and __releases throw away their argument, this will not always remain the case. Change this to use the lock parameter instead, to preserve this information and increase consistency in usage of __acquires and __releases. Signed-off-by: Josh Triplett Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92e9a8507ba81ff9e25bd9c5030ff8586269eefb Author: Alexey Dobriyan Date: Fri Sep 29 02:00:58 2006 -0700 [PATCH] windfarm_smu_sat.c: simplify around i2c_add_driver() Signed-off-by: Alexey Dobriyan Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28298232a15c48ea9835d5d24577cde87923e55c Author: Alan Cox Date: Fri Sep 29 02:00:58 2006 -0700 [PATCH] tty: Fix bits and note more bits to fix If your driver implements "break on" and "break off" this ensures you won't get multiple overlapping requests or requests in parallel. If your driver has its own break handling then its still your problem as the driver author. Break is also now serialized against writes from user space properly but no new guarantees are made driver level about writes from the line discipline itself (eg flow control or echo) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de2a84f2be8ed8a166f13d6aa2ae474541172bb2 Author: Alan Cox Date: Fri Sep 29 02:00:57 2006 -0700 [PATCH] solaris emulation: incorrect tty locking [akpm@osdl.org: build fix] [akpm@osdl.org: warning fix] Signed-off-by: Alan Cox Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 074a5dde04abc66eea30368c74913d83b1a410f9 Author: Henrik Kretzschmar Date: Fri Sep 29 02:00:56 2006 -0700 [PATCH] docbook: fix segfault in docproc.c Adds a missing exit, if the file that should be parsed couldn't be opened. Without it crashes with a segfault, cause the filedescriptor is accessed even if the file could not be opened. Signed-off-by: Henrik Kretzschmar Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa2a97eb9c0e91d7abc66bf76811a9599fdb3ee Author: Oleg Nesterov Date: Fri Sep 29 02:00:55 2006 -0700 [PATCH] sys_get_robust_list(): don't take tasklist_lock use rcu locks for find_task_by_pid(). Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d359b549bf3d7f42f0084918a4816ea4572e507c Author: Oleg Nesterov Date: Fri Sep 29 02:00:55 2006 -0700 [PATCH] futex_find_get_task(): don't take tasklist_lock It is ok to do find_task_by_pid() + get_task_struct() under rcu_read_lock(), we cand drop tasklist_lock. Note that testing of ->exit_state is racy with or without tasklist anyway. Signed-off-by: Oleg Nesterov Acked-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44938af6e08580514abce8bea23ae1c034ea0b1d Author: Ian Kent Date: Fri Sep 29 02:00:54 2006 -0700 [PATCH] autofs4: pending flag not cleared on mount fail During testing I've found that the mount pending flag can be left set at exit from autofs4_lookup after a failed mount request. This shouldn't be allowed to happen and causes incorrect error returns. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be3ca7fecb1a9903c6253f49aec0af2a0f3a04e4 Author: Ian Kent Date: Fri Sep 29 02:00:53 2006 -0700 [PATCH] autofs4: autofs4_follow_link false negative fix The check for an empty directory in the autofs4_follow_link method fails occassionally due to old dentrys. We had the same problem autofs4_revalidate ages ago. I thought we wouldn't need this in autofs4_follow_link, silly me. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b160f5ecd2f1b6df2e0015dc1f319c8ef803d62 Author: Oleg Nesterov Date: Fri Sep 29 02:00:52 2006 -0700 [PATCH] copy_process: cosmetic ->ioprio tweak copy_process: // holds tasklist_lock + ->siglock /* * inherit ioprio */ p->ioprio = current->ioprio; Why? ->ioprio was already copied in dup_task_struct(). I guess this is needed to ensure that the child can't escape sys_ioprio_set(IOPRIO_WHO_{PGRP,USER}), yes? In that case we don't need ->siglock held, and the comment should be updated. Signed-off-by: Oleg Nesterov Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c573afebc6213e4372e0d8352034c23d5262e1f Author: Oleg Nesterov Date: Fri Sep 29 02:00:51 2006 -0700 [PATCH] reparent_to_init(): use has_rt_policy() Remove open-coded has_rt_policy(), no changes in kernel/exit.o Signed-off-by: Oleg Nesterov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Steven Rostedt Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dc3e9099e01dfdd53f27f329c268eced03dfef6 Author: Oleg Nesterov Date: Fri Sep 29 02:00:50 2006 -0700 [PATCH] sched_setscheduler: fix? policy checks I am not sure this patch is correct: I can't understand what the current code does, and I don't know what it was supposed to do. The comment says: * can't change policy, except between SCHED_NORMAL * and SCHED_BATCH: The code: if (((policy != SCHED_NORMAL && p->policy != SCHED_BATCH) && (policy != SCHED_BATCH && p->policy != SCHED_NORMAL)) && But this is equivalent to: if ( (is_rt_policy(policy) && has_rt_policy(p)) && which means something different. We can't _decrease_ the current ->rt_priority with such a check (if rlim[RLIMIT_RTPRIO] == 0). Probably, it was supposed to be: if ( !(policy == SCHED_NORMAL && p->policy == SCHED_BATCH) && !(policy == SCHED_BATCH && p->policy == SCHED_NORMAL) this matches the comment, but strange: it doesn't allow to _drop_ the realtime priority when rlim[RLIMIT_RTPRIO] == 0. I think the right check would be: /* can't set/change rt policy */ if (is_rt_policy(policy) && policy != p->policy && !rlim_rtprio) return -EPERM; Signed-off-by: Oleg Nesterov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Steven Rostedt Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57a6f51c4281aa3119975473c70dce0480d322bd Author: Oleg Nesterov Date: Fri Sep 29 02:00:49 2006 -0700 [PATCH] introduce is_rt_policy() helper Imho, makes the code a bit easier to read. Signed-off-by: Oleg Nesterov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Steven Rostedt Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fe1d75f34974046fffcca5e22fb8a7b42fded33 Author: Oleg Nesterov Date: Fri Sep 29 02:00:48 2006 -0700 [PATCH] do_sched_setscheduler(): don't take tasklist_lock Use rcu locks instead. sched_setscheduler() now takes ->siglock before reading ->signal->rlim[]. Signed-off-by: Oleg Nesterov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Steven Rostedt Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9472e0f28cd2f0695a0ac3a0b4bd33f21714a7e Author: Cal Peake Date: Fri Sep 29 02:00:47 2006 -0700 [PATCH] kill extraneous printk in kernel_restart() Get rid of an extraneous printk in kernel_restart(). Signed-off-by: Cal Peake Acked-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 111dbe0c8a21dffa473239861be47ebc87f593b3 Author: Björn Steinbrink Date: Fri Sep 29 02:00:46 2006 -0700 [PATCH] Fix ____call_usermodehelper errors being silently ignored If ____call_usermodehelper fails, we're not interested in the child process' exit value, but the real error, so let's stop wait_for_helper from overwriting it in that case. Issue discovered by Benedikt Böhm while working on a Linux-VServer usermode helper. Signed-off-by: Björn Steinbrink Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e26a423e78c1bb1ebd29c49d4ae4ccbbacd861b Author: Rolf Eike Beer Date: Fri Sep 29 02:00:46 2006 -0700 [PATCH] Return better error codes if drivers/char/raw.c module init fails Currently this module just returns 1 if anything on module init fails. Store the error code of the different function calls and return their error on problems. Signed-off-by: Rolf Eike Beer Cc: Greg KH Signed-off-by: Andrew Morton [ Fixed to not unregister twice on error ] Signed-off-by: Linus Torvalds commit 416bc51292f977b43b010c6dd937522b90062390 Author: Roland McGrath Date: Fri Sep 29 02:00:45 2006 -0700 [PATCH] Use decimal for PTRACE_ATTACH and PTRACE_DETACH. It is sure confusing that linux/ptrace.h has: #define PTRACE_SINGLESTEP 9 #define PTRACE_ATTACH 0x10 #define PTRACE_DETACH 0x11 #define PTRACE_SYSCALL 24 All the low-numbered constants are in decimal, but the last two in hex. It sure makes it likely that someone will look at this and think that 9, 10, 11 are used, and that 16 and 17 are not used. How about we use the same notation for all the numbers [0,24] in the same short list? Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf3e43dbe0cc4a7ee7f6ab1bb5231dcfda164e02 Author: Jonathan Corbet Date: Fri Sep 29 02:00:44 2006 -0700 [PATCH] cdev documentation Add some documentation comments for the cdev interface. Signed-off-by: Jonathan Corbet Cc: Rolf Eike Beer Acked-by: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5785c95baede8459d70c4aa0f7becb6e8b5fde4b Author: Arjan van de Ven Date: Fri Sep 29 02:00:43 2006 -0700 [PATCH] tty: make termios_sem a mutex [akpm@osdl.org: fix] Cc: Alan Cox Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54306cf04c0ea0a8c432603dbc657ab62a438668 Author: Alan Cox Date: Fri Sep 29 02:00:42 2006 -0700 [PATCH] exit: fix crash case If we are going to BUG() not panic() here then we should cover the case of the BUG being compiled out Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cfd0885fac78c130a119ed576d18b5948fa2a5a Author: Alan Cox Date: Fri Sep 29 02:00:41 2006 -0700 [PATCH] tty: stop the tty vanishing under procfs access Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 808a0d389ff8d85017ec811085a6083394c02caf Author: Alan Cox Date: Fri Sep 29 02:00:40 2006 -0700 [PATCH] tty: lock ticogwinsz Now we lock the set ioctl its trivial to lock the get one so the data copied is consistent. At the moment we have the BKL here but this removes the need for it and is a step in the right direction Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1266b1e1aed0a4d7d5cb569deca8c31cba34a990 Author: Alan Cox Date: Fri Sep 29 02:00:40 2006 -0700 [PATCH] tty: trivial kzalloc opportunity Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b4a8a789a328af6aac613734c362cf6aad72201 Author: Roland McGrath Date: Fri Sep 29 02:00:39 2006 -0700 [PATCH] kexec warning fix This fixes a couple of compiler warnings, and adds paranoia checks as well. Signed-off-by: Roland McGrath Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3171a0305d62e6627a24bff35af4f997e4988a80 Author: Atsushi Nemoto Date: Fri Sep 29 02:00:32 2006 -0700 [PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem) Pass ticks to do_timer() and update_times(), and adjust x86_64 and s390 timer interrupt handler with this change. Currently update_times() calculates ticks by "jiffies - wall_jiffies", but callers of do_timer() should know how many ticks to update. Passing ticks get rid of this redundant calculation. Also there are another redundancy pointed out by Martin Schwidefsky. This cleanup make a barrier added by 5aee405c662ca644980c184774277fc6d0769a84 needless. So this patch removes it. As a bonus, this cleanup make wall_jiffies can be removed easily, since now wall_jiffies is always synced with jiffies. (This patch does not really remove wall_jiffies. It would be another cleanup patch) Signed-off-by: Atsushi Nemoto Cc: Martin Schwidefsky Cc: "Eric W. Biederman" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: john stultz Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Russell King Cc: Ian Molton Cc: Mikael Starvik Acked-by: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Acked-by: Ralf Baechle Cc: Kyle McMartin Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Richard Curnow Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Miles Bader Cc: Chris Zankel Acked-by: "Luck, Tony" Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27d91e07f9b863fa94491ffafe250580f0c2ce78 Author: Roland McGrath Date: Fri Sep 29 02:00:31 2006 -0700 [PATCH] __dequeue_signal() cleanup This tightens up __dequeue_signal a little. It also avoids doing recalc_sigpending twice in a row, instead doing it once in dequeue_signal. Signed-off-by: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9ecb2bd5d3ab8904752685696cb76aac1f3fef2 Author: Roland McGrath Date: Fri Sep 29 02:00:31 2006 -0700 [PATCH] has_stopped_jobs() cleanup This check has been obsolete since the introduction of TASK_TRACED. Now TASK_STOPPED always means job control stop. Signed-off-by: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb50ae7446abb35184be029c51f825e45a4e0670 Author: Joel & Rebecca VanderZee Date: Fri Sep 29 02:00:30 2006 -0700 [PATCH] I/O Error attempting to read last partial block of a file in an ISO9660 file system There was an I/O error that prevented reading the last partial block of large files in an ISO9660 filesystem. The error was generated when a file comprised more than one section and had a size that was not an exact multiple of the filesystem block size. This patch removes the check (and failure) for reading into the last partial block (and possibly beyond) for multiple-section files. It worked in my testing to prevent reading beyond the end of the section; my first patch just incremented the sect_size block count for a partial block and continued doing the check. But there is a commment in the source code about reading beyond the end of the file to fill a page cache. Failing to access beyond the section would prevent reading beyond the end of the file. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4b765551aa6355eae60b644bed851a9477c4e2b Author: Toyo Abe Date: Fri Sep 29 02:00:29 2006 -0700 [PATCH] posix-timers: Fix the flags handling in posix_cpu_nsleep() When a posix_cpu_nsleep() sleep is interrupted by a signal more than twice, it incorrectly reports the sleep time remaining to the user. Because posix_cpu_nsleep() doesn't report back to the user when it's called from restart function due to the wrong flags handling. This patch, which applies after previous one, moves the nanosleep() function from posix_cpu_nsleep() to do_cpu_nanosleep() and cleans up the flags handling appropriately. Signed-off-by: Toyo Abe Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1711ef3866b0360e102327389fe4b76c849bbe83 Author: Toyo Abe Date: Fri Sep 29 02:00:28 2006 -0700 [PATCH] posix-timers: Fix clock_nanosleep() doesn't return the remaining time in compatibility mode The clock_nanosleep() function does not return the time remaining when the sleep is interrupted by a signal. This patch creates a new call out, compat_clock_nanosleep_restart(), which handles returning the remaining time after a sleep is interrupted. This patch revives clock_nanosleep_restart(). It is now accessed via the new call out. The compat_clock_nanosleep_restart() is used for compatibility access. Since this is implemented in compatibility mode the normal path is virtually unaffected - no real performance impact. Signed-off-by: Toyo Abe Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c4751fd0eab5b8ebbfafb28cbcc8e03b0da5933 Author: jens m. noedler Date: Fri Sep 29 02:00:27 2006 -0700 [PATCH] update Documentation/kernel-parameters.txt Signed-off-by: jens m. noedler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b525a7e4445c4702dfc541930747517615c0c72a Author: Jan Kara Date: Fri Sep 29 02:00:26 2006 -0700 [PATCH] dquot: add proper locking when using current->signal->tty Dquot passes the tty to tty_write_message without locking Signed-off-by: Jan Kara Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 254e948b2908dd50df9dca4e6ed14b6cc8524fc9 Author: Catalin Marinas Date: Fri Sep 29 02:00:25 2006 -0700 [PATCH] Fix memory leak in vc_resize/vc_allocate Memory leaks can happen in the vc_resize() function in drivers/char/vt.c because of the vc->vc_screenbuf variable overriding in vc_allocate(). The kmemleak reported trace is as follows: <__kmalloc> This patch no longer allocates a screen buffer in vc_allocate() if it was already allocated by vc_resize(). Signed-off-by: Catalin Marinas Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce9a234ce7d8dddbfcec28e37ea58b5d8f6003d Author: Oleg Nesterov Date: Fri Sep 29 02:00:25 2006 -0700 [PATCH] elf_fdpic_core_dump: don't take tasklist_lock do_each_thread() is rcu-safe, and all tasks which use this ->mm must sleep in wait_for_completion(&mm->core_done) at this point, so we can use RCU locks. Also, remove unneeded INIT_LIST_HEAD(new) before list_add(new, head). Signed-off-by: Oleg Nesterov Acked-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 486ccb05fdbb7ca79784fdf0d07d2a86de48cf05 Author: Oleg Nesterov Date: Fri Sep 29 02:00:24 2006 -0700 [PATCH] elf_core_dump: don't take tasklist_lock do_each_thread() is rcu-safe, and all tasks which use this ->mm must sleep in wait_for_completion(&mm->core_done) at this point, so we can use RCU locks. Also, remove unneeded INIT_LIST_HEAD(new) before list_add(new, head). Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b22b4cdd53f5e1ee9ef1ef7933ddb77065859d05 Author: Peter Korsgaard Date: Fri Sep 29 02:00:23 2006 -0700 [PATCH] fix serial/amba-pl011.c console Kconfig Fix the Kconfig entry for console on AMBA PL011 to match the code. Signed-off-by: Peter Korsgaard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07dccf3344010f9b9df7fe725da7e73bca2992df Author: Akinobu Mita Date: Fri Sep 29 02:00:22 2006 -0700 [PATCH] check return value of cpu_callback Spawing ksoftirqd, migration, or watchdog, and calling init_timers_cpu() may fail with small memory. If it happens in initcalls, kernel NULL pointer dereference happens later. This patch makes crash happen immediately in such cases. It seems a bit better than getting kernel NULL pointer dereference later. Cc: Ingo Molnar Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c2d8b5dcad468cb0bdec3368b53383bde51e487 Author: Tobias Klauser Date: Fri Sep 29 02:00:21 2006 -0700 [PATCH] sound/sparc/dbri: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ad3479decccd12301a3f9920a22fa567d4bdae8 Author: Tobias Klauser Date: Fri Sep 29 02:00:20 2006 -0700 [PATCH] sound/mips/au1x00: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) Signed-off-by: Tobias Klauser Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d202a6c0883cf17a4a6e61a12e138598ec3ed32d Author: Ben Dooks Date: Fri Sep 29 02:00:19 2006 -0700 [PATCH] Remove old drivers/char/s3c2410_rtc.c This can now be removed, since there is now a drivers/rtc/rtc-s3c.c driver. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99f932f02627b211f7efa9602ddc389d1ccbed2b Author: Alexey Dobriyan Date: Fri Sep 29 02:00:18 2006 -0700 [PATCH] CONFIG_PM=n slim: sound/oss/cs46xx.c Remove some code which is unneeded if CONFIG_PM=n. * Make suspend/resume registration look like the rest of drivers: #ifdef CONFIG_PM in struct pci_driver, prototypes, actual hooks. * Drop CS46XX_ACPI_SUPPORT. It logically duplicated CONFIG_PM. It was hardcoded to 1 approx forever (ALSA merge just moved driver to sound/oss/). * After previous point, sound/oss/cs46xxpm-24.h removed as being useless. * As side effect selling (unused) static inline functions as suspend/resume hooks funkiness removed too. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aadcc2eef70640302805a6bb8c0f2a485779eea3 Author: Alexey Dobriyan Date: Fri Sep 29 02:00:16 2006 -0700 [PATCH] CONFIG_PM=n slim: sound/oss/trident.c Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Ackde-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dd7d6912b8a978878847fdcd3feef0d1b6471de Author: Alexey Dobriyan Date: Fri Sep 29 02:00:16 2006 -0700 [PATCH] CONFIG_PM=n slim: drivers/parport/parport_serial.c Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af410fc13d95f079910fc3dca7496590c3275967 Author: Johannes Berg Date: Fri Sep 29 02:00:14 2006 -0700 [PATCH] make leds.h include relevant headers Make it possible to include linux/leds.h without first including list.h and spinlock.h. Signed-off-by: Johannes Berg Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca212b813299899d2968aa0a24a797c3746f5ec Author: Dave Jones Date: Fri Sep 29 02:00:14 2006 -0700 [PATCH] Remove another config.h After the asm/ uses of #include this one is the next biggest source of noise. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee731f4f7880b09ca147008ab46ad4e5f72cb8bf Author: Ernie Petrides Date: Fri Sep 29 02:00:13 2006 -0700 [PATCH] fix wrong error code on interrupted close syscalls The problem is that close() syscalls can call a file system's flush handler, which in turn might sleep interruptibly and ultimately pass back an -ERESTARTSYS return value. This happens for files backed by an interruptible NFS mount under nfs_file_flush() when a large file has just been written and nfs_wait_bit_interruptible() detects that there is a signal pending. I have a test case where the "strace" command is used to attach to a process sleeping in such a close(). Since the SIGSTOP is forced onto the victim process (removing it from the thread's "blocked" mask in force_sig_info()), the RPC wait is interrupted and the close() is terminated early. But the file table entry has already been cleared before the flush handler was called. Thus, when the syscall is restarted, the file descriptor appears closed and an EBADF error is returned (which is wrong). What's worse, there is the hypothetical case where another thread of a multi-threaded application might have reused the file descriptor, in which case that file would be mistakenly closed. The bottom line is that close() syscalls are not restartable, and thus -ERESTARTSYS return values should be mapped to -EINTR. This is consistent with the close(2) manual page. The fix is below. Signed-off-by: Ernie Petrides Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bbab9166a82d15442357cfd63ec530b5b5fb62e Author: Jesper Juhl Date: Fri Sep 29 02:00:12 2006 -0700 [PATCH] Small update to CREDITS Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a45bce49545739a940f8bd4ca85c3b7435564893 Author: Paul E. McKenney Date: Fri Sep 29 02:00:11 2006 -0700 [PATCH] memory ordering in __kfifo primitives Both __kfifo_put() and __kfifo_get() have header comments stating that if there is but one concurrent reader and one concurrent writer, locking is not necessary. This is almost the case, but a couple of memory barriers are needed. Another option would be to change the header comments to remove the bit about locking not being needed, and to change the those callers who currently don't use locking to add the required locking. The attachment analyzes this approach, but the patch below seems simpler. Signed-off-by: Paul E. McKenney Cc: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99de055ac065e19ed69de961e97c6336a261b34e Author: Dave Jones Date: Fri Sep 29 02:00:10 2006 -0700 [PATCH] lockdep: print kernel version Lets do the same thing we do for oopses - print out the version in the report. It's an extra line of output though. We could tack it on the end of the INFO: lines, but that screws up Ingo's pretty output. Signed-off-by: Dave Jones Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b33b4dcbe5e09e683eef281f72aef951e17061c Author: Anatoli Antonovitch Date: Fri Sep 29 02:00:09 2006 -0700 [PATCH] atiixp: ATI SB600 IDE support for various modes Support SB600 SATA legacy IDE (DMA enable). Signed-off-by: Anatoli Antonovitch Cc: Jeff Garzik Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01d553d0fe9f90a132c5ff494872be8d4126be1e Author: Amos Waterland Date: Fri Sep 29 02:00:08 2006 -0700 [PATCH] Chardev checking of overlapping ranges The code in __register_chrdev_region checks that if the driver wishing to register has the same major as an existing driver the new minor range is strictly less than the existing minor range. However, it does not also check that the new minor range is strictly greater than the existing minor range. That is, if driver X has registered with major=x and minor=0-3, __register_chrdev_region will allow driver Y to register with major=x and minor=1-4. Signed-off-by: Amos Waterland Cc: Linas Vepstas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f400e198b2ed26ce55b22a1412ded0896e7516ac Author: Sukadev Bhattiprolu Date: Fri Sep 29 02:00:07 2006 -0700 [PATCH] pidspace: is_init() This is an updated version of Eric Biederman's is_init() patch. (http://lkml.org/lkml/2006/2/6/280). It applies cleanly to 2.6.18-rc3 and replaces a few more instances of ->pid == 1 with is_init(). Further, is_init() checks pid and thus removes dependency on Eric's other patches for now. Eric's original description: There are a lot of places in the kernel where we test for init because we give it special properties. Most significantly init must not die. This results in code all over the kernel test ->pid == 1. Introduce is_init to capture this case. With multiple pid spaces for all of the cases affected we are looking for only the first process on the system, not some other process that has pid == 1. Signed-off-by: Eric W. Biederman Signed-off-by: Sukadev Bhattiprolu Cc: Dave Hansen Cc: Serge Hallyn Cc: Cedric Le Goater Cc: Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 959ed340f4867fda7684340625f60e211c2296d6 Author: Eric Biederman Date: Fri Sep 29 02:00:06 2006 -0700 [PATCH] Fix conflict with the is_init identifier on parisc This appears to be the only usage of is_init in the kernel besides the usage in sched.h. On ia64 the same function is called in_init. So to remove the conflict and make the kernel more consistent rename is_init is_core is_local and is_local_section to in_init in_core in_local and in_local_section respectively. Thanks to Adrian Bunk who spotted this, and to Matthew Wilcox who suggested this fix. Signed-off-by: Eric Biederman Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b9b8ab65d8eed784b9164d03807cb2bda7b5cd6 Author: Kirill Korotaev Date: Fri Sep 29 02:00:05 2006 -0700 [PATCH] Fix unserialized task->files changing Fixed race on put_files_struct on exec with proc. Restoring files on current on error path may lead to proc having a pointer to already kfree-d files_struct. ->files changing at exit.c and khtread.c are safe as exit_files() makes all things under lock. Found during OpenVZ stress testing. [akpm@osdl.org: add export] Signed-off-by: Pavel Emelianov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc09561d6392771a392dea55c287de7e849b6b63 Author: Serge E. Hallyn Date: Fri Sep 29 02:00:04 2006 -0700 [PATCH] kthread: convert arch/i386/kernel/apm.c Convert i386 apm.c from kernel_thread(), whose export is deprecated, to kthread API. Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca9bda00b4aafc42cd3d1b9d32934463e2993b4c Author: Alan Cox Date: Fri Sep 29 02:00:03 2006 -0700 [PATCH] tty locking on resize The current kernel serializes console resizes but does not serialize the resize against the tty structure updates. This means that while two parallel resizes cannot mess up the console you can get incorrect results reported. Secondly while doing this I added vc_lock_resize() to lock and resize the console. This leaves all knowledge of the console_sem in the vt/console driver and kicks it out of the tty layer, which is good Thirdly while doing this I decided I couldn't stand "disallocate" any longer so I switched it to "deallocate". Signed-off-by: Alan Cox Cc: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae78bf9c4f5fde3c67e2829505f195d7347ce3e4 Author: Chris Mason Date: Fri Sep 29 02:00:03 2006 -0700 [PATCH] add -o flush for fat Fat is commonly used on removable media. Mounting with -o flush tells the FS to write things to disk as quickly as possible. It is like -o sync, but much faster (and not as safe). Signed-off-by: Chris Mason Cc: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b77df08a36d989f7dd00ccb6a026a0e96170d16 Author: Arun Sharma Date: Fri Sep 29 02:00:01 2006 -0700 [PATCH] oprofile: ppro: need to enable/disable all the counters Need to enable/disable all the counters instead of just counter 0. This affects all cpus with family=6, including i386/core. Usual symptom: only counter 0 provides samples. Other counters don't produce samples. Signed-off-by: Arun Sharma Cc: Philippe Elie Cc: John Levon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50462062a02226a698a211d5bd535376c89b8603 Author: Alexey Dobriyan Date: Fri Sep 29 02:00:01 2006 -0700 [PATCH] fs.h: ifdef security fields [assuming BSD security levels are deleted] The only user of i_security, f_security, s_security fields is SELinux, however, quite a few security modules are trying to get into kernel. So, wrap them under CONFIG_SECURITY. Adding config option for each security field is likely an overkill. Following Stephen Smalley's suggestion, i_security initialization is moved to security_inode_alloc() to not clutter core code with ifdefs and make alloc_inode() codepath tiny little bit smaller and faster. The user of (highly greppable) struct fown_struct::security field is still to be found. I've checked every "fown_struct" and every "f_owner" occurence. Additionally it's removal doesn't break i386 allmodconfig build. struct inode, struct file, struct super_block, struct fown_struct become smaller. P.S. Combined with two reiserfs inode shrinking patches sent to linux-fsdevel, I can finally suck 12 reiserfs inodes into one page. /proc/slabinfo -ext2_inode_cache 388 10 +ext2_inode_cache 384 10 -inode_cache 280 14 +inode_cache 276 14 -proc_inode_cache 296 13 +proc_inode_cache 292 13 -reiser_inode_cache 336 11 +reiser_inode_cache 332 12 <= -shmem_inode_cache 372 10 +shmem_inode_cache 368 10 Signed-off-by: Alexey Dobriyan Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfe14677f286c9be5d683b88214def8f4b8a6f24 Author: Alexey Dobriyan Date: Fri Sep 29 02:00:00 2006 -0700 [PATCH] reiserfs: ifdef ACL stuff from inode Shrink reiserfs inode more (by 8 bytes) for ACL non-users: -reiser_inode_cache 344 11 +reiser_inode_cache 336 11 Signed-off-by: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 068fbb315dd1e9dd3418aac39a9cfeabe39c16a6 Author: Alexey Dobriyan Date: Fri Sep 29 01:59:58 2006 -0700 [PATCH] reiserfs: ifdef xattr_sem Shrink reiserfs inode by 12 bytes for xattr non-users (me). -reiser_inode_cache 356 11 +reiser_inode_cache 344 11 Signed-off-by: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6cab99bb478e067b1a7a120333ff326954a2412 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Sep 29 01:59:57 2006 -0700 [PATCH] unwind: fix unused variable warning when !CONFIG_MODULES Fix "variable defined but not used" compiler warning in unwind.c when CONFIG_MODULES is not set. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Jan Beulich Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e51a720b9d9ea5ebf0fda39108919c6626bffa3 Author: Alexey Dobriyan Date: Fri Sep 29 01:59:56 2006 -0700 [PATCH] ifdef ->quota_read, ->quota_write All suppliers of ->quota_read, ->quota_write (I've found ext2, ext3, UFS, reiserfs) already have them properly ifdeffed. All callers of ->quota_read, ->quota_write are under CONFIG_QUOTA umbrella, so... Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3172027148120b8f8797cbecc7d0a0b215736a1 Author: Chris Mason Date: Fri Sep 29 01:59:56 2006 -0700 [PATCH] Fix reiserfs latencies caused by data=ordered ReiserFS does periodic cleanup of old transactions in order to limit the length of time a journal replay may take after a crash. Sometimes, writing metadata from an old (already committed) transaction may require committing a newer transaction, which also requires writing all data=ordered buffers. This can cause very long stalls on journal_begin. This patch makes sure new transactions will not need to be committed before trying a periodic reclaim of an old transaction. It is low risk because if a bad decision is made, it just means a slightly longer journal replay after a crash. Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25736b1c692d436508585d1d710912e6f76be2d8 Author: Chris Mason Date: Fri Sep 29 01:59:54 2006 -0700 [PATCH] reiserfs_fsync should only use barriers when they are enabled make sure that reiserfs_fsync only triggers barriers when mounted with -o barrier=flush Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4328b40af16bae62ff8f854060d33daad237093 Author: Adam Tlalka Date: Fri Sep 29 01:59:53 2006 -0700 [PATCH] console utf-8 mode fixes Fix utf-8 mode so alternate charset modes always work according to control sequences interpreted in do_con_trol function preserving backward US-ASCII and VT100 semigraphics compatibility. Malformed utf-8 sequences are represented as sequences of replacement glyphs,original codes or '?' as a last resort. unicode-xterm, gnome-terminal, kconsole and other terminal emulators in utf-8 mode respect acsc, enacs, rmacs sequences. Also I found that some important system programs (from Debian distro) uses acsc in utf-8 mode - dselect, aptitude, w3m for example. Signed-off-by: Adam Tlalka Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08c67d2a5d1c97b7997dc9589f702d875c63de07 Author: Dmitry Torokhov Date: Fri Sep 29 01:59:52 2006 -0700 [PATCH] ucb1x00-ts: handle errors from input_register_device() ucb1x00-ts: handle errors from input_register_device() Signed-off-by: Dmitry Torokhov Cc: Russell King Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa83aa40ed2ae113d9ee5529cdd9e8c0e5fabe61 Author: Dave Jones Date: Fri Sep 29 01:59:51 2006 -0700 [PATCH] single bit flip detector In cases where we detect a single bit has been flipped, we spew the usual slab corruption message, which users instantly think is a kernel bug. In a lot of cases, single bit errors are down to bad memory, or other hardware failure. This patch adds an extra line to the slab debug messages in those cases, in the hope that users will try memtest before they report a bug. 000: 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b Single bit error detected. Possibly bad RAM. Run memtest86. [akpm@osdl.org: cleanups] Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 527063ba985740e9cd271731c31f503f916681c9 Author: Alexey Dobriyan Date: Fri Sep 29 01:59:50 2006 -0700 [PATCH] tty_io.c: keep davej sane Just comment and next "while" look _very_ wrong. Place { correctly to hint unsuspecting ones that it's the end of the loop actually. Signed-off-by: Alexey Dobriyan Cc: Dave Jones Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bc1fa8ae18f281b40903cce94baba10c3cf9d88 Author: Chris Wright Date: Fri Sep 29 01:59:49 2006 -0700 [PATCH] LSM: remove BSD secure level security module This code has suffered from broken core design and lack of developer attention. Broken security modules are too dangerous to leave around. It is time to remove this one. Signed-off-by: Chris Wright Acked-by: Michael Halcrow Acked-by: Serge Hallyn Cc: Davi Arnaut Acked-by: Greg Kroah-Hartman Acked-by: James Morris Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd1c6a48ac16b360746f9f111895931d332c35dd Author: Rolf Eike Beer Date: Fri Sep 29 01:59:49 2006 -0700 [PATCH] Use valid_dma_direction() in include/asm-i386/dma-mapping.h Now that the generic DMA code has a function to decide if a given DMA mapping is valid use it. This will catch cases where direction is not any of the defined enum values but some random number outside the valid range. The current implementation will only catch the defined but invalid case DMA_NONE. Signed-off-by: Rolf Eike Beer Acked-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6bd3a39f7c6ebad49c261c3d458df974c880758 Author: Rolf Eike Beer Date: Fri Sep 29 01:59:48 2006 -0700 [PATCH] Move valid_dma_direction() from x86_64 to generic code As suggested by Muli Ben-Yehuda this function is moved to generic code as may be useful for all archs. [akpm@osdl.org: fix] Signed-off-by: Rolf Eike Beer Cc: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d09d7ddf3018b4c6efa76dce72f6dec6054fa22b Author: Alan Cox Date: Fri Sep 29 01:59:47 2006 -0700 [PATCH] There is no devfs, there has never been a devfs, we have always been at war with... Jon Smirl noted a couple of tty driver functions now are quite misleadingly named with the death of devfs. A quick grep found another case in the lp driver. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2aae4a108dab8b8bc92270335f6e4b5c146b32ae Author: Rolf Eike Beer Date: Fri Sep 29 01:59:46 2006 -0700 [PATCH] Fix kerneldoc comments in kernel/timer.c Some of the kerneldoc comments in this file are ignored since the lead-in is malformed, using either "/*" or "/***" instead of "/**". [rdunlap@xenotime.net: kerneldoc fixes] Signed-off-by: Rolf Eike Beer Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7ff0dbf45ee8a7c4802ff46844e6e8167b7f360 Author: Jan-Frode Myklebust Date: Fri Sep 29 01:59:45 2006 -0700 [PATCH] oom_adj/oom_score documentation I was looking for the a way around an OOM-problem, and found a couple of undocumented new features for tuning the OOM-score of individual processes. Here's a small documentation patch for /proc//oom_adj and /proc//oom_score. Signed-off-by: Jan-Frode Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db630637b2f192bea2ba1c000e9cbe4e542a03ea Author: Steven Rostedt Date: Fri Sep 29 01:59:44 2006 -0700 [PATCH] clean up and remove some extra spinlocks from rtmutex Oleg brought up some interesting points about grabbing the pi_lock for some protections. In this discussion, I realized that there are some places that the pi_lock is being grabbed when it really wasn't necessary. Also this patch does a little bit of clean up. This patch basically does three things: 1) renames the "boost" variable to "chain_walk". Since it is used in the debugging case when it isn't going to be boosted. It better describes what the test is going to do if it succeeds. 2) moves get_task_struct to just before the unlocking of the wait_lock. This removes duplicate code, and makes it a little easier to read. The owner wont go away while either the pi_lock or the wait_lock are held. 3) removes the pi_locking and owner blocked checking completely from the debugging case. This is because the grabbing the lock and doing the check, then releasing the lock is just so full of races. It's just as good to go ahead and call the pi_chain_walk function, since after releasing the lock the owner can then block anyway, and we would have missed that. For the debug case, we really do want to do the chain walk to test for deadlocks anyway. [oleg@tv-sign.ru: more of the same] Signed-of-by: Steven Rostedt Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Oleg Nesterov Cc: Esben Nielsen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c24c95a085c6b52c11c2f5afecc38b0ca143cdae Author: Jan Beulich Date: Fri Sep 29 01:59:42 2006 -0700 [PATCH] fix Intel RNG detection Previously, since determination whether there was an Intel random number generator was based on a single bit, on systems with a matching bridge device but without a firmware hub, there was a 50% chance that the code would incorrectly decide that the system had an RNG. This patch adds detection of the firmware hub to better qualify the existence of an RNG. There is one issue with the patch: I was unable to determine the LPC equivalent for the PCI bridge 8086:2430 (since the old code didn't care about which of the many devices provided by the ICH/ESB it was chose to use the PCI bridge device, but the FWH settings live in the LPC device, so the device list needed to be changed). Signed-off-by: Jan Beulich Signed-off-by: Michael Buesch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39b3f6d6e915aa29ad6f90d1517d9217f903c8dc Author: Eric Sandeen Date: Fri Sep 29 01:59:41 2006 -0700 [PATCH] mount udf UDF_PART_FLAG_READ_ONLY partitions with MS_RDONLY There's a bug where a UDF_PART_FLAG_READ_ONLY udf partition gets mounted read-write, then subsequent problems happen; files seem to be able to be removed, but file creation results in EIO or worse, oops. EIO is coming from udf_new_block(), which returns EIO if the right flags aren't set; only UDF_PART_FLAG_READ_ONLY is set in this case. We probably s hould not have gotten this far... Attached patch seems to fix it - and includes a printk to alert the user that their "rw" mount request has been converted to "ro." Here's the testcase I used: [root@magnesium ~]# mkisofs -R -J -udf -o testiso /tmp/ ... Total translation table size: 0 Total rockridge attributes bytes: 342923 Total directory bytes: 382312 Path table size(bytes): 104 Max brk space used 103000 105059 extents written (205 MB) [root@magnesium ~]# mount -o loop testiso /mnt/test/ [root@magnesium ~]# ls /mnt/test/fsfile /mnt/test/fsfile [root@magnesium ~]# rm /mnt/test/fsfile [root@magnesium ~]# ls /mnt/test/fsfile ls: /mnt/test/fsfile: No such file or directory [root@magnesium ~]# touch /mnt/test/fsfile touch: cannot touch `/mnt/test/fsfile': Input/output error [root@magnesium tmp]# grep udf /proc/mounts /dev/loop1 /mnt/test udf rw 0 0 Force readonly mounts of UDF partitions marked as read-only. Signed-off-by: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c5c934153513dc72e2d6464f39e8ef1f27c0a3e Author: Alexey Dobriyan Date: Fri Sep 29 01:59:40 2006 -0700 [PATCH] ifdef blktrace debugging fields Signed-off-by: Alexey Dobriyan Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d5b6fccc4b900cc4267692f015ea500bad4c6bf Author: Alexey Dobriyan Date: Fri Sep 29 01:59:40 2006 -0700 [PATCH] task_struct: ifdef Missed'em V IPC ipc/sem.c only. $ agrep sysvsem -w -n ipc/sem.c:912: undo_list = current->sysvsem.undo_list; ipc/sem.c:932: undo_list = current->sysvsem.undo_list; ipc/sem.c:954: undo_list = current->sysvsem.undo_list; ipc/sem.c:963: current->sysvsem.undo_list = undo_list; ipc/sem.c:1247: tsk->sysvsem.undo_list = undo_list; ipc/sem.c:1249: tsk->sysvsem.undo_list = NULL; ipc/sem.c:1271: undo_list = tsk->sysvsem.undo_list; include/linux/sched.h:876: struct sysv_sem sysvsem; Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1dfa92dcab72397ed1f85f7b8f98a9da43b3f7b Author: Olaf Hering Date: Fri Sep 29 01:59:39 2006 -0700 [PATCH] ignore partition table on disks with AIX label The on-disk data structures from AIX are not known, also the filesystem layout is not known. There is a msdos partition signature at the end of the first block, and the kernel recognizes 3 small (and overlapping) partitions. But they are not usable. Maybe the firmware uses it to find the bootloader for AIX, but AIX boots also if the first block is cleared. This is the content of the partition table: # dd if=/dev/sdb count=$(( 4 * 16 )) bs=1 skip=$(( 0x1be )) | xxd 0000000: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0000010: 80ff ffff 41ff ffff 1b11 0000 381b 0000 ....A.......8... 0000020: 00ff ffff 41ff ffff 0211 0000 1900 0000 ....A........... 0000030: 80ff ffff 41ff ffff 1b11 0000 381b 0000 ....A.......8... Handle the whole disk as empty disk. This fixes also YaST which compares the output from parted (and formerly fdisk) with /proc/partitions. fdisk recognizes the AIX label since a long time, SuSE has a patch for parted to handle the disk label as unknown. dmesg will look like this: sda: [AIX] unknown partition table Tested on an IBM B50 with AIX V4.3.3. Signed-off-by: Olaf Hering Cc: Albert Cahalan Cc: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 402749ea2538be9ddad981a990739b93a0178bc6 Author: Matthias Urlichs Date: Fri Sep 29 01:59:37 2006 -0700 [PATCH] Remove unused tty_struct field Unused: tty_struct.max_flip_cnt $ git grep max_flip_cnt include/linux/tty.h: int max_flip_cnt; $ Cc: Paul Fulghum Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e0c1f6ce7b816f63fea2af3e5e2cb20c66430e9 Author: Shem Multinymous Date: Fri Sep 29 01:59:37 2006 -0700 [PATCH] DMI: Decode and save OEM String information This teaches dmi_decode() how to decode and save OEM Strings (type 11) DMI information, which is currently discarded silently. Existing code using DMI is not affected. Follows the "System Management BIOS (SMBIOS) Specification" (http://www.dmtf.org/standards/smbios), and also the userspace dmidecode.c code. OEM Strings are the only safe way to identify some hardware, e.g., the ThinkPad embedded controller used by the soon-to-be-submitted tp_smapi driver. This will also let us eliminate the long whitelist in the mainline hdaps driver (in a future patch). Signed-off-by: Shem Multinymous Cc: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89e7e374dde1015d69d2d70797ae4053b14fa9db Author: Josh Triplett Date: Fri Sep 29 01:59:36 2006 -0700 [PATCH] timer: add lock annotation to lock_timer_base lock_timer_base acquires a lock and returns with that lock held. Add a lock annotation to this function so that sparse can check callers for lock pairing, and so that sparse will not complain about this function since it intentionally uses the lock in this manner. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 650a898342b3fa21c392c06a2b7010fa19823efa Author: Miklos Szeredi Date: Fri Sep 29 01:59:35 2006 -0700 [PATCH] vfs: define new lookup flag for chdir In the "operation does permission checking" model used by fuse, chdir permission is not checked, since there's no chdir method. For this case set a lookup flag, which will be passed to ->permission(), so fuse can distinguish it from permission checks for other operations. Signed-off-by: Miklos Szeredi Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b35e8e58a315b16d123e2bc080fcc9981501ac4 Author: Miklos Szeredi Date: Fri Sep 29 01:59:34 2006 -0700 [PATCH] fuse: use dentry in statfs Some filesystems may want to report different values depending on the path within the filesystem, i.e. one mount is actually several filesystems. This can be the case for a network filesystem exported by an unprivileged server (e.g. sshfs). This is now possible, thanks to David Howells "VFS: Permit filesystem to perform statfs with a known root dentry" patch. This change is backward compatible, so no need to change interface version. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d10be6d1bdb0c901b78244872de3cc1c1b6c3fb2 Author: Mark Huang Date: Fri Sep 29 01:59:34 2006 -0700 [PATCH] module_subsys: initialize earlier Initialize module_subsys earlier (or at least earlier than devices) since it could be used very early in the boot process if kmod loads a module before the device initcalls. Otherwise, kmod will crash in kernel/module.c:mod_sysfs_setup() since the kset in module_subsys is not initialized yet. I only noticed this problem because occasionally, kmod loads the modules for my SCSI and Ethernet adapters very early, during the boot process itself. I don't quite understand why it loads them sometimes and doesn't load them other times. Or who is telling kmod to do so. Can someone explain? Signed-off-by: Mark Huang Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8454aeef6fea944ced757ff8e761b59eb3ee960f Author: Eugene Teo Date: Fri Sep 29 01:59:33 2006 -0700 [PATCH] Require mmap handler for a.out executables Files supported by fs/proc/base.c, i.e. /proc//*, are not capable of meeting the validity checks in ELF load_elf_*() handling because they have no mmap handler which is required by ELF. In order to stop a.out executables being used as part of an exploit attack against /proc-related vulnerabilities, we make a.out executables depend on ->mmap() existing. Signed-off-by: Eugene Teo Signed-off-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 563d075702454f6fa745ff8b0db605c73478078e Author: Sukadev Bhattiprolu Date: Fri Sep 29 01:59:31 2006 -0700 [PATCH] kthread: drivers/base/firmware_class.c Replace kernel_thread() call in drivers/base/firmware_class.c with kthread_create() since kernel_thread() is deprecated in drivers. Signed-off-by: Sukadev Bhattiprolu Cc: Cedric Le Goater Cc: Serge E. Hallyn Cc: Dave Hansen Cc: Manuel Estrada Sainz Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a49a4af759c0193d42aeaeefb4df7de8973dd713 Author: Josh Triplett Date: Fri Sep 29 01:59:30 2006 -0700 [PATCH] rcu: add lock annotations to rcu{,_bh}_torture_read_{lock,unlock} rcu_torture_read_lock and rcu_bh_torture_read_lock acquire locks without releasing them, and the matching functions rcu_torture_read_unlock and rcu_bh_torture_read_unlock get called with the corresponding locks held and release them. Add lock annotations to these four functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Acked-by: Paul McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c4dbee79d3f46608bec3ac80d392ce6415d2f90 Author: Josh Triplett Date: Fri Sep 29 01:59:29 2006 -0700 [PATCH] fs: add lock annotation to grab_super grab_super gets called with sb_lock held, and releases it. Add a lock annotation to this function so that sparse can check callers for lock pairing, and so that sparse will not complain about this function since it intentionally uses the lock in this manner. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db0b0ead60815155c791e8f479ee4777e7946369 Author: Michael S. Tsirkin Date: Fri Sep 29 01:59:28 2006 -0700 [PATCH] lockdep: don't pull in includes when lockdep disabled Do not pull in various includes through lockdep.h if lockdep is disabled. Signed-off-by: Michael S. Tsirkin Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddc0a51d2e351985aa542ff650635e2fd62d3f8b Author: Josh Triplett Date: Fri Sep 29 01:59:27 2006 -0700 [PATCH] hugetlbfs: add lock annotation to hugetlbfs_forget_inode() hugetlbfs_forget_inode releases inode_lock. Add a lock annotation to this function so that sparse can check callers for lock pairing, and so that sparse will not complain about this functions since it intentionally uses the lock in this manner. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 105f4d7a813e9ef6be58549f5d2a49af1764da19 Author: Josh Triplett Date: Fri Sep 29 01:59:25 2006 -0700 [PATCH] fuse: add lock annotations to request_end and fuse_read_interrupt request_end and fuse_read_interrupt release fc->lock. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Acked-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99fc705996285ed2746c0c8ae8313d0a04d62ec9 Author: Josh Triplett Date: Fri Sep 29 01:59:25 2006 -0700 [PATCH] afs: add lock annotations to afs_proc_cell_servers_{start,stop} afs_proc_cell_servers_start acquires a lock, and afs_proc_cell_servers_stop releases that lock. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58f555e5f62b6a8326caf6d45ac611186f24587d Author: Josh Triplett Date: Fri Sep 29 01:59:24 2006 -0700 [PATCH] mbcache: add lock annotation for __mb_cache_entry_release_unlock() __mb_cache_entry_release_unlock releases mb_cache_spinlock, so annotate it accordingly. Signed-off-by: Josh Triplett Cc: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0de7fca10a3d7ddb99188b4752cc473c4e2c96e Author: Josh Triplett Date: Fri Sep 29 01:59:23 2006 -0700 [PATCH] efi: add lock annotations for efi_call_phys_prelog and efi_call_phys_epilog The functions efi_call_phys_prelog and efi_call_phys_epilog in arch/i386/kernel/efi.c wrap the spinlock efi_rt_lock: efi_call_phys_prelog returns with the lock held, and efi_call_phys_epilog releases the lock without acquiring it. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 538d9d532b0e0320c9dd326a560b5a72d73f910d Author: Yoichi Yuasa Date: Fri Sep 29 01:59:22 2006 -0700 [PATCH] irq: remove a extra line Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ff6fd8f4a40b72ff35dbb1e08eb9ed6b64b6028 Author: Yoichi Yuasa Date: Fri Sep 29 01:59:21 2006 -0700 [PATCH] irq: fixed coding style Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42012cc4a2183c555a907eee32d7ce4fc7dc3a6a Author: Olaf Hering Date: Fri Sep 29 01:59:21 2006 -0700 [PATCH] use gcc -O1 in fs/reiserfs only for ancient gcc versions Only compile with -O1 if the (very old) compiler is broken. We use reiserfs alot since SLES9 on ppc64, and it was never seen with gcc33. Assume the broken gcc is gcc-3.4 or older. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d24607bfaab3d02fd0d6e0ffc22f29c2bc8eb30 Author: Komal Shah Date: Fri Sep 29 01:59:20 2006 -0700 [PATCH] OMAP: Update OMAP1/2 boards to give keymapsize and other pdata This patch adds keymapsize, delay and debounce flag in the keypad platform data for various TI OMAP1/2 based boards like F-sample, H2, H3, Innovator, Nokia770, OSK, Perseus and H4. Signed-off-by: Komal Shah Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad4e09b16ad361c15bd7186dcd118cb901089b97 Author: Komal Shah Date: Fri Sep 29 01:59:19 2006 -0700 [PATCH] OMAP: Add keypad driver This patch adds support for keypad driver running on different TI OMAP(http://www.ti.com/omap) processor based boards like OSK, H2, H3, H4, Persuas and Nokia 770. Signed-off-by: Komal Shah Acked-by: Dmitry Torokhov Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7768a13c252a97e13a552f88f642962768de1fa4 Author: Komal Shah Date: Fri Sep 29 01:59:18 2006 -0700 [PATCH] OMAP: Add Watchdog driver support Add Texas Instruments (TI) OMAP1/2 (http://www.ti.com/omap) based processors, like OMAP1610/1710/242x. [akpm@osdl.org: cleanups] Cc: Cc: "Komal Shah" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1b7c5f459b21feba80f96415429ff2570d63e4d Author: Komal Shah Date: Fri Sep 29 01:59:15 2006 -0700 [PATCH] OMAP: Add smc91x support for TI OMAP2420 H4 board Add smc91x support for TI OMAP2420 H4 EVM board. Cc: Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c22f008ba226e2ff25ee1a56abd9c5fd355828fc Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Sep 29 01:59:14 2006 -0700 [PATCH] spinlock_debug: don't recompute (jiffies_per_loop * HZ) in spinloop In spinlock_debug.c, the spinloops call __delay() on every iteration. Because that is an external function, (jiffies_per_loop * HZ), the loop's iteration limit, gets recomputed every time. Caching it explicitly prevents that. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92a0f861fe1790dad55ea249169d94f2dc88d696 Author: Rolf Eike Beer Date: Fri Sep 29 01:59:13 2006 -0700 [PATCH] Fix parameter names in drivers/base/class.c Change parameter names to match arguments of functions. Signed-off-by: Rolf Eike Beer Cc: Martin Waitz Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78b2290f2977044ced27d1158b03587aa674fe07 Author: Rolf Eike Beer Date: Fri Sep 29 01:59:12 2006 -0700 [PATCH] Include documentation for functions in drivers/base/class.c drivers/base/class.c is omitted by "make *docs". Add it to get documentation for class_create() and friends for free. Signed-off-by: Rolf Eike Beer Cc: Martin Waitz Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c9979185c7ef4feeb7f8d29be032b8f032a1838 Author: Serge E. Hallyn Date: Fri Sep 29 01:59:11 2006 -0700 [PATCH] kthread: convert loop.c to kthread Convert loop.c from the deprecated kernel_thread to kthread. This patch simplifies the code quite a bit and passes similar testing to the previous submission on both emulated x86 and s390. Changes since last submission: switched to using a rather simple loop based on wait_event_interruptible. Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b217fa75c3aea381f1f5fa7ff09e7b4019ea374 Author: Randy Dunlap Date: Fri Sep 29 01:59:10 2006 -0700 [PATCH] kernel-doc: move filesystems together Move all VFS + filesystem docs together. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c78a6639386f9e7399fbc0d0a173d4cc1a3e9bf Author: Randy Dunlap Date: Fri Sep 29 01:59:10 2006 -0700 [PATCH] kernel-doc for relay interface Add relay interface support to DocBook/kernel-api.tmpl. Fix typos etc. in relay.c and relayfs.txt. Signed-off-by: Randy Dunlap Acked-by: Tom Zanussi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0d92cbc5849f26451f478d538b8d885ae547221 Author: Pekka J Enberg Date: Fri Sep 29 01:59:09 2006 -0700 [PATCH] libfs: remove page up-to-date check from simple_readpage Remove the unnecessary PageUptodate check from simple_readpage. The only two callers for ->readpage that don't have explicit PageUptodate check are read_cache_pages and page_cache_read which operate on newly allocated pages which don't have the flag set. [akpm: use the allegedly-faster clear_page(), too] Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfedc920a7bca828fd4af8e203f7d8514990f999 Author: Chris Boot Date: Fri Sep 29 01:59:08 2006 -0700 [PATCH] Make net48xx-led use scx200_gpio_ops Make the next48xx LED code use scx200_gpio_ops instead of raw SCx200 GPIO accesses. Signed-off-by: Chris Boot Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58012cd788443b9d144bd7c72260a84b6b30f45d Author: Chris Boot Date: Fri Sep 29 01:59:07 2006 -0700 [PATCH] scx200_gpio export cleanups Use EXPORT_SYMBOL_GPL for new symbols, and declare the struct in the header file for access by other modules. Signed-off-by: Chris Boot Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 684f978347deb42d180373ac4c427f82ef963171 Author: Herbert Xu Date: Fri Sep 29 01:59:06 2006 -0700 [PATCH] Let WARN_ON/WARN_ON_ONCE return the condition Letting WARN_ON/WARN_ON_ONCE return the condition means that you could do if (WARN_ON(blah)) { handle_impossible_case } Rather than if (unlikely(blah)) { WARN_ON(1) handle_impossible_case } I checked all the newly added WARN_ON_ONCE users and none of them test the return status so we can still change it. [akpm@osdl.org: warning fix] [akpm@osdl.org: build fix] Signed-off-by: Herbert Xu Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6299a2dec89d22940e36832f15c0addfb77e6910 Author: Adrian Bunk Date: Fri Sep 29 01:59:05 2006 -0700 [PATCH] drivers/char/pc8736x_gpio.c: remove unused static functions drivers/char/pc8736x_gpio.c:192: warning: #pc8736x_gpio_set_high# defined but not used drivers/char/pc8736x_gpio.c:197: warning: #pc8736x_gpio_set_low# defined but not used Signed-off-by: Adrian Bunk Acked-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8ad9681fdec37ad298da6d505f9baba61e5f15c Author: Jim Cromie Date: Fri Sep 29 01:59:05 2006 -0700 [PATCH] drivers/char/scx200_gpio.c: make code static This patch makes a needlessly global variable static. Signed-off-by: Adrian Bunk Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 358333a0cb4a6d279806e38d0368b79066dbe5e7 Author: Steven Rostedt Date: Fri Sep 29 01:59:04 2006 -0700 [PATCH] remove unnecessary barrier in rtc_get_rtc_time Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9938406ab6b2558d60c0c7200cc8e12f1ea7104a Author: Michal Schmidt Date: Fri Sep 29 01:59:03 2006 -0700 [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs touch_nmi_watchdog() calls touch_softlockup_watchdog() on both architectures that implement it (i386 and x86_64). On other architectures it does nothing at all. touch_nmi_watchdog() should imply touch_softlockup_watchdog() on all architectures. Suggested by Andi Kleen. [heiko.carstens@de.ibm.com: s390 fix] Signed-off-by: Michal Schmidt Cc: Andi Kleen Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Cc: Michal Schmidt Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df89a864631f5d840f4873c4c03733b4206e78ea Author: Manfred Spraul Date: Fri Sep 29 01:59:01 2006 -0700 [PATCH] list_del debug check A list_del() debugging check. Has been in -mm for years. Dave moved list_del() out-of-line in the debug case, so this is now suitable for mainline. Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 199a9afc3dbe98c35326f1d3907ab94dae953a6e Author: Dave Jones Date: Fri Sep 29 01:59:00 2006 -0700 [PATCH] Debug variants of linked list macros Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df67b3daea602728b51325a4debaeeb912ee51d1 Author: Jason Baron Date: Fri Sep 29 01:58:58 2006 -0700 [PATCH] make PROT_WRITE imply PROT_READ Make PROT_WRITE imply PROT_READ for a number of architectures which don't support write only in hardware. While looking at this, I noticed that some architectures which do not support write only mappings already take the exact same approach. For example, in arch/alpha/mm/fault.c: " if (cause < 0) { if (!(vma->vm_flags & VM_EXEC)) goto bad_area; } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) goto bad_area; } else { if (!(vma->vm_flags & VM_WRITE)) goto bad_area; } " Thus, this patch brings other architectures which do not support write only mappings in-line and consistent with the rest. I've verified the patch on ia64, x86_64 and x86. Additional discussion: Several architectures, including x86, can not support write-only mappings. The pte for x86 reserves a single bit for protection and its two states are read only or read/write. Thus, write only is not supported in h/w. Currently, if i 'mmap' a page write-only, the first read attempt on that page creates a page fault and will SEGV. That check is enforced in arch/blah/mm/fault.c. However, if i first write that page it will fault in and the pte will be set to read/write. Thus, any subsequent reads to the page will succeed. It is this inconsistency in behavior that this patch is attempting to address. Furthermore, if the page is swapped out, and then brought back the first read will also cause a SEGV. Thus, any arbitrary read on a page can potentially result in a SEGV. According to the SuSv3 spec, "if the application requests only PROT_WRITE, the implementation may also allow read access." Also as mentioned, some archtectures, such as alpha, shown above already take the approach that i am suggesting. The counter-argument to this raised by Arjan, is that the kernel is enforcing the write only mapping the best it can given the h/w limitations. This is true, however Alan Cox, and myself would argue that the inconsitency in behavior, that is applications can sometimes work/sometimes fails is highly undesireable. If you read through the thread, i think people, came to an agreement on the last patch i posted, as nobody has objected to it... Signed-off-by: Jason Baron Cc: Russell King Cc: "Luck, Tony" Cc: Hugh Dickins Cc: Roman Zippel Cc: Geert Uytterhoeven Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Acked-by: Andi Kleen Acked-by: Alan Cox Cc: Arjan van de Ven Acked-by: Paul Mundt Cc: Kazumoto Kojima Cc: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15a67dd8ccf696392176c95a08234a8b8ee59005 Author: Randy Dunlap Date: Fri Sep 29 01:58:57 2006 -0700 [PATCH] fs/namespace: handle init/registration errors Check and handle init errors. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87a57261105669d13a9cae747b5b67ca1cbcda3c Author: Randy Dunlap Date: Fri Sep 29 01:58:56 2006 -0700 [PATCH] block: handle subsystem_register() init errors Check and handle init errors. Signed-off-by: Randy Dunlap Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d7dd8fd9557840162b724a8ac1366dd78a12dff Author: Andrew Morton Date: Fri Sep 29 01:58:56 2006 -0700 [PATCH] blockdev.c: check driver layer errors Check driver layer errors. Fix from: "Jun'ichi Nomura" In blockdevc-check-errors.patch, add_bd_holder() is modified to return error values when some of its operation failed. Among them, it returns -EEXIST when a given bd_holder object already exists in the list. However, in this case, the function completed its work successfully and need no action by its caller other than freeing unused bd_holder object. So I think it's better to return success after freeing by itself. Otherwise, bd_claim-ing with same claim pointer will fail. Typically, lvresize will fails with following message: device-mapper: reload ioctl failed: Invalid argument and you'll see messages like below in kernel log: device-mapper: table: 254:13: linear: dm-linear: Device lookup failed device-mapper: ioctl: error adding target to table Similarly, it should not add bd_holder to the list if either one of symlinking fails. I don't have a test case for this to happen but it should cause dereference of freed pointer. If a matching bd_holder is found in bd_holder_list, add_bd_holder() completes its job by just incrementing the reference count. In this case, it should be considered as success but it used to return 'fail' to let the caller free temporary bd_holder. Fixed it to return success and free given object by itself. Also, if either one of symlinking fails, the bd_holder should not be added to the list so that it can be discarded later. Otherwise, the caller will free bd_holder which is in the list. Signed-off-by: Jun'ichi Nomura Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8c7649e99e4b081b624aefe1e77caa30b53cb18 Author: Randy Dunlap Date: Fri Sep 29 01:58:55 2006 -0700 [PATCH] kernel/params: driver layer error checking Check driver layer return values in kernel/params.c Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5906e4171ad61ce68de95e51b773146707671f80 Author: Jeff Dike Date: Fri Sep 29 01:58:54 2006 -0700 [PATCH] uml: remove pte_mkexec Andi is making pte_mkexec go away, and UML had one of the last uses. This removes the use and the definition. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fade5d5461b0379b27ca96faf560d855d7a0ea8b Author: Jeff Dike Date: Fri Sep 29 01:58:53 2006 -0700 [PATCH] uml: don't roll my own random MAC generator Use the existing random_ether_addr() instead of cooking up my own version. Pointed out by Dave Hollis and Jason Lunz. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b89af765cd62c1c3ca6c81adca45084f8840e06 Author: Jeff Dike Date: Fri Sep 29 01:58:52 2006 -0700 [PATCH] uml: remove unneeded file Remove arch/um/kernel/skas/process_kern.c again. The stack alignment change which resulted in this file being here is safely in arch/um/kernel/process.c. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f92afe56a0dcd271cb94e12acf1861d44c3faefd Author: Jeff Dike Date: Fri Sep 29 01:58:52 2006 -0700 [PATCH] uml: stack consumption reduction Fix some stack abuse in the sysrq t path. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80c13749140284abdc23bbeed2507b7e5a3dc459 Author: Jeff Dike Date: Fri Sep 29 01:58:51 2006 -0700 [PATCH] uml: close file descriptor leaks Close two file descriptor leaks, one in the ubd driver and one to /proc/mounts. The ubd driver bug also leaked some vmalloc space. The /proc/mounts leak was a descriptor that was just never closed. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 730760e90a173ef81f89beed2f1dad2fab310f68 Author: Jeff Dike Date: Fri Sep 29 01:58:50 2006 -0700 [PATCH] uml: locking documentation Some locking documentation and a cleanup. uml_exitcode is copied into a local before sprintf sees it, in case sprintf does anything non-atomic with it. The rest are comments about why certain globals don't need any kind of locking. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b10aeeef554eb1ff80e10111829f6e7484877811 Author: Jeff Dike Date: Fri Sep 29 01:58:50 2006 -0700 [PATCH] uml: mechanical tidying after random MACs change Mechanical, hopefully non-functional changes stemming from setup_etheraddr always succeeding now that it always assigns a MAC, either from the command line or generated randomly: the test of the return of setup_etheraddr is removed, and code dependent on it succeeding is now unconditional setup_etheraddr can now be made void struct uml_net.have_mac is now always 1, so tests of it can be similarly removed, and uses of it can be replaced with 1 struct uml_net.have_mac is no longer used, so it can be removed struct uml_net_private.have_mac is copied from struct uml_net, so it is always 1 tests of uml_net_private.have_mac can be removed uml_net_private.have_mac can now be removed the only call to dev_ip_addr was removed, so it can be deleted It also turns out that setup_etheraddr is called only once, from the same file, so it can be static and its declaration removed from net_kern.h. Similarly, set_ether_mac is defined and called only from one file. Finally, setup_etheraddr and set_ether_mac were moved to avoid needing forward declarations. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3e7ed2b617824f79d1223f37430ccffae59e5b8 Author: Jeff Dike Date: Fri Sep 29 01:58:46 2006 -0700 [PATCH] uml: assign random MACs to interfaces if necessary Assign a random MAC to an ethernet interface if one was not provided on the command line. This became pressing when distros started bringing interfaces up before assigning IPs to them. The previous pattern of assigning an IP then bringing it up allowed the MAC to be generated from the first IP assigned. However, once the thing is up, it's probably a bad idea to change the MAC, so the MAC stayed initialized to fe:fd:0:0:0:0. Now, if there is no MAC from the command line, one is generated. We use the microseconds from gettimeofday (20 bits), plus the low 12 bits of the pid to seed the random number generator. random() is called twice, with 16 bits of each result used. I didn't want to have to try to fill in 32 bits optimally given an arbitrary RAND_MAX, so I just assume that it is greater than 65536 and use 16 bits of each random() return. There is also a bit of reformatting and whitespace cleanup here. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b08606dc2991bcdab14139efd9ed9d492f5f901 Author: keith mannthey Date: Fri Sep 29 01:58:46 2006 -0700 [PATCH] convert i386 Summit subarch to use SRAT info for apicid_to_node calls Convert the i386 summit subarch apicid_to_node to use node information provided by the SRAT. It was discussed a little on LKML a few weeks ago and was seen as an acceptable fix. The current way of obtaining the nodeid static inline int apicid_to_node(int logical_apicid) { return logical_apicid >> 5; } is just not correct for all summit systems/bios. Assuming the apicid matches the Linux node number require a leap of faith that the bios mapped out the apicids a set way. Modern summit HW (IBM x460) does not layout its bios in the manner for various reasons and is unable to boot i386 numa. The best way to get the correct apicid to node information is from the SRAT table during boot. It lays out what apicid belongs to what node. I use this information to create a table for use at run time. Signed-off-by: Keith Mannthey Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3528a95322b5c1ce882ab723f175a1845430cd89 Author: Cory Olmo Date: Fri Sep 29 01:58:44 2006 -0700 [PATCH] SELinux: support mls categories for context mounts Allows commas to be embedded into context mount options (i.e. "-o context=some_selinux_context_t"), to better support multiple categories, which are separated by commas and confuse mount. For example, with the current code: mount -t iso9660 /dev/cdrom /media/cdrom -o \ ro,context=system_u:object_r:iso9660_t:s0:c1,c3,c4,exec The context option that will be interpreted by SELinux is context=system_u:object_r:iso9660_t:s0:c1 instead of context=system_u:object_r:iso9660_t:s0:c1,c3,c4 The options that will be passed on to the file system will be ro,c3,c4,exec. The proposed solution is to allow/require the SELinux context option specified to mount to use quotes when the context contains a comma. This patch modifies the option parsing in parse_opts(), contained in mount.c, to take options after finding a comma only if it hasn't seen a quote or if the quotes are matched. It also introduces a new function that will strip the quotes from the context option prior to translation. The quotes are replaced after the translation is completed to insure that in the event the raw context contains commas the kernel will be able to interpret the correct context. Signed-off-by: Cory Olmo Signed-off-by: James Morris Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79f5acf5d784492afe80723496624093079aed9c Author: Adam Litke Date: Fri Sep 29 01:58:43 2006 -0700 [PATCH] mm: make filemap_nopage use NOPAGE_SIGBUS Don't open-code NOPAGE_SIGBUS. Signed-off-by: Adam Litke Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ce072f1faf29d24df4600f53db8cdd62d400a8f Author: Siddha, Suresh B Date: Fri Sep 29 01:58:42 2006 -0700 [PATCH] mm: fix a race condition under SMC + COW Failing context is a multi threaded process context and the failing sequence is as follows. One thread T0 doing self modifying code on page X on processor P0 and another thread T1 doing COW (breaking the COW setup as part of just happened fork() in another thread T2) on the same page X on processor P1. T0 doing SMC can endup modifying the new page Y (allocated by the T1 doing COW on P1) but because of different I/D TLB's, P0 ITLB will not see the new mapping till the flush TLB IPI from P1 is received. During this interval, if T0 executes the code created by SMC it can result in an app error (as ITLB still points to old page X and endup executing the content in page X rather than using the content in page Y). Fix this issue by first clearing the PTE and flushing it, before updating it with new entry. Hugh sayeth: I was a bit sceptical, in the habit of thinking that Self Modifying Code must look such issues itself: but I guess there's nothing it can do to avoid this one. Fair enough, what you're changing it to is pretty much what powerpc and s390 were already doing, and is a more robust way of proceeding, consistent with how ptes are set everywhere else. The ptep_clear_flush is a bit heavy-handed (it's anxious to return the pte that was atomically cleared), but we'd have to wander through lots of arches to get the right minimal behaviour. It'd also be nice to eliminate ptep_establish completely, now only used to define other macros/inlines: it always seemed obfuscation to me, what you've got there now is clearer. Let's put those cleanups on a TODO list. Signed-off-by: Suresh Siddha Acked-by: "David S. Miller" Acked-by: Hugh Dickins Cc: Nick Piggin Cc: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dcea57ae19275451a756a2d5bf96b329487b0e0 Author: Heiko Carstens Date: Fri Sep 29 01:58:41 2006 -0700 [PATCH] convert s390 page handling macros to functions Convert s390 page handling macros to functions. In particular this fixes a problem with s390's SetPageUptodate macro which uses its input parameter twice which again can cause subtle bugs. [akpm@osdl.org: build fix] Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 Author: Zoltan Menyhart Date: Fri Sep 29 01:58:40 2006 -0700 [PATCH] JBD: memory leak in "journal_init_dev()" We leak a bh ref in "journal_init_dev()" in case of failure. Signed-off-by: Zoltan Menyhart Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f71b2f10f56802075d67c5710cd9f1816382d720 Author: Dave Kleikamp Date: Fri Sep 29 01:58:39 2006 -0700 [PATCH] JBD: Make journal_brelse_array() static It's always good to make symbols static when we can, and this also eliminates the need to rename the function in jbd2 Suggested by Eric Sandeen. Signed-off-by: Dave Kleikamp Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4efd587bf9f9a97608b1fcecc78a4a046c37e9b1 Author: David Woodhouse Date: Fri Sep 29 01:58:37 2006 -0700 [PATCH] Fix uninitialised spinlock in via-pmu-backlight code. The uninitialised pmu_backlight_lock causes the current Fedora test kernel (which has spinlock debugging enabled) to panic on suspend. This is suboptimal, so I fixed it. Signed-off-by: David Woodhouse Acked-by: Benjamin Herrenschmidt Acked-by: Michael Hanselmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 910067d188d56d80801b71b0ca1f73aa400c7b8c Author: Matthew Wilcox Date: Fri Sep 29 01:58:36 2006 -0700 [PATCH] remove generic__raw_read_trylock() If the cpu has the lock held for write, is interrupted, and the interrupt handler calls read_trylock(), it's an instant deadlock. Now, Dave Miller has subsequently pointed out that we don't have any situations where this can occur. Nevertheless, we should delete generic__raw_read_lock (and its associated EXPORT to make Arjan happy) so that nobody thinks they can use it. Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e04da1dfd9041e306cb33d1b40b6005c23c5b325 Author: Al Viro Date: Fri Sep 29 01:58:35 2006 -0700 [PATCH] sys_getcpu() prototype annotated Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0891a8d706d6e6838a926b6dec42f95581747d0e Author: Al Viro Date: Fri Sep 29 01:58:34 2006 -0700 [PATCH] __percpu_alloc_mask() has to be __always_inline in UP case ... or we'll end up with cpu_online_map being evaluated on UP. In modules. cpumask.h is very careful to avoid that, and for a very good reason. So should we... PS: yes, it really triggers (on alpha). Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f931374ecc599f6df7852509b6917abd5377205 Author: Jeff Garzik Date: Fri Sep 29 05:07:25 2006 -0400 [libata] DocBook minor updates, fixes Update copyright year, fix minor stuff 'make xmldocs' complains about. Signed-off-by: Jeff Garzik commit 65e8697a12e356cd7a6ecafa1149f5c5c6a71593 Author: Tim Shimmin Date: Fri Sep 29 15:23:02 2006 +1000 [XFS] Remove v1 dir trace macro - missed in a past commit. Signed-off-by: Tim Shimmin commit 6fbe59b9569b2c8d5522d182263935c6c86fc40a Author: David S. Miller Date: Thu Sep 28 15:34:05 2006 -0700 [ETHTOOL]: Remove some entries from non-root command list. GWOL might provide passwords GSET, GLINK, and GSTATS might poke the hardware Based upon feedback from Jeff Garzik. Signed-off-by: David S. Miller commit 860e13b5c591f1040b76fff57a6a3d6ca9633983 Author: Arnaud Patard Date: Thu Sep 28 15:29:37 2006 -0700 [Bluetooth]: Fix section mismatch of bt_sysfs_cleanup() The bt_sysfs_cleanup() is marked with __exit attribute, but it will be called from an __init function in the error case. So the __exit attribute must be removed. Signed-off-by: Arnaud Patard Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 37e97b4ef0d18b77a45a4714154daf3499206654 Author: Marcel Holtmann Date: Thu Sep 28 15:29:09 2006 -0700 [Bluetooth]: Don't update disconnect timer for incoming connections In the case of device pairing the only safe method is to establish a low-level ACL link. In this case, the remote side should not use the disconnect timer to give the other side the chance to enter the PIN code. If the disconnect timer is used, the connection will be dropped to soon, because it is impossible to identify an actual user of this link. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 75f3123c118743f52b690d9ab41649814befda0a Author: Stephen Hemminger Date: Thu Sep 28 15:13:37 2006 -0700 [ETHTOOL]: let mortals use ethtool There is no reason to not allow non-admin users to query network statistics and settings. [ Removed PHYS_ID and GREGS based upon feedback from Auke Kok and Michael Chan -DaveM] Acked-by: James Morris Signed-off-by: David S. Miller commit 32f50cdee666333168b5203c7864bede159f789e Author: Paul Moore Date: Thu Sep 28 14:51:47 2006 -0700 [NetLabel]: add audit support for configuration changes This patch adds audit support to NetLabel, including six new audit message types shown below. #define AUDIT_MAC_UNLBL_ACCEPT 1406 #define AUDIT_MAC_UNLBL_DENY 1407 #define AUDIT_MAC_CIPSOV4_ADD 1408 #define AUDIT_MAC_CIPSOV4_DEL 1409 #define AUDIT_MAC_MAP_ADD 1410 #define AUDIT_MAC_MAP_DEL 1411 Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit 8ea333eb5da3e3219f570220c56bca09f6f4d25a Author: John Heffner Date: Thu Sep 28 14:47:38 2006 -0700 [TCP]: Fix and simplify microsecond rtt sampling This changes the microsecond RTT sampling so that samples are taken in the same way that RTT samples are taken for the RTO calculator: on the last segment acknowledged, and only when the segment hasn't been retransmitted. Signed-off-by: John Heffner Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit bfbea8a8869a0e21b97605841d04190d63665d19 Author: Wong Hoi Sing Edison Date: Thu Sep 28 14:40:21 2006 -0700 [TCP] tcp-lp: prevent chance for oops This patch fix the chance for tcp_lp_remote_hz_estimator return 0, if 0 < rhz < 64. It also make sure the flag LP_VALID_RHZ is set correctly. Signed-off-by: Wong Hoi Sing Edison Signed-off-by: David S. Miller commit 1811474620d1986da45f7245168bf7c2d883d770 Author: Eric Sesterhenn Date: Thu Sep 28 14:37:07 2006 -0700 [SUNRPC]: Remove unnecessary check in net/sunrpc/svcsock.c coverity spotted this one as possible dereference in the dprintk(), but since there is only one caller of svc_create_socket(), which always passes a valid sin, we dont need this check. Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit 96d2ca4ec0bb8d0f344e5960224700be3dec3515 Author: Al Viro Date: Thu Sep 28 14:31:49 2006 -0700 [IPVS] bug: endianness breakage in ip_vs_ftp (p[3]<<24) | (p[2]<<16) | (p[1]<<8) | p[0] is not a valid way to spell get_unaligned((__be32 *)p Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 014d730d56b559eacb11e91969a1f41c3feb36f9 Author: Al Viro Date: Thu Sep 28 14:29:52 2006 -0700 [IPVS]: ipvs annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d4263cde88d3fee2af0aac8836bb785cdb6b06c0 Author: Al Viro Date: Thu Sep 28 14:22:51 2006 -0700 [NETFILTER]: h323 annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 6a19d61472d0802a24493c0d200e88f99ad39cd8 Author: Al Viro Date: Thu Sep 28 14:22:24 2006 -0700 [NETFILTER]: ipt annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a76b11dd25957287af12ce6855be6d7fd415b3a9 Author: Al Viro Date: Thu Sep 28 14:22:02 2006 -0700 [NETFILTER]: NAT annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit cdcb71bf964e02e0a22007f5d90ead7bede3b85b Author: Al Viro Date: Thu Sep 28 14:21:37 2006 -0700 [NETFILTER]: conntrack annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 59b8bfd8fd608821e5addc9f4682c7f2424afd8c Author: Al Viro Date: Thu Sep 28 14:21:07 2006 -0700 [NETFILTER]: netfilter misc annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d77072ecfb6d28287d5e2a61d60d87a3a444ac97 Author: Al Viro Date: Thu Sep 28 14:20:34 2006 -0700 [NET]: Annotate dst_ops protocol Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 75b31c33512f46bf650f4652272d8bef39881890 Author: Steven Rostedt Date: Wed Sep 27 22:55:39 2006 -0700 [NET]: is it Andy or Andi ?? I don't know of any Andy Kleen's but I do know a Andi Kleen. Signed-off-by: Steven Rostedt Signed-off-by: David S. Miller commit 28b06c380fca7e248c90e45f0aad1753097f6824 Author: Simon Horman Date: Wed Sep 27 22:53:24 2006 -0700 [IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach I'm not entirely sure what happens in the case of a valid port, at best it'll be silently ignored. This patch ensures that the port values are unsigned short values, and thus always valid. This is a second take at fixing this problem, it is simpler and arguably more correct than the previous approach that was committed as 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc. Prior to this patch a patch that reverses 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc was sent. Signed-off-by: Simon Horman Signed-off-by: David S. Miller commit e44fd82caf89a8548e7868592618b243e85c69e6 Author: Simon Horman Date: Wed Sep 27 22:52:47 2006 -0700 [IPVS]: Reverse valid ip_vs_ftp ports fix: port check approach This patch reverses 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc as a better fix was suggested by Patrick McHardy. Signed-off-by: Simon Horman Signed-off-by: David S. Miller commit febac9b93724f3ee293e7e5450043ae28e61531a Author: Samuel Ortiz Date: Wed Sep 27 22:50:06 2006 -0700 [IrDA] stir4200: removing undocumented bits handling FIFOCTL_RXERR and FIFOCTL_TXERR are undocumented bits, according to the Sigmatel datasheet. We should thus not take any assumption on their values and semantics. Problem spotted by andrzej zaborowski Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 895de090d4302a02a77cdf366fc6e54fc2001857 Author: Linus Walleij (LD/EAB Date: Wed Sep 27 22:49:23 2006 -0700 [IrDA] smsc-ircc: More laptops detected This patch detects the smsc-ircc chipset on the nx1000 (including nx7000 and nx7010) and the nx5000 HP/Compaq laptop series. Patch from "Linus Walleij (LD/EAB)" Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 2fd19a687c256fa4c4750465b9856e2c80660ec8 Author: Lamarque Vieira Souza Date: Wed Sep 27 22:48:36 2006 -0700 [IrDA] nsc-ircc: Configuration base address for PC87383 According to NatSemi datasheet, the configuration base address for the PC8738x family is 0x2e or 0x164. 0x0 doesn't appear in any datasheet. Patch from Lamarque Vieira Souza Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit b854d0d218688b30ccea70521d6ea5f3f56d4e12 Author: YOSHIFUJI Hideaki Date: Wed Sep 27 22:43:05 2006 -0700 [NET] KBUILD: Add missing entries for new net headers. Add the following for userspace export by the 'headers_include' make target: linux/fib_rules.h, linux/if_addr.h, linux/if_link.h, linux/neighbour.h. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit cbde1668e4f08e0a150207646010bc65e1e2a42b Author: YOSHIFUJI Hideaki Date: Wed Sep 27 22:40:19 2006 -0700 [NET]: Move netlink interface bits to linux/if_link.h. Moving netlink interface bits to linux/if.h is rather troublesome for applications including both linux/if.h (which was changed to be included from linux/rtnetlink.h automatically) and net/if.h. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 7b4dc3600e4877178ba94c7fbf7e520421378aa6 Author: Masahide NAKAMURA Date: Wed Sep 27 22:21:52 2006 -0700 [XFRM]: Do not add a state whose SPI is zero to the SPI hash. SPI=0 is used for acquired IPsec SA and MIPv6 RO state. Such state should not be added to the SPI hash because we do not care about it on deleting path. Signed-off-by: Masahide NAKAMURA Signed-off-by: YOSHIFUJI Hideaki commit 7fa6b06689085a3e2237cf810f5e0c114e00a2da Author: Stephen Hemminger Date: Wed Sep 27 20:33:34 2006 -0700 [NET] loopback: minor statistics optimization The loopback device status structure is a singleton and doesn't need to be allocated. Add ethtool_ops hooks to show checksum always on, and make ethtool_ops const. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1b0fee7d68f234be6b270cda51d9fcb71bebd780 Author: Samuel Ortiz Date: Wed Sep 27 20:06:44 2006 -0700 [IrDA]: Memory allocations cleanups This patch replaces the bunch of arbitrary 64 and 128 bytes alloc_skb() calls with more accurate allocation sizes. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 778e6398d32590eaf2333706318cbcd04dbe50b7 Author: Samuel Ortiz Date: Wed Sep 27 20:06:16 2006 -0700 [IrDA]: irda-usb needs firmware loader With the inclusion of the stir421x code, we now need to select FW_LOADER whenever we try to build the irda-usb code. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit da349f1c2e0a0bf8958cdaf14e8f33acdf3182a5 Author: Samuel Ortiz Date: Wed Sep 27 20:05:38 2006 -0700 [IrDA]: af_irda.c cleanups We lock the socket when both releasing and getting a disconnected notification. In the latter case, we also ste the socket as orphan. This fixes a potential kernel bug that can be triggered when we get the disconnection notification before closing the socket. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 1a9e9ef684ec2bd27fcdb373a82957a0c050daf6 Author: Herbert Xu Date: Wed Sep 27 19:03:36 2006 -0700 [IPV6]: Disable SG for GSO unless we have checksum Because the system won't turn off the SG flag for us we need to do this manually on the IPv6 path. Otherwise we will throw IPv6 packets with bad checksums at the hardware. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8122adf06e6f93ae608cf8227e878cc44f4a8fd1 Author: Al Viro Date: Wed Sep 27 18:49:35 2006 -0700 [XFRM]: xfrm_spi_hash() annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4324a174304d1d826582be5422a976e09d2b1e63 Author: Al Viro Date: Wed Sep 27 18:49:07 2006 -0700 [XFRM]: fl_ipsec_spi is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9916ecb0a6f52f1475fa2f71845227d3c75fb40c Author: Al Viro Date: Wed Sep 27 18:48:48 2006 -0700 [XFRM]: struct xfrm_usersa_id annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 61f4627b2fecce9d5c9645e4b47e75a0c29ad8c3 Author: Al Viro Date: Wed Sep 27 18:48:33 2006 -0700 [XFRM]: xfrm_replay_advance() annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a252cc2371930debe3162f1ac91467b9791324cb Author: Al Viro Date: Wed Sep 27 18:48:18 2006 -0700 [XFRM]: xrfm_replay_check() annotations seq argument is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 6067b2baba32211e84d1ef2dba863422281bd6c7 Author: Al Viro Date: Wed Sep 27 18:47:59 2006 -0700 [XFRM]: xfrm_parse_spi() annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e037c39bf965ca66fde902e191d849a90de278fe Author: Al Viro Date: Wed Sep 27 18:47:40 2006 -0700 [XFRM]: struct xfrm_id annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a94cfd19744a568d97b14bbaa500b2a0c3684f34 Author: Al Viro Date: Wed Sep 27 18:47:24 2006 -0700 [XFRM]: xfrm_state_lookup() annotations spi argument of xfrm_state_lookup() is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 26977b4ed728ae911a162b16dbfe1a165b7cf9a1 Author: Al Viro Date: Wed Sep 27 18:47:05 2006 -0700 [XFRM]: xfrm_alloc_spi() annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 737b5761dfc609b5be4163deb2cf09226f56bcbc Author: Al Viro Date: Wed Sep 27 18:46:48 2006 -0700 [XFRM]: xfrm_address_t annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 5f19343fb19613539355296b23cbc08d1336b52d Author: Al Viro Date: Wed Sep 27 18:46:32 2006 -0700 [XFRM]: addr_match() annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 8f83f23e6db8b9a9fe787d02f73489224668c4e2 Author: Al Viro Date: Wed Sep 27 18:46:11 2006 -0700 [XFRM]: ports in struct xfrm_selector annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f9d07e41f89e7305eb2c0475c170c51d21425581 Author: Al Viro Date: Wed Sep 27 18:45:50 2006 -0700 [XFRM]: xfrm_flowi_[sd]port() annotations both return net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e2e38e819bd03e9674c102aaa2c9dc8151a3c3d0 Author: Al Viro Date: Wed Sep 27 18:45:27 2006 -0700 [IPV6]: sin6_port is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 43505077df075545e9b28b7c6ea12d82b3caf036 Author: Al Viro Date: Wed Sep 27 18:45:11 2006 -0700 [IPV6]: IPv6 headers annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 48818f822d2b2e16f4bf4d1ed1185e7d2146dc34 Author: Al Viro Date: Wed Sep 27 18:44:54 2006 -0700 [IPV6]: struct in6_addr annotations in6_addr elements are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9f8552996d969f56039ec88128cf5ad35b12f141 Author: Al Viro Date: Wed Sep 27 18:44:30 2006 -0700 [IPV4]: inet_diag annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 82103232edc4b4ed48949a195aca93cfa3fe3fa8 Author: Al Viro Date: Wed Sep 27 18:44:10 2006 -0700 [IPV4]: inet_rcv_saddr() annotations inet_rcv_saddr() returns net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 23f33c2d4fd5986243b67a2bf5e63ebae1a76ffa Author: Al Viro Date: Wed Sep 27 18:43:50 2006 -0700 [IPV4]: struct inet_timewait_sock annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit fb99c848e5ae6b8b2bc11f0f90c9e2bb3d702c0d Author: Al Viro Date: Wed Sep 27 18:43:33 2006 -0700 [IPV4]: annotate inet_lookup() and friends inet_lookup() annotated along with helper functions (__inet_lookup(), __inet_lookup_established(), inet_lookup_established(), inet_lookup_listener(), __inet_lookup_listener() and inet_ehashfn()) Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4f765d842fa6e6fe15d555b247b640118d65b4dd Author: Al Viro Date: Wed Sep 27 18:43:07 2006 -0700 [IPV4]: INET_MATCH() annotations INET_MATCH() and friends depend on an interesting set of kludges: * there's a pair of adjacent fields in struct inet_sock - __be16 dport followed by __u16 num. We want to search by pair, so we combine the keys into a single 32bit value and compare with 32bit value read from &...->dport. * on 64bit targets we combine comparisons with pair of adjacent __be32 fields in the same way. Make sure that we don't mix those values with anything else and that pairs we form them from have correct types. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 45d60b9e29556a7831812ec338d82f4d3a4145f8 Author: Al Viro Date: Wed Sep 27 18:40:27 2006 -0700 [IPV4]: FRA_{DST,SRC} annotated use be32 netlink accessors for those Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 81f7bf6cbaca02c034b0393c51fc22b29cba20f7 Author: Al Viro Date: Wed Sep 27 18:40:00 2006 -0700 [IPV4]: net/ipv4/fib annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 114c7844f34c1608aec20ae7ff85cec471ac90ae Author: Al Viro Date: Wed Sep 27 18:39:29 2006 -0700 [IPV4]: mroute annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 1b620154273d5cc57690e0d199282c6bb9e56974 Author: Al Viro Date: Wed Sep 27 18:39:09 2006 -0700 [IPV4]: PIMv2 header annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit df7a3b07c28e7b547d8252a237299e32880b505d Author: Al Viro Date: Wed Sep 27 18:38:52 2006 -0700 [TCP] net/ipv4/tcp_output.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b03d73e30c1b29a365f085bca5214a14c6df3859 Author: Al Viro Date: Wed Sep 27 18:38:30 2006 -0700 [IPV4] net/ipv4/icmp.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b1dd39ac963040c2d282ab8026b9c9aa9306ea06 Author: Al Viro Date: Wed Sep 27 18:38:13 2006 -0700 [IPV4]: ICMP header annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 734ab87f632e94dfd4299f4d4d1d10668548f9d8 Author: Al Viro Date: Wed Sep 27 18:37:41 2006 -0700 [UDP] net/ipv4/udp.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4e7e0c7592cafe5453e5b2f115fc0065d11b3d44 Author: Al Viro Date: Wed Sep 27 18:37:19 2006 -0700 [IPV4]: UDP header annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 6b72977bd6c6fefc6497d4f0275079f539eaf0ac Author: Al Viro Date: Wed Sep 27 18:36:59 2006 -0700 [IPV4]: inet_csk_search_req() annotations rport argument is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit ed9bad06eec5ee7842851f9abeb406e9a73084e8 Author: Al Viro Date: Wed Sep 27 18:36:36 2006 -0700 [IPV4] net/ipv4/arp.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit bd6d610a14f2ed896b76dfb61fbdec829e44b8d3 Author: Al Viro Date: Wed Sep 27 18:35:47 2006 -0700 [IPV4]: ARP header annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e11be94bf6a3bfc90816d37847e6b5b179ca2ff6 Author: Al Viro Date: Wed Sep 27 18:35:29 2006 -0700 [IPV4]: struct inet_request_sock annotations ->port is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4f3608b787f471e8e6b9f39c5ed1edde5a2e7d04 Author: Al Viro Date: Wed Sep 27 18:35:09 2006 -0700 [TCP] net/ipv4/tcp_input.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 39dccd9d922b595301e5d43ca7a30823d81393b6 Author: Al Viro Date: Wed Sep 27 18:34:41 2006 -0700 [IPV4]: route.h annotations ip_route_connect(), ip_route_newports() get port numbers net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 35986b329f5476630cef00cc7a164ff336ec1a21 Author: Al Viro Date: Wed Sep 27 18:34:21 2006 -0700 [IPV4]: ip_icmp_error() annotations port is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b406313c733156c8eea7d9c1891476f400914367 Author: Al Viro Date: Wed Sep 27 18:34:02 2006 -0700 [NET]: struct sock_exterr_skb annotations ->port is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 0579016ec4691116f6322ec6ed7fb7ce746948e9 Author: Al Viro Date: Wed Sep 27 18:33:40 2006 -0700 [IPV4]: ip_local_error() annotations port argument is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit cc939d37349bf82891bd1f4558284d7fafe7acb2 Author: Al Viro Date: Wed Sep 27 18:33:22 2006 -0700 [NET]: ip ports in struct flowi are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 2816e1284a2db03ad5e205bab4eacbc5f7d4f991 Author: Al Viro Date: Wed Sep 27 18:33:05 2006 -0700 [IPV4]: ports in struct inet_sock are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit dddc93c05d7dba60b44866486502c155e96ab915 Author: Al Viro Date: Wed Sep 27 18:32:46 2006 -0700 [TCP]: struct tcp_sock .pred_flags is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 269bd27e66037a7932cee6d6aa7ef7defd0bfe38 Author: Al Viro Date: Wed Sep 27 18:32:28 2006 -0700 [TCP]: struct tcp_sack_block annotations Some of the instances of tcp_sack_block are host-endian, some - net-endian. Define struct tcp_sack_block_wire identical to struct tcp_sack_block with u32 replaced with __be32; annotate uses of tcp_sack_block replacing net-endian ones with tcp_sack_block_wire. Change is obviously safe since for cc(1) __be32 is typedefed to u32. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 46a97324a5ebdc1e343a0223d993e79551adab0f Author: Al Viro Date: Wed Sep 27 18:31:51 2006 -0700 [IPV4]: TCP headers annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 63007727e0bb09e8d906f73d36a09b9fac0d5893 Author: Al Viro Date: Wed Sep 27 18:31:32 2006 -0700 [IPV4]: trivial igmp annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit c0cda068aac3481d40795b115e4fd36f7d386e3a Author: Al Viro Date: Wed Sep 27 18:31:10 2006 -0700 [IPV4]: ip_mc_sf_allow() annotated ip_mc_sf_allow() expects addresses to be passed net-endian. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit ea4d9e7220d32348cc9742ba6d27de5165262664 Author: Al Viro Date: Wed Sep 27 18:30:52 2006 -0700 [IPV4]: struct ip_sf_list and struct ip_sf_socklist annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 942bf921e922560c05fde6afb00ddedf6224c608 Author: Al Viro Date: Wed Sep 27 18:30:28 2006 -0700 [IPV4]: IGMP on-the-wire data is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 8f935bbd7c6c66796c2403aefdab74bb48045bf6 Author: Al Viro Date: Wed Sep 27 18:30:07 2006 -0700 [IPV4]: ip_mc_{inc,dec}_group() annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 00a5020cd51febbb3166ff7a09a2901c47ba251a Author: Al Viro Date: Wed Sep 27 18:29:47 2006 -0700 [IPV4]: annotate ipv4 address fields in struct ip_msfilter and struct ip_mreq_source Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 4b06a7cf2f3c053e7fc47ca6a4c74553e2291e24 Author: Al Viro Date: Wed Sep 27 18:29:07 2006 -0700 [IPV4]: ip_local_error() ipv4 address argument annotated daddr is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e25d2ca6b2808c427704b01608baf0f7dea1696e Author: Al Viro Date: Wed Sep 27 18:28:47 2006 -0700 [IPV4]: trivial ip_options.c annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit c1d18f9fa09489635a451ee13c1727e1683c2333 Author: Al Viro Date: Wed Sep 27 18:28:28 2006 -0700 [IPV4]: struct ipcm_cookie annotation ->addr is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 3ca3c68e76686bee058937ade2b96f4de58ee434 Author: Al Viro Date: Wed Sep 27 18:28:07 2006 -0700 [IPV4]: struct ip_options annotations ->faddr is net-endian; annotated as such, variables inferred to be net-endian annotated. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 7f25afbbefb266520a237df0e9b59112704a7a42 Author: Al Viro Date: Wed Sep 27 18:27:47 2006 -0700 [IPV4]: inet_csk_search_req() (partial) annotations raddr is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit adaf345b537681c6ed3657941904d976fe72f342 Author: Al Viro Date: Wed Sep 27 18:27:13 2006 -0700 [IPV4]: annotate address in inet_request_sock Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 85670cc1faa2e1472e4a423cbf0b5e3d55c5ba88 Author: Patrick McHardy Date: Wed Sep 27 16:45:45 2006 -0700 [NET_SCHED]: Fix fallout from dev->qdisc RCU change The move of qdisc destruction to a rcu callback broke locking in the entire qdisc layer by invalidating previously valid assumptions about the context in which changes to the qdisc tree occur. The two assumptions were: - since changes only happen in process context, read_lock doesn't need bottem half protection. Now invalid since destruction of inner qdiscs, classifiers, actions and estimators happens in the RCU callback unless they're manually deleted, resulting in dead-locks when read_lock in process context is interrupted by write_lock_bh in bottem half context. - since changes only happen under the RTNL, no additional locking is necessary for data not used during packet processing (f.e. u32_list). Again, since destruction now happens in the RCU callback, this assumption is not valid anymore, causing races while using this data, which can result in corruption or use-after-free. Instead of "fixing" this by disabling bottem halfs everywhere and adding new locks/refcounting, this patch makes these assumptions valid again by moving destruction back to process context. Since only the dev->qdisc pointer is protected by RCU, but ->enqueue and the qdisc tree are still protected by dev->qdisc_lock, destruction of the tree can be performed immediately and only the final free needs to happen in the rcu callback to make sure dev_queue_xmit doesn't access already freed memory. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 787e0617e5176176c494a787f1b0a5248a3db568 Author: Patrick McHardy Date: Wed Sep 27 16:36:23 2006 -0700 [NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE Fix incorrect use of RB_EMPTY_NODE in htb_safe_rb_erase, which makes it skip nodes within the rbtree instead of nodes not in the tree, resulting in crashes later on. The root cause for this seems to be the very counter-intuitive behaviour of the RB_EMPTY_NODE macro, which returns _false_ when the node is empty. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 321efff7c3b7a26fa0522cb12b2af2ac82c05f1e Author: Olaf Kirch Date: Wed Sep 27 16:33:45 2006 -0700 [IPV4]: Fix order in inet_init failure path. This is just a minor buglet I came across by accident - when inet_init fails to register raw_prot, it jumps to out_unregister_udp_proto which should unregister UDP _and_ TCP. Signed-off-by: Olaf Kirch Signed-off-by: David S. Miller commit f0e82fd0e5ad8494985ddfca7de89a800cf96fb8 Author: Francesco Fondelli Date: Wed Sep 27 16:33:05 2006 -0700 [PKTGEN]: Documentation update Signed-off-by: Francesco Fondelli Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 1ca7768c87ac1393228857d576654f7e84c8cee6 Author: Francesco Fondelli Date: Wed Sep 27 16:32:03 2006 -0700 [PKTGEN]: DSCP support Anyway, I've been asked to add support for managing DSCP codepoints, so one can test DiffServ capable routers. It's very simple code and is working for me. Signed-off-by: Francesco Fondelli Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 34954ddc4f3e790fb6d5ed331513f54b38713234 Author: Francesco Fondelli Date: Wed Sep 27 16:30:44 2006 -0700 [PKTGEN]: vlan support The attached patch allows pktgen to produce 802.1Q and Q-in-Q tagged frames. I have used it for stress test a bridge and seems ok to me. Unfortunately I have no access to net-2.6.x git tree so the diff is against 2.6.17.13. Signed-off-by: Francesco Fondelli Acked-by: Steven Whitehouse Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 658270a0a49612a0e3fdc01c2e8c0e1a6d47cbf4 Author: Kim Nordlund Date: Wed Sep 27 16:19:53 2006 -0700 [PKT_SCHED] cls_basic: Use unsigned int when generating handle Prevents filters from being added if the first generated handle already exists. Signed-off-by: Kim Nordlund Signed-off-by: Thomas Graf commit c9aa6895371b2a257401f59d3393c9f7ac5a8698 Author: Michal Ostrowski Date: Wed Sep 27 16:11:25 2006 -0700 [PPPOE]: Advertise PPPoE MTU PPPoE must advertise the underlying device's MTU via the ppp channel descriptor structure, as multilink functionality depends on it. Signed-off-by: Michal Ostrowski Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1533d382155ee888d9621391c108ffb7a68bb25d Author: Michael Chan Date: Wed Sep 27 16:10:35 2006 -0700 [TG3]: Update version and reldate. Update version to 3.66. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b16250e3d1c55820f08f0296624a423122ea9805 Author: Michael Chan Date: Wed Sep 27 16:10:14 2006 -0700 [TG3]: Add 5709 self-test support. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 715116a12610b67c1d301a9b845ce95f7247dad3 Author: Michael Chan Date: Wed Sep 27 16:09:25 2006 -0700 [TG3]: Add 5709 PHY support. Add support for the 5709 10/100 PHY. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b5d3772ccbe0bc5ac8ffbb5356b74ca698aee28c Author: Michael Chan Date: Wed Sep 27 16:06:21 2006 -0700 [TG3]: Add basic 5906 support. Add support for the new 5709 device. This is a new 10/100 Mbps chip. The mailbox access and firmware interface are quite different from all other tg3 chips. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7a6f4369449a471a6e5718a87c53ac75a46960ba Author: Michael Chan Date: Wed Sep 27 16:03:31 2006 -0700 [TG3]: Add tg3_poll_fw(). Put the firmware polling logic into a separate function. This makes the code cleaner. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 126a336822a6594662f5898f1ddf33e6d048fcc7 Author: Michael Chan Date: Wed Sep 27 16:03:07 2006 -0700 [TG3]: Add 5722 and 5756 support. Add IDs to support 5722 and 5756. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 3f7045c1f28bedd44389b9392b54c6fdb83ee5c6 Author: Michael Chan Date: Wed Sep 27 16:02:29 2006 -0700 [TG3]: PHY fixes. Some PHY related fixes: 1. Fix Serdes WoL. 2. Fix loopback test on 10/100 only devices. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 130b8e4d0e4edadcecee9fdff2c32f33d77c4fe9 Author: Michael Chan Date: Wed Sep 27 16:00:40 2006 -0700 [TG3]: Improve ASF heartbeat. Change to a different ASF heartbeat message code to improve reliability. There were some reports of unintended resets on real time kernels where the timer may be slow and cause the heartbeat to be late. Netpoll will also have the same problem because the timer irq will be unavailable. Using the new heartbeat code, the ASF firmware will also check the ring condition before resetting the chip when the heartbeat is expiring. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 3d3ebe741b2c06fe3df67739d09f6ef0e25ee41a Author: Michael Chan Date: Wed Sep 27 15:59:15 2006 -0700 [TG3]: Improve 5704S autoneg. Improve 5704S autoneg logic by using a serdes_counter field to keep track of the transient states. This eliminates a 200 msec busy loop in the code. Autoneg will take its course without the driver busy waiting for it to finish. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6ac59344ef25d5f0ebadb5663cf700d25d2a3886 Author: Marcel Holtmann Date: Tue Sep 26 09:43:48 2006 +0200 [Bluetooth] Support create connection cancel command In case of non-blocking connects it is possible that the last user of an ACL link quits before the connection has been fully established. This will lead to a race condition where the internal state of a connection is closed, but the actual link has been established and is active. In case of Bluetooth 1.2 and later devices it is possible to call create connection cancel to abort the connect. For older devices the disconnect timer will be used to trigger the needed disconnect. Signed-off-by: Marcel Holtmann commit 1143e5a6d4d69cd36d44e0184769aa2b17041a10 Author: Marcel Holtmann Date: Sat Sep 23 09:57:20 2006 +0200 [Bluetooth] Read local version information on device init The local version information are needed to identify certain feature sets of devices. They must be read on device init and stored for later use. It is also possible to access them through the device model. Signed-off-by: Marcel Holtmann commit b4c612a473eb816dff6e5ab6820dff338057aa8d Author: Marcel Holtmann Date: Sat Sep 23 09:54:38 2006 +0200 [Bluetooth] Return EINPROGRESS for non-blocking socket calls In case of non-blocking socket calls we should return EINPROGRESS and not EAGAIN. Signed-off-by: Ulisses Furquim Signed-off-by: Marcel Holtmann commit 7785162cf2baf7c6c1e4ad8ae5888f85fcc5febc Author: Marcel Holtmann Date: Thu Sep 21 16:23:19 2006 +0200 [Bluetooth] Code cleanup for the HCI UART driver This patch cleans up the Bluetooth HCI UART driver a bit. Signed-off-by: Pavel Machek Signed-off-by: Marcel Holtmann commit 62ae15919b6db6644049338296624fbd724c0054 Author: Marcel Holtmann Date: Thu Sep 21 16:19:55 2006 +0200 [Bluetooth] Add support for Canyon CN-BTU1 dongle This patch adds the vendor and product id of the Canycon CN-BTU1 dongle and sets a flag to send HCI_Reset as the first command. Signed-off-by: Marcel Holtmann commit defc761bc25643eeedee3abd6af0079ef214b55d Author: Marcel Holtmann Date: Thu Sep 21 16:04:00 2006 +0200 [Bluetooth] Handle command complete event for exit periodic inquiry The command complete event of the exit periodic inquiry command must clear the HCI_INQUIRY flag and finish the HCI request. Signed-off-by: Marcel Holtmann commit 0ac53939a06c610b394aeb0211b985804f2d2da3 Author: Marcel Holtmann Date: Sat Jul 8 13:57:15 2006 +0200 [Bluetooth] Add HCI device identifier for SDIO cards This patch assigns the next free HCI device identifier to Bluetooth devices based on the SDIO interface. Signed-off-by: Marcel Holtmann commit 9c724357f432df5ddc83a62c8168414a604cd420 Author: Marcel Holtmann Date: Thu Jul 6 15:45:23 2006 +0200 [Bluetooth] Code cleanup of the drivers source code This patch is an attempt to cleanup the drivers source code to make all Bluetooth drivers look more unique. Signed-off-by: Marcel Holtmann commit 0a85b964e141a4b8db6eaf500ceace12f8f52f93 Author: Marcel Holtmann Date: Thu Jul 6 13:09:02 2006 +0200 [Bluetooth] Integrate services into the driver model This patch integrates the services of the Bluetooth protocols RFCOMM, BNEP and HIDP into the driver model. This makes it possible to assign the virtual TTY, network and input devices to a specific Bluetooth connection. Signed-off-by: Marcel Holtmann commit b219e3ac66183fc9771b94af931fb5fd41d586ec Author: Marcel Holtmann Date: Thu Jul 6 12:38:46 2006 +0200 [Bluetooth] Integrate low-level connections into the driver model This patch integrates the low-level connections (ACL and SCO) into the driver model. Every connection is presented as device with the parent set to its host controller device. Signed-off-by: Marcel Holtmann commit 4d0eb0049ce94101f7f169f89216ba58475219e2 Author: Marcel Holtmann Date: Thu Jul 6 12:34:41 2006 +0200 [Bluetooth] Remove unused host controller attributes This patch removes the unused device attribute entries for the Bluetooth host controllers. Signed-off-by: Marcel Holtmann commit 9918f230969bdaf3df012b77abcbcd4cdb0ab221 Author: Eric Sesterhenn Date: Tue Sep 26 23:26:38 2006 -0700 [RTNETLINK]: Possible dereference in net/core/rtnetlink.c another possible dereference spotted by coverity (#cid 1390). if the nlmsg_parse() call fails, we goto errout, where we call dev_put(), with dev still initialized to NULL. Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit 753ed90d92009260616f6402aafa7ee47e03b162 Author: Al Viro Date: Tue Sep 26 22:30:23 2006 -0700 [SUNRPC]: more sunrpc endianness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d8ed029d6000ba2e2908d9286409e4833c091b4c Author: Alexey Dobriyan Date: Tue Sep 26 22:29:38 2006 -0700 [SUNRPC]: trivial endianness annotations pure s/u32/__be32/ [AV: large part based on Alexey's patches] Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 7699431301b189fca7ccbb64fe54e5a5170f8497 Author: Alexey Dobriyan Date: Tue Sep 26 22:28:46 2006 -0700 [SUNRPC]: svc_{get,put}nl() * add svc_getnl(): Take network-endian value from buffer, convert to host-endian and return it. * add svc_putnl(): Take host-endian value, convert to network-endian and put it into a buffer. * annotate svc_getu32()/svc_putu32() as dealing with network-endian. * convert to svc_getnl(), svc_putnl(). [AV: in large part it's a carved-up Alexey's patch] Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 13d8eaa06abfeb708b60fa64203a20db033088b3 Author: Al Viro Date: Tue Sep 26 22:27:30 2006 -0700 [IPV4]: ip_build_and_send_pkt() annotations saddr and daddr are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 8712f774dc47ec6353c9b75317d6db62e58d9367 Author: Al Viro Date: Tue Sep 26 22:27:05 2006 -0700 [IPV4]: ip_options_build() annotations daddr is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e8192f367cb3dcbefaa4109d26f3b1645b0c6b56 Author: Al Viro Date: Tue Sep 26 22:26:21 2006 -0700 [IPV4] bug: broken open-coded inet_make_mask() (multipath_wrandom) multipath_wrandom.c::__multipath_lookup_weight() contains open-coded attempt at inet_make_mask(); broken on big-endian. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f20f4a60d74b0d7e2a5dafd5e7d5760f44ce2f30 Author: Al Viro Date: Tue Sep 26 22:25:13 2006 -0700 [IPV4] multipath_wrandom.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d9cd66e0e593929077b5ecf87384e23db7271c6e Author: Al Viro Date: Tue Sep 26 22:22:50 2006 -0700 [IPV4]: multipath_set_nhinfo() annotations multipath_set_nhinfo() (and underlying callback) take net-endian network and netmask. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 32ab5f80334fc067386c4c56c434010c01cff6b9 Author: Al Viro Date: Tue Sep 26 22:21:45 2006 -0700 [IPV4] fib_trie.c: trivial annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 1e8aa6f125d959d1a9f16a3f15e9ebbc6df63935 Author: Al Viro Date: Tue Sep 26 22:21:22 2006 -0700 [IPV4] bug: open-coded inet_make_mask() in fib_semantic_match() is broken ... and works only on little-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 1ef1b8c85bb4954b7dca816f1bb7fd54bcd78078 Author: Al Viro Date: Tue Sep 26 22:20:56 2006 -0700 [IPV4]: fib_semantic_match() annotations 'mask' and 'zone' arguments are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b6e80c6c8b2de8b581e7521af3e118ea379260f1 Author: Al Viro Date: Tue Sep 26 22:20:01 2006 -0700 [IPV4]: trivial fib_hash.c annotations hash key and stored netmask are net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 80e856e16a145d7f44f613d9f3d903bf459510ca Author: Al Viro Date: Tue Sep 26 22:19:36 2006 -0700 [IPV4]: annotate addresses in fib_result and fib_result_nl Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 182777700d912a69824245e9ee99148ac0aa57d7 Author: Al Viro Date: Tue Sep 26 22:19:02 2006 -0700 [IPV4]: ip_fragment.c endianness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 53576d9b995605a9edc7414b900a9218c8f23b1f Author: Al Viro Date: Tue Sep 26 22:18:43 2006 -0700 [IPV4]: inetpeer annotations This one is interesting - we use net-endian value as search key, but order the tree by *host-endian* comparisons of keys. OK since we only care about lookups. Annotated inet_getpeer() and friends. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d878e72e419db9ff4c66848375ee30a19820e4de Author: Al Viro Date: Tue Sep 26 22:18:13 2006 -0700 [IPV4]: ip_fib_check_default() annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit fd6832220974809141b3981e380b78690bba8911 Author: Al Viro Date: Tue Sep 26 22:17:51 2006 -0700 [IPV4]: inet_addr_type() annotations argument and inferred net-endian variables in callers annotated. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e4883014f48f8c17c17a2526cb5cb6e17c5f94e7 Author: Al Viro Date: Tue Sep 26 22:17:28 2006 -0700 [IPV4]: icmp_send() annotation The last argument is network-endian (it will go straight into the packet). Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 60cad5da5791ceb0beefe9a79b570cca45791f50 Author: Al Viro Date: Tue Sep 26 22:17:09 2006 -0700 [IPV4]: annotate inetdev.h helpers inet_confirm_addr(), inet_ifa_byprefix(), ip_dev_find(), inet_make_mask() and inet_ifa_match() annotated, along with inferred net-endian variables Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a7a628c442ed28511e1569a975c993b27fa034f4 Author: Al Viro Date: Tue Sep 26 22:16:43 2006 -0700 [IPV4]: IFA_{LOCAL,ADDRESS,BROADCAST,ANYCAST} on ipv4 annotated use be32 netlink accessors Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a144ea4b7a13087081ab5402fa9ad0bcfd249e67 Author: Al Viro Date: Thu Sep 28 18:00:55 2006 -0700 [IPV4]: annotate struct in_ifaddr ifa_local, ifa_address, ifa_mask, ifa_broadcast and ifa_anycast are net-endian. Annotated them and variables that are inferred to be net-endian. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 6d85c10abe840e98cbac673202fe7cc9ada2180c Author: Al Viro Date: Tue Sep 26 22:15:46 2006 -0700 [IPV4]: struct fib_config IPv4 address fields annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 17fb2c64394a2d5106540d69fc83c183ee7c206e Author: Al Viro Date: Tue Sep 26 22:15:25 2006 -0700 [IPV4]: RTA_{DST,SRC,GATEWAY,PREFSRC} annotated these are passed net-endian; use be32 netlink accessors Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e448515c79c3785eae225c25e8cd5b90b470d0a6 Author: Al Viro Date: Tue Sep 26 22:15:01 2006 -0700 [IPV4] net/ipv4/route.c: trivial endianness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 00012e5bb9527022cbc843c5d372b282dbe6c4af Author: Al Viro Date: Tue Sep 26 22:14:41 2006 -0700 [IPV4]: introduce nla_get_be32()/NLA_PUT_BE32() net-endian counterparts of nla_get_u32()/NLA_PUT_U32() Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b83738ae003dde613712ddb1e90a8a01f5587b51 Author: Al Viro Date: Tue Sep 26 22:14:15 2006 -0700 [IPV4]: FIB_RES_PREFSRC() annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit ed49e3caaa6126f8e29f08e8b4fdcafcae431b57 Author: Al Viro Date: Tue Sep 26 22:13:54 2006 -0700 [IPV4]: fib_hn ->nh_gw is net-endian Signed-off-by: Al Viro Signed-off-by: David S. Miller commit ff428d72c59b35e4ba34bc1b487e707648010fe3 Author: Al Viro Date: Tue Sep 26 22:13:35 2006 -0700 [IPV4]: inet_addr_onlink() annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a60c4923da795c74db9ff61a60e2f1df5754e4ce Author: Al Viro Date: Tue Sep 26 21:28:34 2006 -0700 [IPV4]: ip_check_mc() annotations annotated arguments Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d9c9df8c9368f4102324e8c3923edae83974602b Author: Al Viro Date: Tue Sep 26 21:28:14 2006 -0700 [IPV4]: fib_validate_source() annotations annotated arguments and inferred net-endian variables in callers Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a61ced5d1c2e773620d7855ea2009d770c10a6e6 Author: Al Viro Date: Tue Sep 26 21:27:54 2006 -0700 [IPV4]: inet_select_addr() annotations argument and return value are net-endian. Annotated function and inferred net-endian variables in callers. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 011a92610826bdeec4b80ab423958d4c512639f6 Author: Al Viro Date: Tue Sep 26 21:27:35 2006 -0700 [IPV4]: annotated ipv4 addresses in struct inet_sock Signed-off-by: Al Viro Signed-off-by: David S. Miller commit bada8adc4e6622764205921e6ba3f717aa03c882 Author: Al Viro Date: Tue Sep 26 21:27:15 2006 -0700 [IPV4]: ip_route_connect() ipv4 address arguments annotated annotated address arguments (port number left alone for now); ditto for inferred net-endian variables in callers. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f2c3fe24119ee4f8faca08699f0488f500014a27 Author: Al Viro Date: Tue Sep 26 21:26:42 2006 -0700 [IPV4]: annotate ipv4 addresses in struct rtable and struct flowi Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 8c7bc84085135d5cc87e9fc6802d3c7bbbb40ef5 Author: Al Viro Date: Tue Sep 26 21:26:19 2006 -0700 [IPV4]: annotate rt_hash_code() users Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f7655229c06d041323b40bd6eb9f95ca0ce95506 Author: Al Viro Date: Tue Sep 26 21:25:43 2006 -0700 [IPV4]: ip_rt_redirect() annotations The first 4 arguments of ip_rt_redirect() are net-endian. Annotated. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9e12bb22e32389b41222c9d9fb55724fed83a038 Author: Al Viro Date: Tue Sep 26 21:25:20 2006 -0700 [IPV4]: ip_route_input() annotations ip_route_input() takes net-endian source and destination address. * Annotated as such. * arguments of its invocations annotated where needed. * local helpers getting the same values passed to by it (ip_route_input_mc(), ip_route_input_slow(), ip_handle_martian_source(), ip_mkroute_input(), ip_mkroute_input_def(), __mkroute_input()) annotated Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 046d033148e6936ee2466d38214cf0743a210f39 Author: Al Viro Date: Tue Sep 26 21:24:24 2006 -0700 [IPV4]: headers endianness Signed-off-by: Al Viro Signed-off-by: David S. Miller commit b4229934bd11e1dd03d433072ef3871915fc5e4f Author: Al Viro Date: Tue Sep 26 21:23:43 2006 -0700 [ATM]: use NIPQUAD instead of open-coding it Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 0ac0760a57a6b1eb75c21a590e578be5dfc2f88b Author: Al Viro Date: Tue Sep 26 21:23:16 2006 -0700 [TR]: endiannness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 2a50f28c326d20ab4556be1b867ecddf6aefbb88 Author: Al Viro Date: Tue Sep 26 21:22:08 2006 -0700 [ATALK]: endianness annotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 82fe7c924e61f9444b376498496942d41fbe9d26 Author: Grant Grundler Date: Mon Sep 25 23:47:14 2006 -0700 [NET] Kconfig: fix cut/paste error in TCPPROBE Fix cut/paste error in TCPPROBE help text. Signed-off-by: Grant Grundler Signed-off-by: David S. Miller commit 1618cb0c9c2ac128beb94ff376e3367932ae6432 Author: Randy Dunlap Date: Mon Sep 25 23:11:21 2006 -0700 [NETDEV] config: revert part of previous patch Net devices should depend on NETDEVICES, so revert part of Paolo's previous patch. See http://marc.theaimsgroup.com/?l=linux-kernel&m=115566326218740&w=2 for history. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 83e331e2a492a134e491bcf50c984fd50c7fae03 Author: Chuck Short Date: Mon Sep 25 22:31:03 2006 -0700 [IRDA] via-ircc: fix memory leak Fix memory leak. Coverity id# 653 patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=a1f34cb68b16807ed9d5ebb0f6a6ec5ff8a5fc78 Signed-off-by: Chuck Short Signed-off-by: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 293b9c42511d800b5f7bb2acba50f3e584b8c410 Author: Fabio Olive Leite Date: Mon Sep 25 22:28:47 2006 -0700 [IPV6]: bh_lock_sock_nested on tcp_v6_rcv A while ago Ingo patched tcp_v4_rcv on net/ipv4/tcp_ipv4.c to use bh_lock_sock_nested and silence a lock validator warning. This fixed it for IPv4, but recently I saw a report of the same warning on IPv6. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2d2744fc8be620a2dc469cf48349e3e704119f1b Author: Jeff Garzik Date: Thu Sep 28 20:21:59 2006 -0400 [libata] PCI ID table cleanup in various drivers * Use PCI_VDEVICE() macro * const-ify pci_device_id table * standardize list terminator as "{ }" * convert spaces to tab in pci_driver struct (Alan-ism) * various minor whitespace cleanups Signed-off-by: Jeff Garzik commit 6e3ce3ae8e872f2d3a30f5ce5bc3b7c5eeca4343 Author: Greg Kroah-Hartman Date: Thu Sep 28 17:06:45 2006 -0700 USB: fix build error in ohci driver Thanks to Andrew for the original patch for this. I need to upgrade my version of gcc to catch these things... Signed-off-by: Greg Kroah-Hartman commit 2cc1a4134f51b4aff7c7486d857e6773f493e370 Author: Dave Jones Date: Thu Sep 28 19:50:07 2006 -0400 [AGPGART] printk fixups. Signed-off-by: Dave Jones commit 6174d0fd35f486f59b743630bdf088a9f9792d4d Author: Alan Stern Date: Tue Sep 26 14:51:48 2006 -0400 USB: g_file_storage: Set sense info Valid bit only when needed Strictly speaking, the Valid bit in SCSI sense data is supposed to be set only when the Information field contains a valid number. This patch (as793) turns off the Valid bit when the Information field hasn't been set. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e0318ebff4d96131bb3524308b845f642e64df81 Author: Alan Stern Date: Tue Sep 26 14:50:20 2006 -0400 USB: fix autosuspend when CONFIG_PM isn't set This patch (as791b) fixes things up to avoid compiler warnings or errors when CONFIG_USB_SUSPEND or CONFIG_PM isn't set. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8d1a243ba5dda5c1a3cca5df8fb19ab8b138f074 Author: Alan Stern Date: Tue Sep 26 14:46:16 2006 -0400 OHCI: add auto-stop support This patch (as790b) adds "autostop" support to ohci-hcd: the driver will automatically stop the host controller when no devices have been connected for at least one second. This feature is useful when the USB autosuspend facility isn't available, such as when CONFIG_USB_SUSPEND hasn't been set. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1f7e1a3b7e05c833229c4b6e9d3c96262df59e99 Author: Alan Stern Date: Mon Sep 25 15:41:21 2006 -0400 OHCI: remove existing autosuspend code The autosuspend technique used by ohci-hcd doesn't mesh well with the newer USB core autosuspend code. This patch (as789) removes ohci-hcd's autosuspend support. Now the driver will be usable, but it won't automatically go into a low-power state when no devices are connected. That's for a later patch. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d19ac7da72ab950c315d0da0aa03464587d88b53 Author: Alan Stern Date: Mon Sep 25 15:41:12 2006 -0400 USB: allow both root-hub interrupts and polling Originally I didn't think any host controller driver would ever use interrupts and polling at the same time, but it turns out ohci-hcd wants to do exactly that. This patch (as788) makes it possible. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 2de9eaefa7330b8e3d3fc5f31288cb1e826173a8 Author: Alan Stern Date: Mon Sep 25 14:31:15 2006 -0400 USB: g_file_storage: fix "ignoring return value" warnings This patch (as792) fixes "ignoring return value" warnings in file_storage.c. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit efd54a364121f61b2050b1df5ecb1b8329c4eaba Author: Alan Stern Date: Mon Sep 25 11:55:56 2006 -0400 USB: dummy-hcd: fix "warn-unused-result" messages This patch (as758) fixes the "warn-unused-result" messages in dummy-hcd. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit bd859281c09b4318153dc7222b5e9052aad83b61 Author: Alan Stern Date: Tue Sep 19 10:14:07 2006 -0400 USB: create new workqueue thread for USB autosuspend This patch (as787) creates a new workqueue thread to handle delayed USB autosuspend requests. Previously the code used keventd. However it turns out that the hub driver's suspend routine calls flush_scheduled_work(), making it a poor candidate for running in keventd (the call immediately deadlocks). The solution is to use a new thread instead of keventd. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6a9fb060393e04a79973f95925f4f6587442e9c7 Author: Jan Mate Date: Mon Sep 25 17:00:57 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 0eebe6ac7c58dc617d78b4e4713540f388e7c1f6 Author: Henrik Kretzschmar Date: Mon Sep 25 17:00:58 2006 -0700 USB: microtek usb scanner: Scsi_Cmnd conversion Converts obsolete typedef'd Scsi_Cmnd into struct scsi_cmnd. Signed-off-by: Henrik Kretzschmar Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 701f35af282e3955159bd30d3fb3f6ebafe8bff2 Author: Henrik Kretzschmar Date: Mon Sep 25 17:00:56 2006 -0700 USB: fixes kerneldoc errors in usbcore-auto(susp/res)-patch Fixes kerneldoc errors on usb/core/driver.c, which occured in 2.6.18-rc6-mm2 gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure.patch Signed-off-by: Henrik Kretzschmar Acked-by: Alan Stern Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 931e24b93a10b53da8223272b83941bc5b1d6dc5 Author: Raghavendra Biligiri Date: Fri Sep 15 19:53:35 2006 +0530 USB: add Raritan KVM USB Dongle to the HID_QUIRK_NOGET blacklist During Installation the host tries to enumerate the keyboard/mouse dongle for the Raritan KVM.At this time timeouts have been observed Adding the Raritan KVM USB dongle to the blacklist fixes this issue. Signed-off-by: Raghavendra Biligiri Signed-off-by: Greg Kroah-Hartman commit b923e7fcc152199959b673e09c318a750a10928b Author: David Hollis Date: Thu Sep 21 08:09:29 2006 -0400 USB: asix - Add alternate device IDs for Dlink DUB-E100 Rev B1 Add alternate device IDs for Dlink DUB-E100 Rev B1 Signed-off-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit e81ee637e4aed723f71007c90a901268317ed6d6 Author: Peter Zijlstra Date: Mon Sep 25 12:51:41 2006 +0200 usb-serial: possible irq lock inversion (PPP vs. usb/serial) ========================================================= [ INFO: possible irq lock inversion dependency detected ] commit 2e3a43f0b6f16705ec76d3744b82a116965ebebe Author: Alan Cox Date: Wed Sep 27 15:43:22 2006 -0700 ohci: Use ref-counting hotplug safe interfaces We want to avoid legacy APIs like pci_find_slot(). Signed-off-by: Alan Cox Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 54bee6e1b455573658972510a76119f279db32b7 Author: Mikael Pettersson Date: Sat Sep 23 17:05:31 2006 -0700 USB: Fix alignment of buffer passed down to ->hub_control() Implementations assume the buffer is at least 4 byte aligned. Signed-off-by: David S. Miller Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit a14848275b04f3193b9d9e9c745a4fae37f11f2f Author: Justin Carlson Date: Sun Sep 24 11:52:12 2006 +0300 USB: add SeaLevel 2106 SeaLINK support to ftdi_sio We have a couple of these USB-Serial converters around; they're slightly different from the 2104 models in that they can handle 500Kb/sec over RS422. The existing ftdi driver seems to work just fine if we add in the appropriate IDs. Patch is against 2.6.17.6, but should apply cleanly to pretty much anything recent. From: Justin Carlson Signed-off-by: Greg Kroah-Hartman commit 238d0e7bcf20981f7baac8bedfc219a90748700d Author: Sean Young Date: Sun Sep 24 19:26:57 2006 +0000 USB: New PhidgetKit 8/8/8 reset outputs after 2 seconds New phidget interface kits (type 8/8/8) reset their outputs if they haven't received a set report for 2 seconds. Signed-off-by: Sean Young Signed-off-by: Greg Kroah-Hartman commit 1b495f753a65835e7dd9d043b12f2fca6a105b3d Author: Matthias Urlichs Date: Sun Sep 24 21:38:47 2006 +0200 USB: another device ID for ipaq Add yet another device ID to the ipaq USB-serial driver. Signed-Off-By: Matthias Urlichs Cc: Ganesh Varadarajan Signed-off-by: Greg Kroah-Hartman commit 9978f9e1243be91243346b3e9555f1f53e50bb9c Author: Ian Abbott Date: Mon Sep 25 14:19:19 2006 +0100 USB serial ftdi_sio: Add support for Tactrix OpenPort devices This patch adds support for three OpenPort ECU data cables from Tactrix Inc. to the ftdi_sio driver's device ID table. One of the PIDs was supplied by Donour Sizemore on the ftdi-usb-sio-devel mailing list. The other two were added by myself after examining the Windows driver software. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 37cf3477d2140f496e0713738fabdb5bc6fd60f3 Author: Petko Manolov Date: Wed Sep 27 14:25:37 2006 -0700 USB: Pegasus driver failing for ADMtek 8515 network device Address http://bugzilla.kernel.org/show_bug.cgi?id=7126 Attempting to read the ethernet ID directly from the eeprom somehow confuses ADM8515. Subsequent read requests to either the eeprom or the MII fail as well. Didn't dig much deeper, though. For example ADM8513 does not experience this problem. I used the fact that at power up the device is reading its ID automatically (not true for older Pegasus based devices) and put it in the Ethernet ID registers. So now the driver uses get_registers() instead of read_eprom_word() if the device is Pegasus_II based one. Tested it with all (Pegasus and Pegasus_II) gadgets i have and everything seems ok. Cc: Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7923811a46f7e29ae8052edf2461e6c6b8ec2415 Author: Alan Stern Date: Thu Sep 28 12:11:56 2006 -0400 USB: unusual-devs entry for Nokia E60 This patch (as794) adds an unusual_devs entry for the Nokia E60. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b697f70f763fe92d5fd05e7e2043bd2b5f12b073 Author: Wesley PA4WDH Date: Thu Sep 28 20:45:38 2006 +0200 USB: Add vendor / product ID to pl2303 Signed-off-by: Greg Kroah-Hartman commit 486ba2a9b26dd8b6219a13297eac012be78108cc Author: Oliver Neukum Date: Thu Sep 28 22:21:19 2006 +0200 USB: new id for kaweth this adds a new id to the kaweth driver. Please apply. Signed-Off-By: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3379ceeefde923a05c2c77ed2d84ba26c2fe9e81 Author: Jean Delvare Date: Sun Sep 24 21:25:52 2006 +0200 hwmon: Remove Yuan Mu's address hwmon: Remove Yuan Mu's address Yuan Mu no longer works at Winbond. I wish to publicly thank Yuan for his help with Winbond hardware monitoring chips support during the past 10 months. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ce8c6ce1eceecfe090f6c1aa4108087b2051497b Author: Jean Delvare Date: Sun Sep 24 21:25:12 2006 +0200 hwmon: Fix unchecked return status, SMSC chips hwmon: Fix unchecked return status, SMSC chips Fix up 2 more hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a5ebe668add5f76ed8f01f752b37cfa164a26a30 Author: Jean Delvare Date: Sun Sep 24 21:24:46 2006 +0200 hwmon: Fix unchecked return status, batch 6 hwmon: Fix unchecked return status, batch 6 Fix up 5 more hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f52f79da2908796a0fa1e7bbbe0d5ff20183d75f Author: Rudolf Marek Date: Sun Sep 24 21:24:12 2006 +0200 w83792d: Fix unchecked return status w83792d: Fix unchecked return status Fix the w83792d driver. Add error checking to device_create_file and also care to destroy the files upon exit. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ccc5c306957bb7fbaef61de249bac4b0f09f2336 Author: Rudolf Marek Date: Sun Sep 24 21:23:26 2006 +0200 w83l785ts: Fix unchecked return status w83l785ts: Fix unchecked return status Fix the w83l785ts driver. Add error checking to device_create_file and also care to destroy the files upon exit. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 311ce2efb1b640584676fc1b0b7f16c5baf85eb8 Author: Jim Cromie Date: Sun Sep 24 21:22:52 2006 +0200 w83781d: Fix unchecked return status w83781d: Fix unchecked return status Add 2 attr-file groups (for base and model-specific attrs respectively), create the base group with single call to sysfs_create_group, check the return code on individual calls to device_create_file for each of the model-specific attr-files. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit cbeeb5b7c91b23967162185d7580048559db8d58 Author: Roger Lucas Date: Sun Sep 24 21:21:46 2006 +0200 vt8231: Fix unchecked return status vt8231: Fix unchecked return status Check the return status from device_create_file() and also use the newer and cleaner sysfs creation functions. Signed-off-by: Roger Lucas Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 87808be4f97674e6a2982fa835080cc0320dcbdc Author: Jean Delvare Date: Sun Sep 24 21:17:13 2006 +0200 Fix unchecked return status, batch 5 hwmon: Fix unchecked return status, batch 5 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0e39e01c908fdc498fff0d788fd7b955ab75ebb6 Author: Jean Delvare Date: Sun Sep 24 21:16:40 2006 +0200 hwmon: Fix unchecked return status, batch 4 hwmon: Fix unchecked return status, batch 4 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Note: f71805f actually checked the status from device_create_file already. However it did not remove the files on device destruction. It was also an opportunity to use sysfs_create/remove_group instead of hand-made loops. This makes the changes much more important but I think the result is worth it. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 681c6f7a6702f208d48b501c8829dbc03a2ca238 Author: Mark M. Hoffman Date: Sun Sep 24 21:15:35 2006 +0200 hwmon: Fix unchecked return status, batch 3 hwmon: Fix unchecked return status, batch 3 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0501a3816e5b778830fc2157a6d6bb11a965fc2c Author: Mark M. Hoffman Date: Sun Sep 24 21:14:35 2006 +0200 hwmon: Fix unchecked return status, batch 2 hwmon: Fix unchecked return status, batch 2 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c18beb5b92b090cb424718a4f1771b1a9fad56de Author: David Hubbard Date: Sun Sep 24 21:04:38 2006 +0200 w83627ehf: Fix unchecked return status w83627ehf: Fix unchecked return status Fix: check return value from device_create_file() Fix: call device_remove_file() on error and module unload Fix: call hwmon_device_register() after device_create_file() to eliminate race Signed-off-by: David Hubbard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f3722d5b6a474e31237d23980e9bd38facfda6f4 Author: Jim Cromie Date: Sun Sep 24 21:03:25 2006 +0200 pc87360: Check for error on sysfs files creation pc87360: Check for error on sysfs files creation Use sysfs_create_group() for 2 sensor-types which are chip-model invariant, i.e. all-or-nothing attribute groups. Other 2 groups vary too much due to configuration, etc, so we keep the loops of device_create_file(), but now check their returns. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 941c5c05cf38da5e12d70edc5d0fec5c24bce8b6 Author: Jim Cromie Date: Sun Sep 24 21:02:44 2006 +0200 pc87360: Delete sysfs files on device deletion pc87360: Delete sysfs files on device deletion Add 4 explicit attribute groups for the 5 sensor types: voltage (in), therm, temp, and fan & pwm (together in one group). Use sysfs_remove_group() to drop them, but keeps the existing startup code, which calls device_create_file in loops. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 44646c19b41e40d81f5e4863466914e8ce060cc0 Author: Jim Cromie Date: Sun Sep 24 21:01:56 2006 +0200 pc87360: Move some code around pc87360: Move some code around Moves code for get-set-decl tuples for 3 items: cpu0_vid, vrm, alarms_in up, to just after the get-set-decl tuple for voltages. These items are already 'activated' together with the rest of the voltage attributes, so the move tightens the grouping that's made explicit in next patch. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c1685f61b0a3110b701d09b84a9f9a3d4e9ef2e2 Author: Mark M. Hoffman Date: Sun Sep 24 20:59:49 2006 +0200 hwmon: Fix unchecked return status, batch 1 hwmon: Fix unchecked return status, batch 1 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a1fdcb96ee33ba75318476a2a4691147c9f2ad90 Author: Juerg Haefliger Date: Sun Sep 24 20:55:34 2006 +0200 vt1211: Document module parameters vt1211: Document module parameters Add a description of the module parameters to the documentation of the vt1211 driver. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 61d0b53363256e87aeb79286be2dc8f62a9d429a Author: Juerg Haefliger Date: Sun Sep 24 20:54:46 2006 +0200 vt1211: Add documentation vt1211: Add documentation Add documentation for the new vt1211 hardware monitoring driver. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ab41319eab3b5e600873dc77dff7756970424ca6 Author: Juerg Haefliger Date: Sun Sep 24 20:54:04 2006 +0200 hwmon: New driver for the VIA VT1211 hwmon: New driver for the VIA VT1211 This is a new driver for the VIA VT1211 Super-IO chip. It is a rewrite of the existing vt1211 driver (by Mark D. Studebaker and Lars Ekman) which has been around for a while but never made it into the main kernel tree. It is implemented as a platform driver and therefore requires lm_sensors 2.10.1 to function properly. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 125751cb833f20c12c7237782b2a4680fd636ed0 Author: Charles Spirakis Date: Sun Sep 24 20:53:04 2006 +0200 w83791d: Documentation update w83791d: Documentation update The alarm bits and the beep enable bits are in different positions in the hardware. Document the problem and leave it to the user-space code to handle the situation. When this driver is updated to the standardized sysfs alarm/beep methodology, this won't be a problem. This is a documentation only change. Signed-off by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2d45771e6ea79f56a7d85e448f702f60ef86c228 Author: Jean Delvare Date: Sun Sep 24 20:52:15 2006 +0200 hwmon: Add individual alarm files to 4 drivers hwmon: Add individual alarm files to 4 drivers Add individual sysfs files for all f71805f, lm63, lm83 and lm90 alarm and fault conditions. This is a requirement for the planned chip-independent libsensors. Almost all other hwmon drivers will need the same improvement. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 51bd56339335fad3643739504523190cd6d3416b Author: Jean Delvare Date: Sun Sep 24 20:51:37 2006 +0200 hwmon: Make a dozen drivers no more experimental hwmon: Make a dozen drivers no more experimental Remove the EXPERIMENTAL tag from a dozen hardware monitoring drivers. They are in the tree for quite a long time, so we would know by now if they were causing trouble. Also make it clearer that the VT8231 is a VIA chip. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ef4c4fdb2809c84c2ed8f037ae7c96cc03992569 Author: Rudolf Marek Date: Sun Sep 24 20:50:57 2006 +0200 k8temp: Add documentation k8temp: Add documentation Add promised documentation for the k8temp driver. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 360b9ab220aedaf346380fc2344729d9acc3b075 Author: Hans de Goede Date: Mon Aug 28 14:42:24 2006 +0200 abituguru: Add suspend/resume support This patch contains rudimentary suspend / resume support for the uguru, this protects the uguru and the driver against suspend / resume cycles, so there is no reason to unload the driver in your suspend / resume scripts. Only include suspend / resume functions when CONFIG_PM is set. Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b17ebc9402040959690b5a2c4e1cfb1e6d4fb206 Author: Jean Delvare Date: Mon Aug 28 14:41:03 2006 +0200 k8temp: Enable automatic loading Let the k8temp driver load automatically. Signed-off-by: Jean Delvare Cc: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit 29fa06c1292f473ae51a84f55c8fe22179bc1080 Author: Rudolf Marek Date: Mon Aug 28 14:40:17 2006 +0200 hwmon: New driver k8temp Add support for the temperature sensor(s) found in AMD K8 CPUs. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b19367c6f438b3a7700aceca21a03396702069ce Author: Jean Delvare Date: Mon Aug 28 14:39:26 2006 +0200 it87: Copyright update it87: Copyright update I think my contributions to the it87 driver over the past two years qualify me as a co-author of this driver. Also drop old comments of dubious usefulness. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c5df9b7a7c7600e4365e81f64ea44beb5be8bfa7 Author: Jean Delvare Date: Mon Aug 28 14:37:54 2006 +0200 it87: Overwrite broken default limits it87: Overwrite broken default limits Some IT8716F chips where seen with unreasonable defaults for low voltage and high temperature limits. Overwrite them with sane defaults so as to not generate meaningless alarms. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 87673dd735b8e089b7f2830edd353aa5f5e743ad Author: Jean Delvare Date: Mon Aug 28 14:37:19 2006 +0200 it87: Add support for the IT8718F it87: Add support for the IT8718F The IT8718F is a Super-I/O chip with integrated hardware monitoring functions. It is very similar to the IT8716F, so adding support to the it87 driver was pretty straightforward. The most significant difference is that the IT8718F has up to 8 VID pins, instead of 6 for the older chips. For the IT8718F, the VID value can only be read from Super-I/O space. Userspace support is already in lm_sensors SVN (to be soon released as 2.10.1.) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8ab4ec3ef45cc2facbe14c733ef7230e7d94fcf2 Author: Jean Delvare Date: Mon Aug 28 14:35:46 2006 +0200 it87: Cleanup set_fan_div it87: Cleanup set_fan_div We only change one fan clock divider at a time, so there is only one fan min which needs to be saved and restored. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3543a53f6c5b58c233218327f671108590151876 Author: Jean Delvare Date: Mon Aug 28 14:27:25 2006 +0200 it87: in8 has no limit registers it87: in8 has no limit registers Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b9e349f710376ef55f200e9fa07e88b4fe2cdf98 Author: Jean Delvare Date: Mon Aug 28 14:26:22 2006 +0200 it87: Prevent overflow on fan clock divider write it87: Prevent overflow on fan clock divider write The highest possible clock divider for fan1 and fan2 is 128. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9060f8bdd0c40e31d2be388e59f2dbeea55988a2 Author: Jean Delvare Date: Mon Aug 28 14:24:17 2006 +0200 it87: No sysfs files for disabled fans it87: No sysfs files for disabled fans Only create the fan attributes for enabled fan tachometers. Some motherboards have a nice BIOS which only enables the fan inputs which are wired to a fan header on the board. This makes the configuration easier for the user. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 17d648bf5786ba5b8cbf7cbd5cb18d3d8d2657ca Author: Jean Delvare Date: Mon Aug 28 14:23:46 2006 +0200 it87: Add support for the IT8716F it87: Add support for the IT8716F The IT8716F is a Super-I/O chip with integrated hardware monitoring functions. It is very similar to the IT8712F, so adding support to the it87 driver was pretty straightforward. The most significant change here is that the IT8716F has 16-bit fan speed counters, so the user no more needs to tweak the fan clock dividers to get the best readings. Userspace support is already in lm_sensors SVN (to be soon released as 2.10.1.) Thanks to Stian Oksavik, Olivier Nicolas, Prakash Punnoor and Juergen Kilb for testing the early versions of this patch. Thanks also to ITE for providing datasheets and answering my questions. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0dd7699ec4b27b3662d8980ff7a309cc81276298 Author: Jean Delvare Date: Mon Aug 28 14:22:34 2006 +0200 smsc47m1: dev_warn fix smsc47m1: dev_warn fix We can't use dev_warn on an i2c client before it is attached. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b25a10631a81fca33a94d1f1f6960928d8e9ce63 Author: Dmitry Torokhov Date: Mon Aug 28 14:21:42 2006 +0200 hdaps: Handle errors from input_register_device HDAPS: handle errors from input_register_device() Signed-off-by: Dmitry Torokhov Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c41bdb526bca5cda5be3de8c112f63c400bf990f Author: Alexey Dobriyan Date: Mon Aug 28 14:18:14 2006 +0200 atxp1: Signed/unsigned char bug fix vid_to_reg() can return -1 and char can be unsigned. Signed-off-by: Alexey Dobriyan Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 563daaf4047464eef5ffcb46194a99c1a8f2260e Author: Rudolf Marek Date: Wed Jul 5 18:15:31 2006 +0200 hwmon: Documentation update for w83627ehf Add documentation for the w83627ehf hardware monitoring driver. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 08c79950a047dbaccf05d70a203db2ee75ac3bd8 Author: Rudolf Marek Date: Wed Jul 5 18:14:31 2006 +0200 hwmon: Add fan speed control features to w83627ehf This patch adds long-awaited support for automatic fan modes. Based on the work of Yuan Mu from Winbond, I finished the support with the great help of David Hubbard. Signed-off-by: Yuan Mu Signed-off-by: Rudolf Marek Signed-off-by: David Hubbard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit bf97d28711e2dc4dc947faa6477cd1b36b91a2da Author: Steve French Date: Thu Sep 28 21:34:06 2006 +0000 [CIFS] CIFS support for /proc//mountstats part 1 Signed-off-by: Steve French commit a3ab41f10e2f5087e515da358680c88dd61d4832 Author: Steve French Date: Thu Sep 28 20:52:08 2006 +0000 [CIFS] Fix build break ifdef in wrong place Signed-off-by: Steve French commit e10847ed499cb86bf8ce12f3a686be8a98f8e140 Author: Steve French Date: Thu Sep 28 20:49:01 2006 +0000 [CIFS] More removing of unused functions Signed-off-by: Steve French commit 2eaf55862e8eb03999169d84f21eadffc88a36ce Author: Steve French Date: Thu Sep 28 20:41:48 2006 +0000 [CIFS] Remove unused prototypes Signed-off-by: Steve French commit e33c74d06e2b46a5f187ec7f60248da774c84e72 Author: Steve French Date: Thu Sep 28 20:35:48 2006 +0000 [CIFS] Fix build break Signed-off-by: Steve French commit 84904d0ead0a8c419abd45c7b2ac8d76d50a0d48 Author: Kevin Hilman Date: Fri Sep 22 00:58:57 2006 +0100 [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms Enables the ixp4xx platforms to use Generic time-of-day. Signed-off-by: Kevin Hilman Acked-by: John Stultz Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 746140c71d537560bbd22c1b148fb21031c30e71 Author: Kevin Hilman Date: Fri Sep 22 00:16:30 2006 +0100 [ARM] 3855/1: Add generic time support This patch adds Generic time-of-day support for the ARM architecture. The support is currently added using #ifdef's so that it can support sub-arches that do not (yet) have a clocksource added. As sub-arches add clocksource support, they should 'select GENERIC_TIME' Signed-off-by: Deepak Saxena Signed-off-by: Daniel Walker Signed-off-by: Kevin Hilman Acked-by: John Stultz Signed-off-by: Russell King commit 82606c66e943227afcec8a3c7b8428b99a7f88b8 Author: Ben Dooks Date: Thu Sep 28 20:51:35 2006 +0100 [ARM] 3873/1: S3C24XX: Add irq_chip names Add names to all the irq_chip structes Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 625ac112d4253c7e5f7a6d59c99943e8eb0b46c9 Author: Ben Dooks Date: Thu Sep 28 20:45:29 2006 +0100 [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips Apply consistant tabbing to the IRQ chip structures in arch/arm/mach-s3c2410/irq.c Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 38e0533ce87a58e25f959e6d0958478b6a137794 Author: Ben Dooks Date: Thu Sep 28 20:40:50 2006 +0100 [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23 The demux code for the IRQ EINTs above 3 was using find last set instead of finding first set. Also fix it so that we only check EINT4..7 when the parent EINT4t7 goes off, and the 8..23 when EINT8t23 goes off. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 2cd646a2d1d5e0e46aa4bb55b1847b0cb35bd855 Author: Steve French Date: Thu Sep 28 19:43:08 2006 +0000 [CIFS] Remove static and unused symbols Most cases of the ones found by Shaggy by "make namespacecheck" could be removed or made static Ack: Dave Kleikamp Signed-off-by: Steve French commit 6afd6fae1d5f7e7129a10c4f3e32018966eeac1c Author: Hyok S. Choi Date: Thu Sep 28 21:46:34 2006 +0900 [ARM] nommu: confirms the CR_V bit in nommu mode In nommu mode, the exception vector location depends on the platforms. Some of the implementations may have some special exception control forwarding method in their ROM/flash and for some of them has its own re-mapping mechanism by the h/w. This patch introduces a special configuration CONFIG_CPU_HIGH_VECTOR which turns on the CR_V bit in nommu mode. The CR_V bit is turned off by default. This feature depends on CP15 and does not supported by ARM740. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 0f45d7f36b766cb668cebfb5d4d2f67b4a8676ba Author: Hyok S. Choi Date: Thu Sep 28 21:46:16 2006 +0900 [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores. There is no FSR/FAR register on no-CP15 or MPU cores. This patch adds a dummy abort handler which returns zero for the base restored Data Abort model !CPU_CP15_MMU cores. The abort-lv4t.S is still used with the fix-up for the base updated Data Abort model cores. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 3d27b00457167103fb9f7e23fc2454c801a6b8f0 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:24 2006 -0700 IB/ipath: Fix lockdep error upon "ifconfig ibN down" Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7a26c47412b201e1977ad42b760885f825158915 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:23 2006 -0700 IB/ipath: Fix races with ib_resize_cq() The resize CQ function changes the memory used to store the queue. Other routines need to honor the lock before accessing the pointer to the queue and verify that the head and tail are in range. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit bf3258ec418a008ab4672787ebff2c5837dd1e69 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:22 2006 -0700 IB/ipath: Support new PCIE device, QLE7142 Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit c97d27d8a992cf6cefee945489d5f93fca160aa2 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:21 2006 -0700 IB/ipath: Set CPU affinity early This change moves around port assignment so that it happens before any memory is allocated. This allows memory to be allocated on an appropriate CPU, which improves performance for users of /dev/ipath. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 1a4e74a08788db913486cb9a3dc30984c55e9897 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:19 2006 -0700 IB/ipath: Fix EEPROM read when driver is compiled with -Os The EEPROM is read via programmable I/O pins. When the driver is compiled -Os, the CPU can speculatively read the I/O value before it is valid. This patch fixes the problem. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 89d1e09b6a6d844ef327937f41658a426be42501 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:18 2006 -0700 IB/ipath: Fix and recover TXE piobuf and PBC parity errors We can sometimes trigger parity errors due to processor speculative reads to our write-combined memory (mostly seen on Woodcrest). Add a stats counter for these. Factored out the sendbuffererror buffer cancellation code so it can be used in the new handling; suppress likely subsequent error messages if within two jiffies of the cancellation. Also restore 2 dropped TXE lines on hwe_bitsextant noticed while debugging. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 510847750c9d26052a71631e0fcad9e7f7a5f369 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:17 2006 -0700 IB/ipath: Change HT CRC message to indicate how to resolve problem The system must be powercycled to clear a HT CRC error; reloading the driver is not enough. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7227aac47deac20daa0073a1ebbf608b4f2f8d94 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:16 2006 -0700 IB/ipath: Clean up module exit code Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 957670a57eb63b932b09b444ad44192ad9ee9382 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:15 2006 -0700 IB/ipath: Call mtrr_del with correct arguments We were passing 0 for base and length, which worked on older kernels, but it doesn't seem to any longer. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 8d0208cb59a43bf867e16b977c34c4d6cd618f59 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:14 2006 -0700 IB/ipath: Flush RWQEs if access error or invalid error seen If the receiver goes into the error state, we need to flush the posted receive WQEs. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 1fd3b40fde3bfacdf742cadfe99cfd47ffd05219 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:13 2006 -0700 IB/ipath: Improved support for PowerPC Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 076fafcdee37c87564abd1ad993e17d77fc32daa Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:12 2006 -0700 IB/ipath: Drop unnecessary "(void *)" casts Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit f62fe77ad26b9c89c2028d96709f0f28793fe6cd Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:11 2006 -0700 IB/ipath: Support multiple simultaneous devices of different types Prior to this change, the driver was not able to support a HT and PCIE card simultaneously present in the same machine. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 5659416207a9bcf35a646c7b798b290953e4891c Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:10 2006 -0700 IB/ipath: Fix mismatch in shifts and masks for printing debug info Fixed mismatch in linkstate/trainingstate shifts and masks in the IPATH_IBSTATE_MASK macro. It kept some linktrainingstates from being printed correctly in debug; no functionality issue unless I misread the code. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 0624b072f230af4f24c112019b04f898ef7b4e2c Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:09 2006 -0700 IB/ipath: Fix compiler warnings and errors on non-x86_64 systems Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 8d588f8bb79c86a5826f66946c1ea026b6b07bd8 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:08 2006 -0700 IB/ipath: Print more informative parity error messages Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 6a553af286653818bb5831f1b351eefdc8a93b61 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:07 2006 -0700 IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 10aeb0e6d8823c1cccf9edc8401c848745c128be Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:06 2006 -0700 IB/ipath: RC and UC should validate SLID and DLID This is required for IB conformance (spec ch. 9.6.1.5). Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7dae5bff2e8e4699744e782a6e7605ad18d1240e Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:05 2006 -0700 IB/ipath: Only allow complete writes to flash Don't allow a write to the eeprom from ipathfs unless the write is exactly 128 bytes and starts at offset 0. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit f3e93c7757043cd5d5c4879b8b92effcc7817c81 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:04 2006 -0700 IB/ipath: Count SRQs properly Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit aa4eaed702cb5d07babaaa04596436156b922249 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:03 2006 -0700 IB/ipath: Lock and count allocated CQs properly Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 11b054fe1d453954449a86de178bb98274bb86ef Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:02 2006 -0700 IB/ipath: Clean up handling of GUID 0 Respond with an error to the SM if our GUID is 0, and don't allow the user to set our GUID to 0. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit c78f6415e964aafd3a91d834970c16b613e421d9 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:01 2006 -0700 IB/ipath: Unregister from IB core early This gives upper-level protocols a chance to unregister while the device is still usable. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 2c9446a1d63f1ca570e92f89422595732efedf44 Author: Bryan O'Sullivan Date: Thu Sep 28 09:00:00 2006 -0700 IB/ipath: Support revision 2 InfiniPath PCIE devices This also entailed a little GPIO-interrupt general cleanup. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 9929b0fb0f35f54371e9364bab809bcd753f9d3a Author: Bryan O'Sullivan Date: Thu Sep 28 08:59:59 2006 -0700 IB/ipath: Driver support for userspace sharing of HW contexts This allows multiple userspace processes to share a single hardware context in a master/slave arrangement. It is backwards binary compatible with existing userspace. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 221e31985b490309eb9ae33ac815deae3b5aa021 Author: Bryan O'Sullivan Date: Thu Sep 28 08:59:58 2006 -0700 IB/ipath: Fix memory leak if allocation fails If the second allocation failed, the first structure allocated in this routine was not freed. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 6022943eb4cb3cb9e43f27f1faeaba38e162d966 Author: Bryan O'Sullivan Date: Thu Sep 28 08:59:57 2006 -0700 IB/ipath: Limit # of packets sent without an ACK received The sender requests an ACK every 1/2 MB to avoid retransmit timeouts that were causing MVAPICH mod_bw to fail after a predictable number of sends. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit fd6a79a786b84510d00ee6aa6449a468e6d75dee Author: Erez Zilber Date: Wed Sep 27 16:48:57 2006 +0300 IB/iser: Fix the description of iSER in Kconfig Fix the description of iSER in Kconfig. It is not accurate. Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit 74a2078061409e027ccb51a28cf6174c31ab8f99 Author: Erez Zilber Date: Wed Sep 27 16:43:06 2006 +0300 IB/iser: DMA unmap unaligned for RDMA data before touching it iSER uses the DMA mapping api to map the page holding the SCSI command data to the HCA DMA address space. When the command data is not aligned for RDMA, the data is copied to/from an allocated buffer which in turn is used for executing this command. The pages associated with the command must be unmapped before being touched. Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit 87e8df7a273c7c1acb864c90b5253609c44375a6 Author: Erez Zilber Date: Wed Sep 27 15:27:10 2006 +0300 IB/iser: Have iSER data transaction object point to iSER conn iSER uses a data transaction object (struct iser_dto) as part of its IB data descriptors (struct iser_desc) management. It also uses a hierarchy of connection structures pointing to each other. A DTO may exist even after the iscsi_iser connection pointed by it is destroyed (eg one that is bound to a post receive buffer which was flushed by the IB HW). Hence DTOs need point to the lowest connection, which is struct iser_conn. Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit ee30cb5b0b65392843cc3beaba48160ee4a3764e Author: Roland Dreier Date: Thu Sep 28 10:44:07 2006 -0700 RDMA/amso1100: Fix memory leak in c2_reg_phys_mr() If the allocation of mr fails, then c2_reg_phys_mr() leaks the page_list array it allocated earlier. This was Coverity CID #1413. Signed-off-by: Roland Dreier commit 44334bd97e76662c5f40c629357e6acc4dee3e8a Author: Eric Sesterhenn Date: Thu Sep 28 10:38:32 2006 -0700 RDMA/amso1100: Fix error path in c2_llp_accept() Another NULL dereference spotted by the Coverity checker (cid #1395): In case we can't alloc the vq_req, we goto bail1, where we call vq_req_free(c2dev, vq_req); which then dereferences vq_req. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Acked-by: Tom Tucker Signed-off-by: Roland Dreier commit 1f51c10c5e85050506663bce1d69513eb901db87 Author: Andrew Victor Date: Thu Sep 28 16:26:47 2006 +0100 [ARM] 3870/1: AT91: Start removing static memory mappings This patch removes the static memory mapping for the currently-unused peripherals [Synchronous Serial, Timer/Counter unit], and for those drivers that already ioremap() their registers [UART]. Also, the Ethernet driver now uses the platform_device resources but doesn't yet use ioremap() so we need to pass it the virtual address instead of the physical address. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 94c12cc7d196bab34aaa98d38521549fa1e5ef76 Author: Martin Schwidefsky Date: Thu Sep 28 16:56:43 2006 +0200 [S390] Inline assembly cleanup. Major cleanup of all s390 inline assemblies. They now have a common coding style. Quite a few have been shortened, mainly by using register asm variables. Use of the EX_TABLE macro helps as well. The atomic ops, bit ops and locking inlines new use the Q-constraint if a newer gcc is used. That results in slightly better code. Thanks to Christian Borntraeger for proof reading the changes. Signed-off-by: Martin Schwidefsky commit 25d83cbfaa44e1b9170c0941c3ef52ca39f54ccc Author: Heiko Carstens Date: Thu Sep 28 16:56:37 2006 +0200 [S390] Whitespace cleanup. Huge s390 assembly files whitespace cleanup. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 52149ba6b0ddf3e9d965257cc0513193650b3ea8 Author: Martin Schwidefsky Date: Thu Sep 28 16:56:03 2006 +0200 [S390] user readable uninitialised kernel memory. A user space program can read uninitialised kernel memory by appending to a file from a bad address and then reading the result back. The cause is the copy_from_user function that does not clear the remaining bytes of the kernel buffer after it got a fault on the user space address. Signed-off-by: Martin Schwidefsky commit 51dced544e3964b684afc99282ceceaa384b16a8 Author: Jan Glauber Date: Thu Sep 28 16:55:53 2006 +0200 [S390] init_timer in tty3270. Call init_timer only once fpr tp->timer in tty3270. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 0efa470363699ecba49e67cc3c75f46b300f98a4 Author: Christian Borntraeger Date: Thu Sep 28 16:55:46 2006 +0200 [S390] config option for z9-109 code generation. Add a kernel config option for the IBM System z9. This will produce faster code on newer compilers using the -march=z9-109 option. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit d9f7a745d55527d0d41684b22506a86c4381f7f1 Author: Martin Schwidefsky Date: Thu Sep 28 16:55:39 2006 +0200 [S390] __div64_32 for 31 bit. The clocksource infrastructure introduced with commit ad596171ed635c51a9eef829187af100cbf8dcf7 broke 31 bit s390. The reason is that the do_div() primitive for 31 bit always had a restriction: it could only divide an unsigned 64 bit integer by an unsigned 31 bit integer. The clocksource code now uses do_div() with a base value that has the most significant bit set. The result is that clock->cycle_interval has a funny value which causes the linux time to jump around like mad. The solution is "obvious": implement a proper __div64_32 function for 31 bit s390. Signed-off-by: Martin Schwidefsky commit 1fce518e8e7de62597c823d6d795cafc694e7910 Author: Christian Borntraeger Date: Thu Sep 28 16:55:33 2006 +0200 [S390] remove unnecessary includes. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 23c100d99c1dfd0bba49a63fb02a8f8fddad607b Author: Michael Holzheu Date: Thu Sep 28 16:55:28 2006 +0200 [S390] hypfs sparse warnings. sparse complains, if we use bitwise operations on enums. Cast enum to long in order to fix that problem! Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 925afbd6cbc0d5154710f00dc186518f396e04ec Author: Gerald Schaefer Date: Thu Sep 28 16:55:23 2006 +0200 [S390] Avoid static struct initializations in appldata. Don't use static initialization for struct members containing variables because gcc would generate more code and use double space on stack. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit bac9c66cd25e134077b284fc59bee6e5a8475d33 Author: Akinobu Mita Date: Thu Sep 28 16:55:18 2006 +0200 [S390] init task memory faults. Lock for mmap_sem is missing on page fault retry for init task when it fails due to out of memory. Signed-off-by: Akinobu Mita Signed-off-by: Martin Schwidefsky commit 825f9075d74028d11d7f5932f04e1b5db3022b51 Author: Theodore Ts'o Date: Wed Sep 27 01:50:32 2006 -0700 [GFS2] inode-diet: Eliminate i_blksize from the inode structure This eliminates the i_blksize field from struct inode. Filesystems that want to provide a per-inode st_blksize can do so by providing their own getattr routine instead of using the generic_fillattr() function. Note that some filesystems were providing pretty much random (and incorrect) values for i_blksize. Signed-off-by: "Theodore Ts'o" Cc: Steven Whitehouse Signed-off-by: Andrew Morton commit bba9dfd83587017de1c55a94c077983e0dfa0251 Author: Theodore Ts'o Date: Wed Sep 27 01:50:31 2006 -0700 [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs) The following patches reduce the size of the VFS inode structure by 28 bytes on a UP x86. (It would be more on an x86_64 system). This is a 10% reduction in the inode size on a UP kernel that is configured in a production mode (i.e., with no spinlock or other debugging functions enabled; if you want to save memory taken up by in-core inodes, the first thing you should do is disable the debugging options; they are responsible for a huge amount of bloat in the VFS inode structure). This patch: The filesystem or device-specific pointer in the inode is inside a union, which is pretty pointless given that all 30+ users of this field have been using the void pointer. Get rid of the union and rename it to i_private, with a comment to explain who is allowed to use the void pointer. This is just a cleanup, but it allows us to reuse the union 'u' for something something where the union will actually be used. Signed-off-by: "Theodore Ts'o" Cc: Steven Whitehouse Signed-off-by: Andrew Morton commit cc2b28ba61b0a6bdfcf18274b8b883b98486eca4 Author: Andrew Victor Date: Thu Sep 28 10:27:00 2006 +0100 [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards This patch adds support for the NAND flash on the Atmel AT91RM9200-DK and KwikByte KB920x boards. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 97f0fb68f142b477773c05140da27c1dbd31a2ab Author: Andrew Victor Date: Wed Sep 27 16:18:18 2006 +0100 [ARM] 3868/1: AT91 hardware header update This patch adds the hardware register definitions for the TWI (I2C) controller found on the AT91RM9200 and AT91SAM9xx processors. It also defines the AIC Fast-Forcing registers added to the AT91SAM9's. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f21738341ca330ec83ef978ee63ffa5ecf13f082 Author: Andrew Victor Date: Wed Sep 27 13:23:00 2006 +0100 [ARM] 3867/1: AT91 GPIO update This patch makes the AT91 gpio.c support processor-generic (AT91RM9200 and AT91SAM9xxx). The GPIO controllers supported by a particular AT91 processor are defined in the processor-specific file and are registered with gpio.c at startup. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2eeaaa21de68cb8869d3a54438a9224321d3dd03 Author: Andrew Victor Date: Wed Sep 27 10:50:59 2006 +0100 [ARM] 3866/1: AT91 clock update This patch makes the AT91 clock.c support processor-generic (AT91RM9200 and AT91SAM9xxx). The clocks supported by a particular AT91 processor are defined in the processor-specific file and are registered with clock.c at startup. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 72729910c38ca5b4736032c15dc3f9d48fe4f68a Author: Andrew Victor Date: Wed Sep 27 09:44:11 2006 +0100 [ARM] 3865/1: AT91RM9200 header updates This is more preparation for adding support for the new Atmel AT91SAM9 processors. Changes include: - Replace AT91_BASE_* with AT91RM9200_BASE_* - Replace AT91_ID_* with AT91RM9200_ID_* - ROM, SRAM and UHP address definitions moved to at91rm9200.h. - The raw AT91_P[ABCD]_* definitions are now depreciated in favour of the GPIO API. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 35aa7a436c0901fd6f352eff347f58448c141a25 Author: Jeff Garzik Date: Thu Sep 28 06:50:24 2006 -0400 [libata] Print out Status register, if a BSY-sleep takes too long We have the info stored in an ata_busy_sleep() variable, so might as well print it, and provide some additional diagnostic info. Signed-off-by: Jeff Garzik commit d639ca94188fedbd8cfde1ab4ed9e9878ab2f01e Author: Jeff Garzik Date: Thu Sep 28 03:48:18 2006 -0400 [libata] init probe_ent->private_data in a common location Don't write the same code twice, in two different functions, when they both call the same initialization function, with the same private_data pointer info. Also, note a bug found with a FIXME. Signed-off-by: Jeff Garzik commit c791c30670ea61f19eec390124128bf278e854fe Author: Jeff Garzik Date: Thu Sep 28 03:40:11 2006 -0400 [libata] minor PCI IDE probe fixes and cleanups * Replace needless 'n_ports > 2' check with a simple BUG_ON(). No existing driver ever wants more than 2 ports. * Delete ATA_FLAG_NO_LEGACY check. No current driver uses ata_pci_init_one(), that sets this flag. * Move PCI_CLASS_PROG register read below pci_enable_device() * Handle ata_device_add() failure Signed-off-by: Jeff Garzik commit 2bf118197cb4d9a5e7a9e45b5b007235fdc9f402 Author: Paul Mackerras Date: Wed Sep 27 22:47:03 2006 +1000 [POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot This puts the knowledge of how to create various sorts of zImage wrappers into a script called "wrapper" that could be used outside of the kernel tree. This changes arch/powerpc/boot so it first builds the files that the wrapper script needs, then runs it to create whatever flavours of zImage are required. This version does uImages as well. The zImage names are changed slightly; zImage.pseries is the one with the PT_NOTE program header entry added, and zImage.pmac is the one without. If the zImage.pseries gets made, it will also get hardlinked to zImage; otherwise, if zImage.pmac is made, it gets hardlinked to zImage. Signed-off-by: Paul Mackerras commit 1bd5bbcb6531776a8f73e2cc6287fc4dd542e1c7 Author: Steve French Date: Thu Sep 28 03:35:57 2006 +0000 [CIFS] Legacy time handling for Win9x and OS/2 part 1 Signed-off-by: Steve French commit 54bb3a94b192be09feb85993b664ff118d6433d0 Author: Jeff Garzik Date: Wed Sep 27 22:20:11 2006 -0400 [libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists Signed-off-by: Jeff Garzik commit 6e73b418887675da18602550ca296211caeb3897 Author: Vlad Apostolov Date: Thu Sep 28 11:06:21 2006 +1000 [XFS] 955947: Infinite loop in xfs_bulkstat() on formatter() error SGI-PV: 955947 SGI-Modid: xfs-linux-melb:xfs-kern:26986a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 6f1f21684078884b62cfff2ea80a1a6c07f79824 Author: Vlad Apostolov Date: Thu Sep 28 11:06:15 2006 +1000 [XFS] pv 956241, author: nathans, rv: vapo - make ino validation checks consistent in bulkstat SGI-PV: 956241 SGI-Modid: xfs-linux-melb:xfs-kern:26984a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 6216ff18839bf302805f67c93e8bc344387c513b Author: Vlad Apostolov Date: Thu Sep 28 11:06:10 2006 +1000 [XFS] pv 956240, author: nathans, rv: vapo - Minor fixes in kmem_zalloc_greedy() SGI-PV: 956240 SGI-Modid: xfs-linux-melb:xfs-kern:26983a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit f273ab848b7cbc0088b0ac7457b3769e6566074e Author: David Chinner Date: Thu Sep 28 11:06:03 2006 +1000 [XFS] Really fix use after free in xfs_iunpin. The previous attempts to fix the linux inode use-after-free in xfs_iunpin simply made the problem harder to hit. We actually need complete exclusion between xfs_reclaim and xfs_iunpin, as well as ensuring that the i_flags are consistent during both of these functions. Introduce a new spinlock for exclusion and the i_flags, and fix up xfs_iunpin to use igrab before marking the inode dirty. SGI-PV: 952967 SGI-Modid: xfs-linux-melb:xfs-kern:26964a Signed-off-by: David Chinner Signed-off-by: Tim Shimmin commit 01106eae97b70399ce5a273a3cceb5246e8d9cc8 Author: Eric Sandeen Date: Thu Sep 28 11:05:52 2006 +1000 [XFS] Collapse sv_init and init_sv into just the one interface. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:26925a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 7ae67d78e7518fba89e5f3a74bdcb68e48ae8858 Author: Eric Sandeen Date: Thu Sep 28 11:05:46 2006 +1000 [XFS] standardize on one sema init macro One sema to rule them all, one sema to find them... SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:26911a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 91d87232044c1ceb8371625c27479e982984a848 Author: Eric Sandeen Date: Thu Sep 28 11:05:40 2006 +1000 [XFS] Reduce endian flipping in alloc_btree, same as was done for ialloc_btree. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26910a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit edcd4bce5e58987c8c039bdf7705a22cd229fe96 Author: Nathan Scott Date: Thu Sep 28 11:05:33 2006 +1000 [XFS] Minor cleanup from dio locking fix, remove an extra conditional. SGI-PV: 955696 SGI-Modid: xfs-linux-melb:xfs-kern:26908a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 215101c36012399cf2eaee849de54eeefc9f618c Author: Nathan Scott Date: Thu Sep 28 11:04:43 2006 +1000 [XFS] Fix kmem_zalloc_greedy warnings on 64 bit platforms. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26907a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit e132f54ce8660bbf34723cc12cb11e6f61d6fbac Author: Vlad Apostolov Date: Thu Sep 28 11:04:31 2006 +1000 [XFS] pv 955157, rv bnaujok - break the loop on EFAULT formatter() error SGI-PV: 955157 SGI-Modid: xfs-linux-melb:xfs-kern:26869a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 22de606a0b9623bf15752808f123848a65a6cc28 Author: Vlad Apostolov Date: Thu Sep 28 11:04:24 2006 +1000 [XFS] pv 955157, rv bnaujok - break the loop on formatter() error SGI-PV: 955157 SGI-Modid: xfs-linux-melb:xfs-kern:26866a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 955e47ad28b5b255ddcd7eb9cb814a269dc6e991 Author: Tim Shimmin Date: Thu Sep 28 11:04:16 2006 +1000 [XFS] Fixes the leak in reservation space because we weren't ungranting space for the unmount record - which becomes a problem in the freeze/thaw scenario. SGI-PV: 942533 SGI-Modid: xfs-linux-melb:xfs-kern:26815a Signed-off-by: Tim Shimmin commit 22d91f65d57a7f1a1c5fc81f47b47b0cc54ad6f7 Author: Josh Triplett Date: Thu Sep 28 11:04:07 2006 +1000 [XFS] Add lock annotations to xfs_trans_update_ail and xfs_trans_delete_ail xfs_trans_update_ail and xfs_trans_delete_ail get called with the AIL lock held, and release it. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26807a Signed-off-by: Josh Triplett Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 68c3271515f11f6665dc8732e53aaab3d3fdd7d3 Author: Nathan Scott Date: Thu Sep 28 11:03:53 2006 +1000 [XFS] Fix a porting botch on the realtime subvol growfs code path. SGI-PV: 955515 SGI-Modid: xfs-linux-melb:xfs-kern:26806a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit d432c80e68e3c283fc9a85021f5b65e0aabf254e Author: Nathan Scott Date: Thu Sep 28 11:03:44 2006 +1000 [XFS] Minor code rearranging and cleanup to prevent some coverity false positives. SGI-PV: 955502 SGI-Modid: xfs-linux-melb:xfs-kern:26805a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit b627259c602f3f1b995d09aad2b57bed889430b9 Author: Nathan Scott Date: Thu Sep 28 11:03:33 2006 +1000 [XFS] Remove a no-longer-correct debug assert from dio completion handling. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26804a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 77e4635ae191774526ed695482a151ac986f3806 Author: Nathan Scott Date: Thu Sep 28 11:03:27 2006 +1000 [XFS] Add a greedy allocation interface, allocating within a min/max size range. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26803a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 572d95f49f3652fffe8242c4498b85f4083e52ab Author: Nathan Scott Date: Thu Sep 28 11:03:20 2006 +1000 [XFS] Improve error handling for the zero-fsblock extent detection code. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26802a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 948ecdb4c118293d2f3e267eec642c30c5d3a056 Author: Nathan Scott Date: Thu Sep 28 11:03:13 2006 +1000 [XFS] Be more defensive with page flags (error/private) for metadata buffers. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26801a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit efb8ad7e9431a430a75d44288614cf6047ff4baa Author: Nathan Scott Date: Thu Sep 28 11:03:05 2006 +1000 [XFS] Add a debug flag for allocations which are known to be larger than one page. SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26800a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 3f89243c5b987dd55f8eec6fd54be05887d69bc6 Author: Eric Sandeen Date: Thu Sep 28 11:02:57 2006 +1000 [XFS] Remove several macros that are no longer used anywhere SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26749a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 065d312e15902976d256ddaf396a7950ec0350a8 Author: Eric Sandeen Date: Thu Sep 28 11:02:44 2006 +1000 [XFS] Remove unused iop_abort log item operation SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26747a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 43129c16e85119355d352e10ff4b30a08053228c Author: Eric Sandeen Date: Thu Sep 28 11:02:37 2006 +1000 [XFS] Remove a couple of unused BUF macros SGI-PV: 955302 SGI-Modid: xfs-linux-melb:xfs-kern:26746a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 17370097dace78c93d6fa32110983e74b981d192 Author: Vlad Apostolov Date: Thu Sep 28 11:02:30 2006 +1000 [XFS] pass file mode on DMAPI remove events SGI-PV: 953687 SGI-Modid: xfs-linux-melb:xfs-kern:26639a Signed-off-by: Vlad Apostolov Signed-off-by: Tim Shimmin commit 745b1f47fc0c68dbb1ff440eec8889f61e57194b Author: Nathan Scott Date: Thu Sep 28 11:02:23 2006 +1000 [XFS] Remove last bulkstat false-positives with debug kernels. SGI-PV: 953819 SGI-Modid: xfs-linux-melb:xfs-kern:26628a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit a3c6685eaa1b6c5cf05b084b3bc91895e253ad2c Author: Nathan Scott Date: Thu Sep 28 11:02:14 2006 +1000 [XFS] Ensure xlog_state_do_callback does not report spurious warnings on ramdisks. SGI-PV: 954802 SGI-Modid: xfs-linux-melb:xfs-kern:26627a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit bb3c7d2936b6db6f5ded9abf4d215abe97af8372 Author: Nathan Scott Date: Thu Sep 28 11:02:09 2006 +1000 [XFS] Increase the size of the buffer holding the local inode cluster list, to increase our potential readahead window and in turn improve bulkstat performance. SGI-PV: 944409 SGI-Modid: xfs-linux-melb:xfs-kern:26607a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 2627509330323efc88b5818065cba737e000de5c Author: Nathan Scott Date: Thu Sep 28 11:02:03 2006 +1000 [XFS] Drop unneeded endian conversion in bulkstat and start readahead for batches of inode cluster buffers at once, before any blocking reads are issued. SGI-PV: 944409 SGI-Modid: xfs-linux-melb:xfs-kern:26606a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 51bdd70681e247184b81c2de61dbc26154511155 Author: Nathan Scott Date: Thu Sep 28 11:01:57 2006 +1000 [XFS] When issuing metadata readahead, submit bio with READA not READ. SGI-PV: 944409 SGI-Modid: xfs-linux-melb:xfs-kern:26603a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 8b56f083c2a6bd0a88271225f0bcf1d81db20d3c Author: Nathan Scott Date: Thu Sep 28 11:01:46 2006 +1000 [XFS] Rework DMAPI bulkstat calls in such a way that we can directly extract inline attributes out of the bulkstat buffer (for that case), rather than using an (extremely expensive for large icount filesystems) iget for fetching attrs. SGI-PV: 944409 SGI-Modid: xfs-linux-melb:xfs-kern:26602a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 726801ba067410a1d38518823f2c253a087f6c6f Author: Tim Shimmin Date: Thu Sep 28 11:01:37 2006 +1000 [XFS] Add EA list callbacks for xfs kernel use. Cleanup some namespace code. SGI-PV: 954372 SGI-Modid: xfs-linux-melb:xfs-kern:26583a Signed-off-by: Tim Shimmin commit 69e23b9a5e7430ced667d8b699330e370c202f28 Author: Nathan Scott Date: Thu Sep 28 11:01:22 2006 +1000 [XFS] Update XFS for i_blksize removal from generic inode structure SGI-PV: 954366 SGI-Modid: xfs-linux-melb:xfs-kern:26565a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 29b6d22b011d83dac8ca5b7d26f766ae598abbbd Author: Nathan Scott Date: Thu Sep 28 10:59:06 2006 +1000 [XFS] remove accidentally reintroduced vfs unmount flag, unneeded in current kernels SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26564a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit fe48cae9ed979d2ac14080c837d793c4f6bfaa82 Author: Christoph Hellwig Date: Thu Sep 28 10:58:52 2006 +1000 [XFS] remove bhv_lookup, _range version works aswell and has more useful semantics. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26563a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 1121b219bf3fe6d1bd1d1f7618cc5e0c409fabb4 Author: Nathan Scott Date: Thu Sep 28 10:58:40 2006 +1000 [XFS] use NULL for pointer initialisation instead of zero-cast-to-ptr SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26562a Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 8801bb99e4425b9a778b355153ab3254bb431d92 Author: Christoph Hellwig Date: Thu Sep 28 10:58:17 2006 +1000 [XFS] endianess annotations for xfs_bmbt_key Trivial as there are no incore users. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26561a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 576039cf3c668d5f8d97dff8a0a5817e8b3a761b Author: Christoph Hellwig Date: Thu Sep 28 10:58:06 2006 +1000 [XFS] endianess annotate XFS_BMAP_BROOT_PTR_ADDR Make sure it returns a __be64 and let the callers use the proper macros. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26560a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit 397b5208d5609e2f01b171a34ab690f325253492 Author: Christoph Hellwig Date: Thu Sep 28 10:57:52 2006 +1000 [XFS] endianess annotations for xfs_bmbt_ptr_t/xfs_bmdr_ptr_t SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26559a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit b113bcb83efb411f3cc6c7692fbf933ed01b67d8 Author: Christoph Hellwig Date: Thu Sep 28 10:57:42 2006 +1000 [XFS] add xfs_btree_check_lptr_disk variant which handles endian conversion SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26558a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit c38e5e84dbbeda9a92ea878ec9f6255b519a69e7 Author: Christoph Hellwig Date: Thu Sep 28 10:57:17 2006 +1000 [XFS] remove left over INT_ comments in *alloc*.c We can verify endianess handling with sparse now, no need for comments. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26557a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin