commit d4ac2477fad0f2680e84ec12e387ce67682c5c13 Author: Linus Torvalds Date: Fri Aug 3 19:49:55 2007 -0700 Linux 2.6.23-rc2 commit 3e847423bf029c2170692c75580a856debed617b Author: Al Viro Date: Thu Aug 2 19:21:30 2007 +0100 fix s2io regression * wrong argument passed to pci_unmap_single() on failure exit paths * leak in the same area Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 247284481ca40288bd120cf0707681c3bdbee78f Author: Oleg Nesterov Date: Sat Aug 4 01:04:41 2007 +0400 Kill some obsolete sub-thread-ptrace stuff There is a couple of subtle checks which were needed to handle ptracing from the same thread group. This was deprecated a long ago, imho this code just complicates the understanding. And, the "->parent->signal->flags & SIGNAL_GROUP_EXIT" check in exit_notify() is not right. SIGNAL_GROUP_EXIT can mean exec(), not exit_group(). This means ptracer can lose a ptraced zombie on exec(). Minor problem, but still the bug. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Signed-off-by: Linus Torvalds commit b6b1d87785712474d0ed80689c17107d616a1171 Author: Daniel Ritz Date: Fri Aug 3 16:07:43 2007 +0200 serial: fix 8250 early console setup the early setup function serial8250_console_early_setup() can be called from non __init code (eg. hotpluggable serial ports like serial_cs) so remove the __init from the call chain to avoid crashes. Signed-off-by: Daniel Ritz Cc: Yinghai Lu Signed-off-by: Linus Torvalds commit 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b Author: David S. Miller Date: Fri Aug 3 14:24:17 2007 -0700 [SPARC]: Fix O_CLOEXEC values. The one choosen by asm-generic/fcntl.h is not appropriate for this platform. Noticed by Ulrich Drepper. Signed-off-by: David S. Miller commit 0a808a3131b2a6656475d82219f5e5d25edd7160 Author: David S. Miller Date: Thu Aug 2 00:19:14 2007 -0700 [SPARC32]: Fix modular build of floppy driver. Signed-off-by: David S. Miller commit 3daadf33013a1c4d7abf4a65b24644cdd8ae896a Author: Georg Chini Date: Wed Aug 1 21:55:58 2007 -0700 [SOUND] CS4231 SBus: Two fixes. Remove unnecessary sbus_dma_reset function and change sbus_dma_enable to avoid occasional system crashes when stopping recording. Signed-off-by: Georg Chini Signed-off-by: David S. Miller commit 3fc701d5d459f3b83ba874613048d36e91debca2 Author: Krzysztof Helt Date: Wed Aug 1 21:39:32 2007 -0700 [CG6]: fix memory size detection This patch fixes memory size detection on the CG6 card. The 1MB TGX card has dblbuf property set to 0. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 63213196fd4b05b9c3539cbe34775c60f1f6fad0 Author: David S. Miller Date: Tue Jul 31 20:43:17 2007 -0700 [SPARC64]: Add missing dma_sync_single_range_for_*(). Reported by Andrew Morton. Signed-off-by: David S. Miller commit bec494775600b1cd7c144d31a09e1f46df9c6324 Author: Satyam Sharma Date: Fri Aug 3 08:27:13 2007 +0530 [MTD] Makefile fix for mtdsuper We want drivers/mtd/{mtdcore, mtdsuper, mtdpart}.c to be built and linked into the same mtd.ko module. Fix the Makefile to ensure this, and remove duplicate MODULE_ declarations in mtdpart.c, as mtdcore.c already has them. Signed-off-by: Satyam Sharma Signed-off-by: David Woodhouse commit 67439b76f29cb278bb3412fc873b980fc65110c9 Author: Michael Neuling Date: Fri Aug 3 11:55:39 2007 +1000 [POWERPC] Fixes for the SLB shadow buffer code On a machine with hardware 64kB pages and a kernel configured for a 64kB base page size, we need to change the vmalloc segment from 64kB pages to 4kB pages if some driver creates a non-cacheable mapping in the vmalloc area. However, we never updated with SLB shadow buffer. This fixes it. Thanks to paulus for finding this. Also added some write barriers to ensure the shadow buffer contents are always consistent. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 5628244059976009151d41c2798855290753d8d5 Author: Segher Boessenkool Date: Thu Aug 2 01:41:14 2007 +1000 [POWERPC] Fix a compile warning in powermac/feature.c ...by using the pci_get API instead of the deprecated old stuff. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 3a77d291be53fbc619f14a6199b9b4cac036c476 Author: Segher Boessenkool Date: Thu Aug 2 01:41:13 2007 +1000 [POWERPC] Fix a compile warning in pci_32.c __must_check, so do so. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit b9c3fdb0f0fe02ba33e87ef947f23cd12e6196fe Author: Michael Ellerman Date: Wed Aug 1 11:34:38 2007 +1000 [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses Some new machines use the "ibm,dynamic-reconfiguration-memory" property to provide memory layout information, rather than via memory nodes. There is a bug in the code to parse this property for start addresses over 4GB; we store the start address in an unsigned int, which means we throw away the high bits and add apparently duplicate regions. This results in a BUG() in free_bootmem_core(). This fixes it by using an unsigned long instead. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 17aa3a82aa2173a22405f862c4444656f0494a3f Author: Kevin Corry Date: Wed Aug 1 06:19:46 2007 +1000 [POWERPC] Fix num_cpus calculation in smp_call_function_map() In smp_call_function_map(), num_cpus is set to the number of online CPUs minus one. However, if the CPU mask does not include all CPUs (except the one we're running on), the routine will hang in the first while() loop until the 8 second timeout occurs. The num_cpus should be set to the number of CPUs specified in the mask passed into the routine, after we've made any modifications to the mask. With this change, we can also get rid of the call to cpus_empty() and avoid adding another pass through the bitmask. Signed-off-by: Kevin Corry Signed-off-by: Carl Love Signed-off-by: Paul Mackerras commit cba684f56d7e8b82b08d4372375a42d6ebeab47d Author: Stephen Rothwell Date: Tue Jul 31 17:22:00 2007 +1000 [POWERPC] ps3: Fix section mismatch in ps3/setup.c WARNING: vmlinux.o(.text+0x605d4): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.prealloc' and '.ps3_power_save') Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 683e3ab2b54a7190ec8517705880171cc8ac1d92 Author: Andre Detsch Date: Tue Jul 31 09:48:11 2007 +1000 [POWERPC] spufs: Fix affinity after introduction of node_allowed() calls This patch fixes affinity reference point placement, which was not being done in some situations, after the introduction of node_allowed() calls. The previously used parameter, 'ctx', is just the iterator of the previous list_for_each_entry_reverse loop, and its value might be invalid at the end of the loop. Also, the right context to seek for information when defining the reference ctx location _is_ the reference ctx. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 430404ed9c2f202ca9d3c8072699b2b0279e4dfe Author: Paul Mackerras Date: Fri Aug 3 19:16:11 2007 +1000 [POWERPC] Fix special PTE code for secondary hash bucket The code for mapping special 4k pages on kernels using a 64kB base page size was missing the code for doing the RPN (real page number) manipulation when inserting the hardware PTE in the secondary hash bucket. It needs the same code as has already been added to the code that inserts the HPTE in the primary hash bucket. This adds it. Spotted by Ben Herrenschmidt. Signed-off-by: Paul Mackerras commit c0f7c6cb5dbb6d90e0334e62376dbc6ac3d1d315 Author: Paul Mackerras Date: Fri Aug 3 14:08:24 2007 +1000 [POWERPC] Expand RPN field to 34 bits when using 64k pages The real page number field in our PTEs when configured for 64kB pages is currently 32 bits, which turns out to be not quite enough for the resources that the eHCA driver wants to map. This expands the RPN field to include 2 adjacent, previously-unused bits. Signed-off-by: Paul Mackerras Acked-by: Benjamin Herrenschmidt commit 49ff4bb4cd4c04acf8f9e3d3ec2148305a1db445 Author: Ilpo Järvinen Date: Thu Aug 2 19:47:59 2007 -0700 [TCP]: DSACK signals data receival, be conservative In case a DSACK is received, it's better to lower cwnd as it's a sign of data receival. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 2e6052941ae1f2f875d7d9092acb8836af1e0193 Author: Ilpo Järvinen Date: Thu Aug 2 19:46:58 2007 -0700 [TCP]: Also handle snd_una changes in tcp_cwnd_down tcp_cwnd_down must check for it too as it should be conservative in case of collapse stuff and also when receiver is trying to lie (though that wouldn't be very successful/useful anyway). Note: - Separated also is_dupack and do_lost in fast_retransalert * Much cleaner look-and-feel now * This time it really fixes cumulative ACK with many new SACK blocks recovery entry (I claimed this fixes with last patch but it wasn't). TCP will now call tcp_update_scoreboard regardless of is_dupack when in recovery as long as there is enough fackets_out. - Introduce FLAG_SND_UNA_ADVANCED * Some prior_snd_una arguments are unnecessary after it - Added helper FLAG_ANY_PROGRESS to avoid long FLAG...|FLAG... constructs Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit d788d8056fd913defa48bd94f18dc53de98cd7a6 Author: Florian Westphal Date: Thu Aug 2 19:28:06 2007 -0700 [TIPC]: Fix two minor sparse warnings. fix two warnings generated by sparse: link.c:2386 symbol 'msgcount' shadows an earlier one node.c:244 symbol 'addr_string' shadows an earlier one Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit 248bbf38215fd5ce45a31c65c5e5511d9b611e5a Author: Florian Westphal Date: Thu Aug 2 19:26:23 2007 -0700 [TIPC]: Make function tipc_nameseq_subscribe static. make needlessly global function tipc_nameseq_subscribe static. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit 4a4b6271a8df417e328aed4c8a7e04e0b282207e Author: Joy Latten Date: Thu Aug 2 19:25:43 2007 -0700 [PF_KEY]: Fix ipsec not working in 2.6.23-rc1-git10 Although an ipsec SA was established, kernel couldn't seem to find it. I think since we are now using "x->sel.family" instead of "family" in the xfrm_selector_match() called in xfrm_state_find(), af_key needs to set this field too, just as xfrm_user. In af_key.c, x->sel.family only gets set when there's an ext_hdrs[SADB_EXT_ADDRESS_PROXY-1] which I think is for tunnel. I think pfkey needs to also set the x->sel.family field when it is 0. Tested with below patch, and ipsec worked when using pfkey. Signed-off-by: David S. Miller commit 3516ffb0fef710749daf288c0fe146503e0cf9d4 Author: David S. Miller Date: Thu Aug 2 19:23:56 2007 -0700 [TCP]: Invoke tcp_sendmsg() directly, do not use inet_sendmsg(). As discovered by Evegniy Polyakov, if we try to sendmsg after a connection reset, we can do incredibly stupid things. The core issue is that inet_sendmsg() tries to autobind the socket, but we should never do that for TCP. Instead we should just go straight into TCP's sendmsg() code which will do all of the necessary state and pending socket error checks. TCP's sendpage already directly vectors to tcp_sendpage(), so this merely brings sendmsg() in line with that. Signed-off-by: David S. Miller commit 1bcabbdb0bdfe8b15b05150a7857646430aaa7f8 Author: Mariusz Kozlowski Date: Wed Aug 1 21:54:27 2007 -0700 [IPV4] route.c: mostly kmalloc + memset conversion to k[cz]alloc Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit 4487b2f657a4d204c35a7afaa45fc8569c9069ca Author: Mariusz Kozlowski Date: Wed Aug 1 21:53:57 2007 -0700 [IPV4] raw.c: kmalloc + memset conversion to kzalloc Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit 8adc5465525f28be1f728b6fa600d327e1d49f55 Author: Mariusz Kozlowski Date: Wed Aug 1 21:53:24 2007 -0700 [NETFILTER] nf_conntrack_l3proto_ipv4_compat.c: kmalloc + memset conversion to kzalloc Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit 9f0d1a004d8d8c33d337d2b1cc9f0dc941cab627 Author: Mariusz Kozlowski Date: Wed Aug 1 21:52:34 2007 -0700 [NETFILTER] nf_conntrack_expect.c: kmalloc + memset conversion to kzalloc Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit 2f0812350e0e34f583919470b0517c2e368ee048 Author: Michal Piotrowski Date: Wed Aug 1 21:50:44 2007 -0700 [NET]: Removal of duplicated include net/wanrouter/wanmain.c Signed-off-by: Michal Piotrowski Signed-off-by: David S. Miller commit cc6f33db30c4fcf7915270619e81a91d6190b6c8 Author: Magnus Damm Date: Fri Aug 3 10:17:47 2007 +0900 sh: fix defconfigs for sh7751r boards This patch fixes up the defconfig for various sh7751r based boards by updating them to the single cpu subtype CONFIG_CPU_SUBTYPE_SH7751R. The following sh4 boards are updated: hs7751rvoip, landisk, lboxre2, systemh, titan. The current defconfigs with two subtypes defined trigger a configuration bug which result in kernel configurations with missing board support code. We end up with kernels without board code and with generic machvec only. So we need this patch to make sure the board code gets compiled in. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5ca95c48f1bd006d1aafe2f8bf1a859262d6d7b1 Author: Magnus Damm Date: Fri Aug 3 10:16:29 2007 +0900 sh: fix cf support on r2d boards This patch makes sure cf support is enabled on R2D-PLUS but disabled on R2D-1. Without this fix R2D-1 boards hang on bootup. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit a3b3e23015061814bffd733dbd9c4452b81ca6aa Author: Magnus Damm Date: Fri Aug 3 10:15:53 2007 +0900 sh: update r2d defconfig - Disable CONFIG_SH_DMA to avoid boot up freeze on R2D-1 - Disable CONFIG_SH_STANDARD_BIOS to support R2D-PLUS boot loaders Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 49dd3ff3a5f39d4300a4bc85e42756e286e28654 Author: David McCullough Date: Fri Aug 3 10:14:09 2007 +0900 sh: update snapgear defconfig. Updated the snapgear defconfig to get a booting kernel. Signed-off-by: David McCullough Signed-off-by: Paul Mundt commit 515495a1da9abf339b922b7919c4950e85b87b42 Author: Ben Dooks Date: Mon May 28 19:17:54 2007 +0100 [MTD] [NAND] nand_base.c: fix type of eccpos pointer The nand_base.c driver implicitly casts the uint32_t eccpos array to 'int *', which is not only not guaranteed to be the same sign as the source, but is not guaranteed to be the same size. Fix by changing nand_base.c to use uint32_t referencing the eccpos fields. Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit a4265f8d9241ba583e48380f1b9e60cfcb798449 Author: Ivan Kuten Date: Thu May 24 14:35:58 2007 +0300 [MTD] [NAND] at91_nand rdy_pin fix The patch below fixes nand driver for AT91 boards which do not have NAND R/B signal connected to gpio (rdy_pin is not connected). Signed-off-by: Ivan Kuten Acked-by: Andrew Victor Signed-off-by: David Woodhouse commit 06a7643cd3d440a1d15a6b3aa7ee431f3f4791b4 Author: Artem Bityutskiy Date: Mon Jul 23 16:06:50 2007 +0300 [MTD] [NAND] fix race in nand_base.c When we mark block bad we have to get chip because this involves writing to the page's OOB. We hit this bug in UBI - we observed random obscure crashes when it marks block bad from the background thread and there is some parallel task which utilizes flash. This patch also adds a TODO note about BBT table protection which it seems does not exist. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 9d7b4b5562b60c826c71cf2e1b7b63add42e527f Author: Roland Stigge Date: Wed Jul 18 14:56:11 2007 +0200 [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function. The patch ensures that the current code (kernel 2.6.22) uses the bits like the code prior to the refactoring. The variable "bits" is employed in a useful way now. Signed-off-by: Roland Stigge Signed-off-by: David Woodhouse commit 47af05dd4b98b57eeb682596a0df42d106e02167 Author: Florin Malita Date: Thu Jul 19 16:45:18 2007 -0400 [MTD] Fix potential leak in rfd_ftl_add_mtd This fixes a leak in the !mtd->erasesize error path (Coverity 1765). Signed-off-by: Florin Malita Signed-off-by: David Woodhouse commit b8e3ec30c232eb76c96ecab52205fe46e8b0473a Author: David Woodhouse Date: Thu Jul 5 01:57:26 2007 -0400 [JFFS2] Print correct node offset when complaining about broken data CRC Debugging the hardware problems in OLPC trac #1905 would be a whole lot easier if the correct node offsets were printed for the offending nodes. Signed-off-by: David Woodhouse commit 7b687707d769112aee220bafd50fa113363717ff Author: David Woodhouse Date: Thu Jun 28 19:49:36 2007 +0100 [JFFS2] Fix suspend failure with JFFS2 GC thread. The try_to_freeze() call was in the wrong place; we need it in the signal-pending loop now that a pending freeze also makes signal_pending() return true. Signed-off-by: David Woodhouse commit 71c23397752c0e40722d931ab9152342e9673336 Author: David Woodhouse Date: Fri Jun 29 13:39:57 2007 +0100 [JFFS2] Deletion dirents should be REF_NORMAL, not REF_PRISTINE. Otherwise they'll never actually get garbage-collected. Noted by Jonathan Larmour. Signed-off-by: David Woodhouse commit 5bd5c03c317085339deb044ba52fce131a6a0b67 Author: Joakim Tjernlund Date: Sun Jun 24 19:22:29 2007 +0200 [JFFS2] Prevent oops after 'node added in wrong place' debug check jffs2_add_physical_node_ref() should never really return error -- it's an internal debugging check which triggered. We really need to work out why and stop it happening. But in the meantime, let's make the failure mode a little less nasty. Signed-off-by: Joakim Tjernlund Signed-off-by: David Woodhouse commit ae57988f68acdc9fbee649765148f15eb7a1b991 Author: Stefan Richter Date: Thu Aug 2 20:34:17 2007 +0200 firewire: fw-core: make two variables static Signed-off-by: Stefan Richter commit 4eaff7d63052d781732de9eff4d2287c8e00348f Author: Stefan Richter Date: Wed Jul 25 19:18:08 2007 +0200 firewire: fw-ohci: dma_free_coherent needs IRQs enabled Signed-off-by: Stefan Richter commit 25659f7183376c6b37661da6141d5eaa21479061 Author: Stefan Richter Date: Sat Jul 21 22:43:05 2007 +0200 firewire: fw-sbp2: set correct maximum payload (fixes CardBus adapters) As far as I know, all CardBus FireWire 400 adapters have a maximum payload of 1024 bytes which is less than the speed-dependent limit of 2048 bytes. Fw-sbp2 has to take the host adapter's limit into account. This apparently fixes Juju's incompatibility with my CardBus cards, a NEC based card and a VIA based card. Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit e4f8cac5e07528f7e0bc21d3682c16c9de993ecb Author: Stefan Richter Date: Sat Jul 21 17:51:22 2007 +0200 ieee1394: sbp2: more correct Kconfig dependencies Make the option SBP2_PHYS_DMA available on all architectures where it compiles. This includes x86-64 where I runtime-tested it successfully. Signed-off-by: Stefan Richter commit a9c2f18800753c82c45fc13b27bdc148849bdbb2 Author: Stefan Richter Date: Wed Aug 1 20:30:36 2007 +0200 ieee1394: revert "sbp2: enforce 32bit DMA mapping" Revert commit 0555659d63c285ceb7ead3115532e1b71b0f27a7 from 2.6.22-rc1. The dma_set_mask call somehow failed on a PowerMac G5, PPC64: http://lkml.org/lkml/2007/8/1/344 Should there ever occur a DMA mapping beyond the physical DMA range, a proper SBP-2 firmware will report transport errors. So let's leave it at that. Signed-off-by: Stefan Richter Tested-by: Olaf Hering commit c3887cd7253299cac2a6dc5ea792613a5ba5bf6a Author: H. Peter Anvin Date: Thu Aug 2 13:50:43 2007 -0400 [x86 setup] Document grub < 0.93 as broken Grub older than 0.93 are broken when the kernel setup is bigger than 8K. This was fixed in 2002, and 0.93 was the first grub version which fixed this bug. Signed-off-by: H. Peter Anvin commit 463c9a9f7d1f746c251761cef3af5c808394b7e1 Author: H. Peter Anvin Date: Thu Aug 2 13:45:49 2007 -0400 [x86 setup] EDD: add missing =m constraint Add a missing =m constraint to the EDD-probing code, that could have caused improper dead-code elimination. Signed-off-by: H. Peter Anvin commit e6e0871cce2ae04f5790543ad2f4ec36b23260ba Author: Paul Moore Date: Wed Aug 1 11:12:59 2007 -0400 Net/Security: fix memory leaks from security_secid_to_secctx() The security_secid_to_secctx() function returns memory that must be freed by a call to security_release_secctx() which was not always happening. This patch fixes two of these problems (all that I could find in the kernel source at present). Signed-off-by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit 088999e98b8caecd31adc3b62223a228555c5ab7 Author: Paul Moore Date: Wed Aug 1 11:12:58 2007 -0400 SELinux: remove redundant pointer checks before calling kfree() We don't need to check for NULL pointers before calling kfree(). Signed-off-by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit 9534f71ca33e5a9de26dfd43c76af86e005005dd Author: Paul Moore Date: Mon Jul 30 16:33:26 2007 -0400 SELinux: restore proper NetLabel caching behavior A small fix to the SELinux/NetLabel glue code to ensure that the NetLabel cache is utilized when possible. This was broken when the SELinux/NetLabel glue code was reorganized in the last kernel release. Signed-off-by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit 94c18227d1e3f02de5b345bd3cd5c960214dc9c8 Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: reduce task_struct size more task_struct size reduction, by moving the debugging/instrumentation fields to under CONFIG_SCHEDSTATS: (i386, nodebug): size ---- pre-CFS 1328 CFS 1472 CFS+patch 1376 Signed-off-by: Ingo Molnar commit 6cfb0d5d06bea2b8791f32145eae539d524e5f6c Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: reduce debug code move the rest of the debugging/instrumentation code to under CONFIG_SCHEDSTATS too. This reduces code size and speeds code up: text data bss dec hex filename 33044 4122 28 37194 914a sched.o.before 32708 4122 28 36858 8ffa sched.o.after Signed-off-by: Ingo Molnar commit 8179ca23d513717cc5e3dc81a1ffe01af0955468 Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: use schedstat_set() API make use of the new schedstat_set() API to eliminate two #ifdef sections. No functional changes: text data bss dec hex filename 29009 4122 28 33159 8187 sched.o.before 29009 4122 28 33159 8187 sched.o.after Signed-off-by: Ingo Molnar commit c3c7011969274768818842b0a08ec45d88f45b4f Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: add schedstat_set() API add the schedstat_set() API, to allow the reduction of CONFIG_SCHEDSTAT related #ifdefs. No code changed. Signed-off-by: Ingo Molnar commit 9c2172459a47c99adf9c968180a8a57d9ff84efa Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: move load-calculation functions move load-calculation functions so that they can use the per-policy declarations and methods. Signed-off-by: Ingo Molnar commit cad60d93e18ba52b6f069b2edb031c89bf603b07 Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: ->task_new cleanup make sched_class.task_new == NULL a 'default method', this allows the removal of task_rt_new. Signed-off-by: Ingo Molnar commit 4e6f96f313561d86d248edf0eaff2336d8217e1b Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: uninline inc/dec_nr_running() uninline inc_nr_running() and dec_nr_running(): text data bss dec hex filename 29039 4162 24 33225 81c9 sched.o.before 29027 4162 24 33213 81bd sched.o.after Signed-off-by: Ingo Molnar commit cb1c4fc924d7eeb3fb723ad72705d4a70e9781fd Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: uninline calc_delta_mine() uninline calc_delta_mine(): text data bss dec hex filename 29162 4162 24 33348 8244 sched.o.before 29039 4162 24 33225 81c9 sched.o.after Signed-off-by: Ingo Molnar commit ecf691daf7afb418537ba459290191a0a5853be5 Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: calc_delta_mine(): use fixed limit use fixed limit in calc_delta_mine() - this saves an instruction :) Signed-off-by: Ingo Molnar commit 5a4f3ea77e1b0c72a3ec136c881eb0d64aa1d25e Author: Peter Williams Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: tidy up left over smpnice code 1. The only place that RTPRIO_TO_LOAD_WEIGHT() is used is in the call to move_tasks() in the function active_load_balance() and its purpose here is just to make sure that the load to be moved is big enough to ensure that exactly one task is moved (if there's one available). This can be accomplished by using ULONG_MAX instead and this allows RTPRIO_TO_LOAD_WEIGHT() to be deleted. 2. This, in turn, allows PRIO_TO_LOAD_WEIGHT() to be deleted. 3. This allows load_weight() to be deleted which allows TIME_SLICE_NICE_ZERO to be deleted along with the comment above it. Signed-off-by: Peter Williams Signed-off-by: Ingo Molnar commit 362a7016637648c6aefc98b706298baedfaa1543 Author: Ingo Molnar Date: Thu Aug 2 17:41:40 2007 +0200 [PATCH] sched: remove cache_hot_time remove the last unused remains of cache_hot_time. Signed-off-by: Ingo Molnar commit 59acc08fd95aefb5430458a08a82b15a4174ed74 Author: Antonino A. Daplas Date: Thu Aug 2 18:16:46 2007 +0800 [x86 setup] video setup: Fix VBE DDC reading Add memory operand constraint and write-only modifier to the inline assembly to effect the writing of the EDID block to boot_params.edid_info. Without this, gcc would think the EDID query was dead code and would eliminate it. Signed-off-by: Antonino Daplas Signed-off-by: H. Peter Anvin commit 5f8f1c3c87e44f1bd0180cf19d0e7c83d062b4dc Author: Wei Yongjun Date: Thu Aug 2 17:02:29 2007 +0800 SCTP: remove useless code in function sctp_init_cause Some code in function sctp_init_cause() seem useless, this patch remove them. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit aecedeab6fcf914929cd8ff6fa0b8ae9bfdf3d30 Author: Wei Yongjun Date: Thu Aug 2 16:57:44 2007 +0800 SCTP: drop SACK if ctsn is not less than the next tsn of assoc We need to drop the SACK if the peer is attempting to acknowledge unset data, i.e. the CTSN in the SACK is greater or equal to the next TSN we will send. Example: Endpoint A Endpoint B <--------------- DATA (TSN=1) SACK(TSN=1) ---------------> <--------------- DATA (TSN=2) <--------------- DATA (TSN=3) <--------------- DATA (TSN=4) <--------------- DATA (TSN=5) SACK(TSN=1000) ---------------> <--------------- DATA (TSN=6) <--------------- DATA (TSN=7) Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit 22f675f320f721e9eaa2bbf7b883316b408c6c8f Author: Jiri Kosina Date: Wed Aug 1 12:32:27 2007 +0200 HID: Never call hid_free_buffers() when usbhid_device has been freed We can't call hid_free_buffers() when the underlying usbhid_device has already been freed. Signed-off-by: Jiri Kosina commit cda5ecf80bad94b4113722f037af818e7453dd2d Author: Jiri Kosina Date: Mon Jul 30 15:40:06 2007 +0200 USB HID: fix memory leak of usbhid_device Add forgotten freeing of usbhid_device structure. Signed-off-by: Jiri Kosina commit de1a7b03282310d143cb0add74e909daffedda01 Author: Jesper Juhl Date: Mon Jul 30 15:15:26 2007 +0200 USB HID: fix a possible NULL pointer dereference when we fail to allocate memory If, in usb_hid_configure(), we fail to allocate storage for 'usbhid', "if (!(usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL)))", then we'll jump to the 'fail:' label where we have this code: usb_free_urb(usbhid->urbin); usb_free_urb(usbhid->urbout); usb_free_urb(usbhid->urbctrl); Since we got here because we couldn't allocate storage for 'usbhid', what we have here is a NULL pointer dereference - ouch... This patch solves that little problem by adding a new 'fail_no_usbhid:' label after the problematic calls to usb_free_urb() and jumps to that one instead, in the problem case. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 04a9b7ffceff4337d9e63476b5c71e9b79249969 Author: Christian Lamparter Date: Mon Jul 30 14:38:26 2007 +0200 USB HID: add ASUS LCM to the blacklist Some of ASUS' notebooks (e.g G Series) include a tiny oled display, which is attached to an internal USB bus. Unfortunatly the device reports a wrong DeviceDescriptor and is therefore identified as a HID device... Signed-off-by: Christian Lamparter Signed-off-by: Jiri Kosina commit 9fdcfed8ebc4f5273179f8ff00ab83a6403016de Author: Phil Dibowitz Date: Mon Jul 30 12:00:48 2007 +0200 USB HID: Add all Logitech Harmonies to blacklist This patch adds the entire range of Logitech's ProductIDs that are reserved for their Harmony remotes. The in-kernel HID driver can't do anything with these, and now there is a GPL user-space application that can handle them: http://www.sf.net/projects/harmonycontrol Signed-off-by: Phil Dibowitz Signed-off-by: Jiri Kosina commit 2dea64b4aace953924848ac9ab05217da20a7932 Author: Jiri Kosina Date: Wed Jul 11 12:12:11 2007 +0200 USB HID: update description of USBHID in MAINTAINERS Make it more clear to users what kinds of hardware USBHID handles, so that they can send reports and queries properly. Signed-off-by: Jiri Kosina commit 3e1928e8793208802589aae851b6685671187242 Author: Tino Keitel Date: Thu Jul 12 00:11:34 2007 +0200 HID: remove the Applie IR sensor from the hid_blacklist The IR sensor in some newer Apple computers has no other driver in the kernel, yet. However, the macmini driver in lirc requires a HID device for the IR sensor. Cc: Soeren Sonnenburg Signed-off-by: Tino Keitel Signed-off-by: Jiri Kosina commit 04668873daa822aa6c806ba28d1143db8dcb26e8 Author: David Howells Date: Wed Aug 1 19:04:51 2007 +0100 FRV: Enable the MB86943 PCI arbiter correctly Enable the MB93090 motherboard's MB86943 PCI arbiter correctly by assigning to the register rather than comparing against it. This is required to support bus mastering. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 0fc4969b866671dfe39b1a9119d0fdc7ea0f63e5 Author: Thomas Gleixner Date: Wed Aug 1 17:13:19 2007 +0200 genirq: temporary fix for level-triggered IRQ resend Marcin Slusarz reported a ne2k-pci "hung network interface" regression. delayed disable relies on the ability to re-trigger the interrupt in the case that a real interrupt happens after the software disable was set. In this case we actually disable the interrupt on the hardware level _after_ it occurred. On enable_irq, we need to re-trigger the interrupt. On i386 this relies on a hardware resend mechanism (send_IPI_self()). Actually we only need the resend for edge type interrupts. Level type interrupts come back once enable_irq() re-enables the interrupt line. I assume that the interrupt in question is level triggered because it is shared and above the legacy irqs 0-15: 17: 12 IO-APIC-fasteoi eth1, eth0 Looking into the IO_APIC code, the resend via send_IPI_self() happens unconditionally. So the resend is done for level and edge interrupts. This makes the problem more mysterious. The code in question lib8390.c does disable_irq(); fiddle_with_the_network_card_hardware() enable_irq(); The fiddle_with_the_network_card_hardware() might cause interrupts, which are cleared in the same code path again, Marcin found that when he disables the irq line on the hardware level (removing the delayed disable) the card is kept alive. So the difference is that we can get a resend on enable_irq, when an interrupt happens during the time, where we are in the disabled region. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit fd0cbdd378258fdf44eac5ea091256a4a665315b Author: Heiko Carstens Date: Thu Aug 2 00:18:38 2007 +0200 Fix WARN_ON() on bitfield ops for all other archs Fixes WARN_ON() on bitfiels ops for all architectures that have been left out in 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f. Cc: Alexey Dobriyan Cc: Herbert Xu Cc: Haavard Skinnemoen Cc: Matthew Wilcox Cc: Kyle McMartin Cc: Martin Schwidefsky Acked-by: Paul Mundt Signed-off-by: Heiko Carstens Signed-off-by: Linus Torvalds commit 3fcece66911c9d485c1e2050ba033fde607b5130 Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:46 2007 +0200 scc_pata: PIO fixes * Use pio == 255 == "auto-tune" in scc_config_drive_for_dma() instead of forcing PIO4 on PIO fallback. Fix comment while at it. * Rename scc_tuneproc() to scc_tune_pio() and add scc_tuneproc() wrapper. Move finding of the best PIO mode and setting of transfer mode on the device to the new wrapper. * Fix scc_tune_chipset() to tune PIO modes. Do a small cleanup while at it. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0c8de52d76e4bec6e9168b47be29f11b3bb92768 Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:46 2007 +0200 piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2) * Don't call {piix,slc90e66}_dma_2_pio() for PIO modes in {piix,slc90e66}_tune_chipset(). * Add PIO1 handling to {piix,slc90e66}_tune_chipset(). * Bump driver version. v2: * Remove PIO modes from {piix,slc90e66}_dma_2_pio(), they are no longer needed there (Noticed by Sergei) Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8b6b33be3280fd776335079124ecd176e6a40797 Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:46 2007 +0200 jmicron: PIO fixes * Set transfer mode on the device in jmicron_tuneproc(), also add pio == 255 == "auto-tune" handling. * Use jmicron_tuneproc() in jmicron_config_drive_for_dma(). * Remove no longer needed config_jmicron_chipset_for_pio(). Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 68aaf8150308dbf9d0e5ccd5bc05491ba575f966 Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:46 2007 +0200 it8213: PIO fixes (take 2) * Rename it8213_tuneproc() to it8213_tune_pio() and add it8213_tuneproc() wrapper. Move finding of the best PIO mode to the new wrapper. * Add setting of transfer mode on the device to it8213_tuneproc(). * Don't call it8213_dma_2_pio() for PIO modes in it8213_tune_chipset(). * Use it8213_tuneproc() in it8213_config_drive_for_dma(). v2: * Remove PIO modes from it8213_dma_2_pio(), they are no longer needed there (Noticed by Sergei) Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit bc0b0b5c4bab02790937c9070a7701ee70feaac9 Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:45 2007 +0200 cs5535: PIO fixes * Fix cs5535_tuneproc() to pass PIO transfer mode value instead of PIO mode number to cs5535_set_speed() (fixes random PIO timings being programmed and a possible OOPS). Do a little cleanup while at it. * Fix cs5535_set_speed() to check if the mate device is present (fixes PIO0 taskfile timings being used if there is no other device on the cable). * Use cs5535_tuneproc() in cs5535_dma_check(). The old code had the same issue as cs5535_tuneproc() and add additionally caused 0x00-0x04 transfer mode values (== default PIO, default PIO w/ IORDY + two invalid values) being set on the device instead of values 0x08-0x0c (XFER_PIO_[0,4]). Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 070224339b52f0e4f8e6c991a5ad9630a7a9e6da Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:45 2007 +0200 cs5520: fix PIO auto-tuning in ->ide_dma_check method Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 41ead3c918f48710ca1e03eb7b770eabcbbd260b Author: Mariusz Kozlowski Date: Wed Aug 1 23:46:45 2007 +0200 drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc drivers/scsi/ide-scsi.c | 34642 -> 34536 (-106 bytes) drivers/scsi/ide-scsi.o | 171728 -> 171524 (-204 bytes) Signed-off-by: Mariusz Kozlowski Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit cc60d8baa35c995bf8c40a9730b894993ddb43b9 Author: Mariusz Kozlowski Date: Wed Aug 1 23:46:44 2007 +0200 drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc Is this a bug? In original verison memset cleared sizeof(state) bytes instead of sizeof(*state). If it was intentional then this patch is invalid. If not intentional -> valid :) Please review. Bart: Yes, it is a bug so this patch is a valid bugfix. :-) drivers/ide/arm/icside.c | 18883 -> 18849 (-34 bytes) Signed-off-by: Mariusz Kozlowski Cc: Andrew Morton Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit ab0579685d34eb2c6b101534796ba64c8b9107b5 Author: Stephen Rothwell Date: Wed Aug 1 23:46:44 2007 +0200 ide: eliminate warnings in ide-tape.c drivers/ide/ide-tape.c: In function '__idetape_kmalloc_stage': drivers/ide/ide-tape.c:2588: warning: large integer implicitly truncated to unsigned type drivers/ide/ide-tape.c:2616: warning: large integer implicitly truncated to unsigned type b_size in struct idetape_bh is an unsigned short. We sometimes assigne PAGE_SIZE to it and PAGE_SIZE can be 64K or larger, so make it a u32. Signed-off-by: Stephen Rothwell Signed-off-by: Bartlomiej Zolnierkiewicz commit b37c6b842b30fc8e90965ec242f624283d0032a3 Author: Meelis Roos Date: Wed Aug 1 23:46:44 2007 +0200 ide: fix runtogether printk's in cmd64x IDE driver Fix a couple of runtogether printks in cmd64x.c IDE driver by adding proper newlines. Signed-off-by: Meelis Roos Signed-off-by: Bartlomiej Zolnierkiewicz commit 1955f6814fb58ffa06af4873a445307d60b23fb1 Author: David Lamparter Date: Wed Aug 1 23:46:44 2007 +0200 sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops Recognise the FSC Amilo A1630's incarnation of a SiS5513 chip as laptop to get UDMA100 support. Signed-off-by: David Lamparter Cc: Lionel Bouton Signed-off-by: Bartlomiej Zolnierkiewicz commit 8663fd6d0de7144c9e8455b733aeb38fe80788ed Author: Bartlomiej Zolnierkiewicz Date: Wed Aug 1 23:46:43 2007 +0200 alim15x3: Correct HP detect Direct port of Alan's fix for pata_ali. Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 32a70a817acbb96fcfcc7543932222467c771207 Author: Jordan Crouse Date: Wed Aug 1 23:46:42 2007 +0200 ide: Fix an overrun found in the CS5535 IDE driver As found by the Coverity checker, and reported by Adrian Bunk, this fixes a overrun error in the CS5535 IDE driver. Somebody got a little excited with the if() statement - the CS5535 only supports UDMA 0-4. Bart: Not a bug per se since the upper layer will never feed this function with speed > XFER_UDMA_4 (thanks to ->ultra_mask being set to 0x1f). Worth fixing anyway. Signed-off-by: Jordan Crouse Cc: Adrian Bunk Signed-off-by: Bartlomiej Zolnierkiewicz commit b718f91c14604e4ab5cdfe8d3baff8111425ea7d Author: Christoph Lameter Date: Wed Aug 1 13:49:45 2007 -0700 [IA64] ITC: Reduce rating for ITC clock if ITCs are drifty Make sure to reduce the rating of the ITC clock if ITCs are drifty. If they are drifting then we have not synchronized the ITC values, nor are we doing the jitter compensation (useless since drift may increase the differentials arbitrarily). Without this patch it is possible that the ITC clock becomes selected as the system clock on systems with drifty ITCs which will result in nanosleep hanging. One can still select the itc clock manually on such systems via clocksource=itc (Produces nice hangs on SGI Altix.) Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit 40d485753423b87239cc16b6c8141ef8792324d9 Author: Christoph Lameter Date: Wed Aug 1 12:37:17 2007 -0700 [IA64] SN2: Fix up sn2_rtc clock If the sn2_rtc clock is present then it is a must have since sn2_rtc provides a synchronized time source on Altix systems. So elevate the priority to 450. Otherwise the ITC would take precendence. Altix systems currently do not boot because the ITC clocksource is broken. It seems to assume that ITCs are synchronized and as a result nanosleep hangs (may be fixed in a different patch). While we are at it: Remove the sn2_mc definition. The sn2_rtc has a fixed address. No point in reading the address from memory. Removing it avoids touching one cacheline. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit 224685c0d1ca5970364c9f5d4f21ea1aa64c381e Author: Kenji Kaneshige Date: Wed Aug 1 21:18:44 2007 +0900 [IA64] Fix wrong access to irq_desc[] in iosapic_register_intr(). In error path we must unlock irq_desc[irq].lock before we change 'irq'. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit e4d1feab5df035312494ce3037ac5f041d0f5fc9 Author: Vlad Yasevich Date: Wed Aug 1 10:56:43 2007 -0400 SCTP: IPv4 mapped addr not returned in SCTPv6 accept() When issuing a connect call on an AF_INET6 sctp socket with a IPv4-mapped destination, the peer address that is returned by getpeeraddr() should be v4-mapped as well. Signed-off-by: Vlad Yasevich commit b225b884a18a1932db5414abd3ef94a45e4e348e Author: Dave Johnson Date: Wed Jul 25 19:49:29 2007 -0400 SCTP: IPv4 mapped addr not returned in SCTPv6 accept() An accept() call on a SCTPv6 socket that returns due to connection of a IPv4 mapped peer will fill out the 'struct sockaddr' with a zero IPv6 address instead of the IPv4 mapped address of the peer. This is due to the v4mapped flag not getting copied into the new socket on accept() as well as a missing check for INET6 socket type in sctp_v4_to_sk_*addr(). Signed-off-by: Dave Johnson Cc: Srinivas Akkipeddi Signed-off-by: Vlad Yasevich commit cc121fa87a0ce356c23fb4d7358310e747cad8cc Author: Sebastian Siewior Date: Fri Jul 27 22:59:49 2007 +0200 sctp: fix shadow symbol in net/sctp/tsnmap.c net/sctp/tsnmap.c:164:16: warning: symbol '_end' shadows an earlier one include/asm-generic/sections.h:13:13: originally declared here Renamed renamed _end to end_ and _start (for consistence). Signed-off-by: Sebastian Siewior Signed-off-by: Vlad Yasevich commit d6f9fdaf643eca8fb49fffdd6269b78f4ef1ef86 Author: Sebastian Siewior Date: Fri Jul 27 22:55:59 2007 +0200 sctp: try to fix readlock unlock the reader lock in error case. Signed-off-by: Sebastian Siewior Signed-off-by: Vlad Yasevich commit c86dabcf00f3ca167df59f3526a53b3da3ede2c8 Author: sebastian@breakpoint.cc Date: Thu Jul 26 23:21:33 2007 +0200 sctp: remove shadowed symbols Fixes the following sparse warnings: net/sctp/sm_make_chunk.c:1457:9: warning: symbol 'len' shadows an earlier one net/sctp/sm_make_chunk.c:1356:23: originally declared here net/sctp/socket.c:1534:22: warning: symbol 'chunk' shadows an earlier one net/sctp/socket.c:1387:20: originally declared here Signed-off-by: Sebastian Siewior Signed-off-by: Vlad Yasevich commit 0a5fcb9cf8e5c3fabaab1c20668f58fe85d7c70d Author: sebastian@breakpoint.cc Date: Thu Jul 26 23:21:32 2007 +0200 sctp: move global declaration to header file. sctp_chunk_cachep & sctp_bucket_cachep is used module global, so move it to a header file. Signed-off-by: Sebastian Siewior Signed-off-by: Vlad Yasevich commit 046752104c7090e3679b09274f02d8fd2aa0b4b2 Author: sebastian@breakpoint.cc Date: Thu Jul 26 23:21:31 2007 +0200 sctp: make locally used function static Forward declarion is static, the function itself is not. Make it consistent. Signed-off-by: Sebastian Siewior Signed-off-by: Vlad Yasevich commit 4761c06cb39011c9cc3fef9e6bbfb4c50ceb307d Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 31 22:02:41 2007 +0200 pata_sis: fix MWDMA for <= UDMA66 chipsets and UDMA for UDMA33 chipsets * Fix MWDMA timings setup in sis_old_set_dmamode() and sis_66_set_dmamode(). The old timings were overclocked (even worse behavior than sis5513 IDE driver which depends on BIOS to program correct timings), the new timings are taken from the datasheet (they match timings from ATA spec). * Fix UDMA timings setup in sis_old_set_dmamode(). Misplaced pci_write_config_word() call resulted in UDMA timings never being set. * Fix comments for sis_133_early_set_dmamode() and sis_133_set_dmamode(): - only the former function handles early SiS 961 bridges - both functions lack MWDMA timings setup * Fix typos in sis_100_set_piomode() and sis_133_set_piomode() comments. * Bump driver version. Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 5d6aca8defe77dfd0f0169cc015b900129078648 Author: Tejun Heo Date: Sat Jul 28 16:25:25 2007 +0900 libata: blacklist SAMSUNG HD401LJ / ZZ100-15 for NCQ SAMSUNG HD401LJ / ZZ100-15 does spurious completion of NCQ commands. Disable NCQ. Reported by Ulrich in bugzilla #8805. Signed-off-by: Tejun Heo Cc: Ulrich Signed-off-by: Jeff Garzik commit 7abe79c353caf868053c2ddcada7f4c20c8251e6 Author: Tejun Heo Date: Fri Jul 27 14:55:07 2007 +0900 ata_piix: add Tecra M3 to broken suspend blacklist Add Tecra M3 to the broken suspend blacklist. Tecra M3 doesn't have proper DMI_PRODUCT_NAME but has an OEM_STRING instead. Match it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8c3832ebeb049c5744ece888daae253c683257c3 Author: Tejun Heo Date: Fri Jul 27 14:53:28 2007 +0900 ata_piix: implement piix_borken_suspend() Separate out broken suspend blacklist matching into piix_broken_suspend(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0b62e13b5c9b4871641973e024cc9dd440b5bb58 Author: Tejun Heo Date: Fri Jul 27 14:43:35 2007 +0900 pci: rename __pci_reenable_device() to pci_reenable_device() Rename __pci_reenable_device() to pci_reenable_device(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8 Author: Alan Cox Date: Thu Jul 26 18:41:30 2007 +0100 libata-sff; Unbreak non DMA capable controllers again Seems nobody else is checking/testing this case as it keeps getting horked. If we have no BAR4 mapping on an SFF controller this is *NOT* an error, it just means it isn't doing BMDMA. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit dbf0c89c80e47a2a132048dcded0dcc2a59c74ad Author: Alan Cox Date: Thu Jul 26 18:43:01 2007 +0100 pata_cmd64x: Correct the speed ranges I must have been half asleep when doing the original code Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit e0a3647fd7729bee1ed9667ce5d8eb88f0604138 Author: Paul Mundt Date: Wed Aug 1 16:55:07 2007 +0900 sh: Fix SH-X3 FPU exception handling. SH-X3 has the FPU exceptions on different vectors completely, patch in do_fpu_state_restore() to the proper vectors. Results in a much happier userspace. Signed-off-by: Paul Mundt commit 06f862c8ce0893b5525ce90f39168eaf4608ecc6 Author: Paul Mundt Date: Wed Aug 1 16:39:51 2007 +0900 sh: Fix pgd mismatch from cached TTB in unhandled fault. When reading the cached TTB value and extracting the pgd, we accidentally applied a __va() to it and bumped it off in to bogus space which ended up causing multiple faults in the error path. Fix it up so unhandled faults don't do strange and highly unorthodox things when oopsing. Signed-off-by: Paul Mundt commit 56c74c733cdd101832c4bbf9af8a009a9eaec784 Author: Paul Mundt Date: Wed Aug 1 16:26:21 2007 +0900 sh: Don't include fault-nommu on SH-2/SH-2A. fault-nommu defines the page fault handler stubs for SH-3/4 parts, but is not needed on SH-2/SH-2A now that the entry code has been logically separated. Add it in for SH-3 and SH-4 explicitly. Signed-off-by: Paul Mundt commit c71799433aa4d6378502f781a155321e77da73aa Author: Paul Mundt Date: Wed Aug 1 16:19:49 2007 +0900 sh: Fix irqflags tracing for SH-3/4 nommu. We were missing the trace_hardirqs_on() instrumentation in the nommu case, resync with the MMU version of the page fault handler to have this behaving consistently. Also explicitly re-enable IRQs now that the assembly code isn't doing it for us any more. Signed-off-by: Paul Mundt commit c347d12cd1642ba193f55bdab29395d639c5efc2 Author: Paul Mundt Date: Wed Aug 1 16:17:07 2007 +0900 sh: Fix lockdep debugging oops on SH-3/4. In the SH-3/4 TLB access violation path we were enabling IRQs before the call in to trace_hardirqs_on(), which ended up triggering: if (DEBUG_LOCKS_WARN_ON(!irqs_disabled())) return; in kernel/lockdep.c:2031. Fix this up by removing the early re-enable, we were already re-enabling IRQs post-trace_hardirqs_on() already, so the semantics are now as was initially intended. Signed-off-by: Paul Mundt commit 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f Author: Linus Torvalds Date: Tue Jul 31 21:12:07 2007 -0700 Fix WARN_ON() on bitfield ops Alexey Dobriyan noticed that the new WARN_ON() semantics that were introduced by commit 684f978347deb42d180373ac4c427f82ef963171 (to also return the value to be warned on) didn't compile when given a bitfield, because the typeof doesn't work for bitfields. So instead of the typeof trick, use an "int" variable together with a "!!(x)" expression, as suggested by Al Viro. To make matters more interesting, Paul Mackerras points out that that is sub-optimal on Power, but the old asm-coded comparison seems to be buggy anyway on 32-bit Power if the conditional was 64-bit, so I think there are more problems there. Regardless, the new WARN_ON() semantics may have been a bad idea. But this at least avoids the more serious complications. Cc: Alexey Dobriyan Cc: Herbert Xu Cc: Paul Mackerras Cc: Al Viro Cc: Ingo Molnar Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 128a2bcf9dddeb8e79a4ba55bf191533f70f39ce Author: Len Brown Date: Tue Jul 31 23:27:10 2007 -0400 ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again) CONFIG_ACPI_PROCFS_SLEEP is a NO-OP -- delete it (again). Apparently 296699de6bdc717189a331ab6bbe90e05c94db06 creating CONFIG_SUSPEND and CONFIG_PM_SLEEP was based on an out-dated version of drivers/acpi/Kconfig, as it erroneously restored this recently deleted config option. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit fc34f6c617bf2a845d793af12b96bcc0afd472c4 Author: Andrew Morton Date: Tue Jul 31 16:10:46 2007 -0700 Fix up "remove the arm26 port" scripts/kconfig/conf -o arch/arm/Kconfig arch/arm/Kconfig:994: can't open file "drivers/acorn/block/Kconfig" Cc: Adrian Bunk Cc: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0439208a8a399f0c4307c561d97e3f5523f5d085 Author: Mark Zhan Date: Tue Jul 31 00:39:47 2007 -0700 rtc-m48t59 driver NO_IRQ mode fixup Since irq in m48t59_private struct is defined as 'unsigned int', which will make the following if sentence to be never true: if (m48t59->irq < 0) m48t59->irq = NO_IRQ; And thus it will make the m48t59_rtc_probe() is failed when the driver is working in a no irq mode: Signed-off-by: Mark Zhan Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb35fb20b591833fe4205def1338e0e808be3216 Author: Jan Engelhardt Date: Tue Jul 31 00:39:46 2007 -0700 Use menuconfig objects: RTC Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 732781daa4fcb31f96028bf26a219e53d256ddd2 Author: Charlie Shepherd Date: Tue Jul 31 00:39:45 2007 -0700 Remove 'isdn_* is defined but unused' warnings Move the #ifdef guard above these functions to remove the warnings. Signed-off-by: Charlie Shepherd Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 082c8cb4e5e68c0fd29cc10c59db94d2284fd2b0 Author: David Brownell Date: Tue Jul 31 00:39:45 2007 -0700 spi device setup gets better error checking This updates some error reporting paths in SPI device setup: - Move validation logic for SPI chipselects to spi_new_device(), which is where it should always have been. - In spi_new_device(), emit error messages if the device can't be created. This is LOTS better than a silent failure; though eventually, the calling convention should probably change to use the conventions. - Includes one previously-missing check: SPI masters must always have at least one chipselect, even for dedicated busses which always keep it selected! It also adds a FIXME (IDR for dynamic ID allocation) so the issue doesn't live purely in my mailbox. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2604288f45605d1b2844f001dc3141149667b3d1 Author: David Brownell Date: Tue Jul 31 00:39:44 2007 -0700 spi kerneldoc update This adds kerneldoc to the SPI framework. The "spi_driver" and "spi_board_info" structs were previously not described. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db7526f925b79293dc3b361a70db7f340870a298 Author: Meelis Roos Date: Tue Jul 31 00:39:41 2007 -0700 fix integer overflow warning in i2o_block drivers/message/i2o/i2o_block.c: In function 'i2o_block_transfer': drivers/message/i2o/i2o_block.c:837: warning: integer overflow in expression msg->u.head[1] = cpu_to_le32(I2O_CMD_PRIVATE << 24 | HOST_TID << 12 | tid); and I2O_CMD_PRIVATE is defined as 0xFF. This gets "0xFF0100 | tid" and fits into 32-bit unsigned but not into 32-bit signed integer properly. Target value is defined as u32 so the claculation does not fit during computation. Change local variable tid to u32 so the whole expression is of u32 type and fits well into u32 result. Signed-off-by: Meelis Roos Cc: "Salyzyn, Mark" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad4a5bb885f1985732426f108d2fe36517dd1939 Author: Andrew Morton Date: Tue Jul 31 00:39:41 2007 -0700 ip2main warning fix CONFIG_PCI=n: drivers/char/ip2/ip2main.c: In function `ip2_loadmain': drivers/char/ip2/ip2main.c:503: warning: unused variable `status' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca76d2d8031fd8216eedadee77dfe009a63e4408 Author: Cyrill Gorcunov Date: Tue Jul 31 00:39:40 2007 -0700 UDF: fix UID and GID mount option ignorance This patch fix weird behaviour of UDF mounting procedure. To get UID changed (for now) we have to type mount -t udf -o uid=some_user,uid=ignore /dev/device /mnt/moun_point and specifying two uid at once is strange a bit. So with the patch we are able to mount without additional 'uid=ignore' option. The same for GID option is done. This patch will not break current mount scheme (with two option). Btw this does fix (I hope) the following [BUG 6124] mount of UDF fs ignores UID and GID options http://bugzilla.kernel.org/show_bug.cgi?id=6124 Signed-off-by: Cyrill Gorcunov Cc: Jan Kara Cc: Michael Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2912a1223c0917a7b4e054f18086209137891ea Author: Jesper Juhl Date: Tue Jul 31 00:39:39 2007 -0700 cciss: fix memory leak There's a memory leak in the cciss driver. in alloc_cciss_hba() we may leak sizeof(ctlr_info_t) bytes if a call to alloc_disk(1 << NWD_SHIFT) fails. This patch should fix the issue. Spotted by the Coverity checker. Signed-off-by: Jesper Juhl Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff0cfc66cd99d59e3a8024003171035e4ae192b7 Author: Al Boldi Date: Tue Jul 31 00:39:23 2007 -0700 Kconfig: remove top level menu "Code maturity level options" Remove the top level menu "Code maturity level options", and moves its options into menu "General setup". This makes Kconfig less cluttered and easier to setup. Signed-off-by: Al Boldi Acked-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e48591700f7df5969e17b0a41b7dde011c6810c Author: Matthias Kaehlcke Date: Tue Jul 31 00:39:23 2007 -0700 Videopix Frame Grabber: Fix unreleased lock in vfc_debug() Videopix Frame Grabber: vfc_debug() doesn't release the device lock when copy_from_user() fails Signed-off-by: Matthias Kaehlcke Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0af1a4504699524c876361845bc2e301ecc45d0f Author: Christoph Hellwig Date: Tue Jul 31 00:39:22 2007 -0700 rename setlease to generic_setlease Make it a little more clear that this is the default implementation for the setleast operation. Signed-off-by: Christoph Hellwig Cc: Steven Whitehouse Acked-by: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86d0004abc87025bae1cca43c94e99a27b7bbbd6 Author: Maciej W. Rozycki Date: Tue Jul 31 00:39:22 2007 -0700 sb1250-duart: __maybe_unused, etc. fixes This is a set of small fixes addressing points raised with the original driver submission. In particular, __maybe_unused is used rather than a local hack and sbd_ops is made const. Additionally I have made two local string variables automatic as rodata space was wasted for pointers unnecessarily. Signed-off-by: Maciej W. Rozycki Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd22a68228cf1c8dad39d6f9da925bd534aea91d Author: Josh Triplett Date: Tue Jul 31 00:39:21 2007 -0700 x86_64: include asm/bugs.h in bugs.c for check_bugs prototype C files should include the header files that prototype their functions. Eliminates a sparse warning: warning: symbol 'check_bugs' was not declared. Should it be static? Signed-off-by: Josh Triplett Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91eb1b79ecf42bad91ff084ba3d020ec833b3477 Author: Josh Triplett Date: Tue Jul 31 00:39:20 2007 -0700 i386: include asm/bugs.h in bugs.c for check_bugs prototype C files should include the header files that prototype their functions. Eliminates a sparse warning: warning: symbol 'check_bugs' was not declared. Should it be static? Signed-off-by: Josh Triplett Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d133a9609ee6111c9718a4bbe559b84a399603e6 Author: Gabriel Craciunescu Date: Tue Jul 31 00:39:19 2007 -0700 Typo fixes errror -> error Typo fixes errror -> error Signed-off-by: Gabriel Craciunescu Cc: Jeff Garzik Cc: Martin Schwidefsky Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ace06dc68db13f7f82f9341fdef89502f0bb217 Author: Oleg Nesterov Date: Tue Jul 31 00:39:19 2007 -0700 idr_remove_all: kill unused variable "error" is always equal to 0. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9b3febc5b9c55a76b838c977b078195ec8bb95e Author: Jesper Juhl Date: Tue Jul 31 00:39:18 2007 -0700 Fix a use after free bug in kernel->userspace relay file support Coverity spotted what looks like a real possible case of using a variable after it has been freed. The problem is in kernel/relay.c::relay_open_buf() If the code hits "goto free_buf;" it ends up in this code : free_buf: relay_destroy_buf(buf); <--- calls kfree() on 'buf'. free_name: kfree(tmpname); end: return buf; <-- use after free of 'buf'. I read through the callers and they all handle a NULL return from this function as an error (and hitting the 'free_buf' label only happens on failure to chan->cb->create_buf_file(), so that looks like a clear error to me). The patch simply sets 'buf' to NULL after the call to relay_destroy_buf(buf); - as far as I can see that should take care of the problem. The patch also corrects a reference to a documentation file while I was at it. Note from Mathieu: the documentation reference change should have been done in a separate patch, but I guess no one will really care. Signed-off-by: Jesper Juhl Acked-by: "David J. Wilder" Tested-by: "David J. Wilder" Signed-off-by: Mathieu Desnoyers Cc: Tom Zanussi Cc: Karim Yaghmour Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e804a4a4dd596d853f6d6f814fbdcf97b8efcdea Author: Satyam Sharma Date: Tue Jul 31 00:39:16 2007 -0700 kthread: silence bogus section mismatch warning WARNING: kernel/built-in.o(.text+0x16910): Section mismatch: reference to .init.text: (between 'kthreadd' and 'init_waitqueue_head') comes because kernel/kthread.c:kthreadd() is not __init but calls kthreadd_setup() which is __init. But this is ok, because kthreadd_setup() is only ever called at init time, and then kthreadd() proceeds into its "for (;;)" loop. We could mark kthreadd __init_refok, but kthreadd_setup() with just one callsite and 4 lines in it (it's been that small since 10ab825bdef8df51) doesn't need to be a separate function at all -- so let's just move those four lines at beginning of kthreadd() itself. Signed-off-by: Satyam Sharma Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbe06f6bf7e764a9eb0e3cdcec2b12c743f35757 Author: Mariusz Kozlowski Date: Tue Jul 31 00:39:13 2007 -0700 fs: 9p/conv.c error path fix When buf_check_overflow() returns != 0 we will hit kfree(ERR_PTR(err)) and it will not be happy about it. Signed-off-by: Mariusz Kozlowski Cc: Latchesar Ionkov Cc: Eric Van Hensbergen Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9700382c3c9ff3e673e587084d76eedb3ba88668 Author: david m. richter Date: Tue Jul 31 00:39:12 2007 -0700 VFS: fix a race in lease-breaking during truncate It is possible that another process could acquire a new file lease right after break_lease() is called during a truncate, but before lease-granting is disabled by the subsequent get_write_access(). Merely switching the order of the break_lease() and get_write_access() calls prevents this race. Signed-off-by: David M. Richter Signed-off-by: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 937472b00b666ecbf1464502f857ec63b024af72 Author: Mike Frysinger Date: Tue Jul 31 00:39:11 2007 -0700 use __val in __get_unaligned Use "__val" rather than "val" in the __get_unaligned macro in asm-generic/unaligned.h. This way gcc wont warn if you happen to also name something in the same scope "val". Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07ff8ee79e254ac07205d2c9c9e8fbe2f4b3e6e8 Author: Dave Young Date: Tue Jul 31 00:39:11 2007 -0700 hpet.txt: broken link fix The specification link in hpet document is broken. Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 448e3cee839fdf975d6119eed475ec7d0400404e Author: Adrian Bunk Date: Tue Jul 31 00:39:10 2007 -0700 ANON_INODES shouldn't be user visible There doesn't seem to be a good reason for ANON_INODES being an user visible option. Signed-off-by: Adrian Bunk Acked-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac9d41a3e4043a3a89735a872b564a1973df2178 Author: Michael Tokarev Date: Tue Jul 31 00:39:07 2007 -0700 Remove one more leftover reference to devfs Signed-off-by: Michael Tokarev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47f82189b185bf4b0de4ebce237850e8d3b1d0b6 Author: Gabriel C Date: Tue Jul 31 00:39:06 2007 -0700 broken lilo check on make install On make install I get the this error: ... sh /work/crazy/linux-git/linux-2.6/arch/i386/boot/install.sh 2.6.22-g4eb6bf6b arch/i386/boot/bzImage System.map "/boot" /work/crazy/linux-git/linux-2.6/arch/i386/boot/install.sh: line 54: /etc/lilo/install: No such file or directory make[1]: *** [install] Error 127 ... I don't use and don't have lilo installed on this system. The attached patch fixes the problem for me. Signed-off-by: Gabriel Craciunescu Acked-by: H. Peter Anvin Cc: Sam Ravnborg Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7ef970bafaa74bd9db75375e98ddd4634045303 Author: Robert P. J. Day Date: Tue Jul 31 00:39:05 2007 -0700 NCP: delete test of long-deceased CONFIG_NCPFS_DEBUGDENTRY Signed-off-by: Robert P. J. Day Acked-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80cd69203c3ad5f2ecf7d01cec4a10ed15613682 Author: Jesper Juhl Date: Tue Jul 31 00:39:05 2007 -0700 ipmi: Fix mem leak in try_init_dmi() This is only called at init time and only happens if the BIOS screws something up, so the leak is slight and it is probably not worth sending to 2.6.22.x. The driver would not initialize the interface in the case, and I have no reports of this happening. I have booted and run tests on a system with this patch. Note that the original patch was munged by the mailer, here's a new one. If we ever hit the "default:" case in the switch in try_init_dmi(), then we'll leak the storage allocated with kzalloc() and assigned to 'info'. Signed-off-by: Jesper Juhl Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73c21e8024296760c450a0bded131cb573f83328 Author: Randy Dunlap Date: Tue Jul 31 00:39:04 2007 -0700 docbook bad file references Fix docbook warnings: Warning(linux-2.6.22-git12//drivers/base/power/main.c): no structured comments found Warning(linux-2.6.22-git12//include/linux/splice.h): no structured comments found Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac4d823fd93be49c2a90fb877fc5fc6317936d5 Author: Randy Dunlap Date: Tue Jul 31 00:39:03 2007 -0700 irq.h fix kernel-doc Add kernel-doc entry in for: Warning(linux-2.6.22-git12//include/linux/irq.h:177): No description found for parameter 'last_unhandled' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa3481d5e686aa015e960f76253f0e771a92716a Author: Randy Dunlap Date: Tue Jul 31 00:39:02 2007 -0700 i2c.h kernel-doc additions Add kernel-doc notation in for: Warning(linux-2.6.22-git12//include/linux/i2c.h:183): No description found for parameter 'driver' Warning(linux-2.6.22-git12//include/linux/i2c.h:183): No description found for parameter 'usage_count' Warning(linux-2.6.22-git12//include/linux/i2c.h:183): No description found for parameter 'list' Warning(linux-2.6.22-git12//include/linux/i2c.h:183): No description found for parameter 'released' Signed-off-by: Randy Dunlap Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e89db75aee14f3f195836560e0973c9ff215f94 Author: Mark A. Greer Date: Tue Jul 31 00:39:01 2007 -0700 serial: MPSC: Fix coding style and whitespace issues Fix up mpsc.c to be aligned with Documentation/CodingStyle. Also fix up some whitespace issues. Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79f851733c71c5b2665d2b3ee857b9721846cd74 Author: Mark A. Greer Date: Tue Jul 31 00:39:00 2007 -0700 serial: MPSC: Remove duplicate SUPPORT_SYSRQ definition Remove the duplicate definition of SUPPORT_SYSRQ in mpsc driver. Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5797ae364c35db8c184f38b37595be59bf761e93 Author: Stephane Chazelas Date: Tue Jul 31 00:38:59 2007 -0700 serial: MPSC: Stop rx engine when CREAD cleared Currently, the MPSC driver doesn't stop recieving characters when the CREAD flag in termios->c_cflag is cleared. It should. Also, only start receiving if its not already started. Signed-off-by: Stephane Chazelas Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c1ead5e77c4e41d58ae6e6c3285ad38275df4a8 Author: Carlos Sanchez Date: Tue Jul 31 00:38:59 2007 -0700 serial: MPSC: Remove race between Rx stop & restart The patch in commit ID f7232056bff5fe2d3bfeab35252a66ebaeb5bbde stops (aborts) the MPSC's receive engine just before restarting it. Unfortunately, it doesn't wait for the abort to complete before restarting it which creates a race between the abort and the restart. If the restart occurs first, the in-progress abort stops it again and the rx engine remains stopped. Instead, do the abort when the SDMA engine is being stopped. Make sure to wait for the abort to complete before continuing. Signed-off-by: Carlos Sanchez Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 817794e0df5fea495396c18878804044436832be Author: Kirill Kuvaldin Date: Tue Jul 31 00:38:58 2007 -0700 isofs: mounting to regular file may succeed It turned out that mounting a corrupted ISO image to a regular file may succeed, e.g. if an image was prepared as follows: $ dd if=correct.iso of=bad.iso bs=4k count=8 We then can mount it to a regular file: # mount -o loop -t iso9660 bad.iso /tmp/file But mounting it to a directory fails with -ENOTDIR, simply because the root directory inode doesn't have S_IFDIR set and the condition in graft_tree() is met: if (S_ISDIR(nd->dentry->d_inode->i_mode) != S_ISDIR(mnt->mnt_root->d_inode->i_mode)) return -ENOTDIR This is because the root directory inode was read from an incorrect block. It's supposed to be read from sbi->s_firstdatazone, which is an absolute value and gets messed up in the case of an incorrect image. In order to somehow circumvent this we have to check that the root directory inode is actually a directory after all. Signed-off-by: Kirill Kuvaldin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 541510fc28b72eab37361e9e95f48746b4d3302b Author: Yoichi Yuasa Date: Tue Jul 31 00:38:56 2007 -0700 remove tx3912fb Remove tx3912fb. Nino has already removed. It is no longer needed. Signed-off-by: Yoichi Yuasa Acked-by: Ralf Baechle Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2174041d663e4ea825dd53af71b877ea6da736fe Author: Yoichi Yuasa Date: Tue Jul 31 00:38:56 2007 -0700 serial: fix vr41xx_siu serial console support The serial console can select only SERIAL_VR41XX=y. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a95d32094c6564c3be62ef6b396b24ced564932f Author: Yoichi Yuasa Date: Tue Jul 31 00:38:55 2007 -0700 serial: fix vr41xx_siu interface select only PORT_VR41XX_SIU can select interface. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a24ac9fba1d122ce2536d23b8f4c47a17b7d0627 Author: Yoichi Yuasa Date: Tue Jul 31 00:38:55 2007 -0700 serial: fix section mismatch vr41xx_siu Fix section mismatch vr41xx_siu. WARNING: drivers/built-in.o(.text+0x2ce4c): Section mismatch: reference to .init.text:uart_parse_options (between 'siu_console_setup' and 'siu_request_port') WARNING: drivers/built-in.o(.text+0x2ce70): Section mismatch: reference to .init.text:uart_set_options (between 'siu_console_setup' and 'siu_request_port') Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73dd1166af9a7a1e24554991236ddea740df0dbd Author: Michael Buesch Date: Tue Jul 31 00:38:54 2007 -0700 pure_initcall ID inconsistency pure_initcall uses the same ID as core_initcall. I guess that's a typo and it should use its own ID. Signed-off-by: Michael Buesch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e6ff1580ff5d8dc10ec58d22b3e1a6f372f7f40 Author: Eddy L O Jansson Date: Tue Jul 31 00:38:53 2007 -0700 in-string typos of "error" One patch for two trivial typos of 'error' with three R's, appearing in message strings. There's a bunch more of the same in comments, not dealt with here. Signed-off-by: Eddy L O Jansson Cc: Roman Zippel Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41d202d80e829c0a489119ad63d7ece08a9786da Author: Herton Ronaldo Krzesinski Date: Tue Jul 31 00:38:52 2007 -0700 Include serial_reg.h with userspace headers As reported by Gustavo de Nardin , while trying to compile xosview (http://xosview.sourceforge.net/) with upstream kernel headers being used you get the following errors: serialmeter.cc:48:30: error: linux/serial_reg.h: No such file or directory serialmeter.cc: In member function 'virtual void SerialMeter::checkResources()': serialmeter.cc:71: error: 'UART_LSR' was not declared in this scope serialmeter.cc:71: error: 'UART_MSR' was not declared in this scope ... Signed-off-by: Herton Ronaldo Krzesinski Cc: Gustavo de Nardin Cc: David Woodhouse Cc: Russell King Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f54f098612d7f86463b5fb4763d03533d634de73 Author: Andreas Schwab Date: Tue Jul 31 00:38:51 2007 -0700 futex: pass nr_wake2 to futex_wake_op The fourth argument of sys_futex is ignored when op == FUTEX_WAKE_OP, but futex_wake_op expects it as its nr_wake2 parameter. The only user of this operation in glibc is always passing 1, so this bug had no consequences so far. Signed-off-by: Andreas Schwab Cc: Ingo Molnar Signed-off-by: Ulrich Drepper Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0f3358621dc746219d49a9dee1799704d3a32f8 Author: Alexey Dobriyan Date: Tue Jul 31 00:38:50 2007 -0700 Fix leak on /proc/lockdep_stats Signed-off-by: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ea473a1dfeca2ee38c5dd458c1174d129e6b64e Author: Alexey Dobriyan Date: Tue Jul 31 00:38:50 2007 -0700 Fix leaks on /proc/{*/sched,sched_debug,timer_list,timer_stats} On every open/close one struct seq_operations leaks. Kudos to /proc/slab_allocators. Signed-off-by: Alexey Dobriyan Acked-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff8e210a9550ad760a62e9803938cd04f9fb0851 Author: David Howells Date: Tue Jul 31 00:38:49 2007 -0700 AFS: fix file locking Fix file locking for AFS: (*) Start the lock manager thread under a mutex to avoid a race. (*) Made the locking non-fair: New readlocks will jump pending writelocks if there's a readlock currently granted on a file. This makes the behaviour similar to Linux's VFS locking. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b34bd06e485abf5b24fc13a9a988ebf4d2915dd6 Author: Paul E. McKenney Date: Tue Jul 31 00:38:48 2007 -0700 bpqether: fix rcu usage The rcu_dereference() primitive needs to be applied to an l-value in order to ensure that compiler writers don't get an opportunity to apply reordering optimizations that could result in multiple fetches or in other misbehavior. This patch pulls the rcu_dereference() calls in bpq_seq_next() up to the point at which the fetched pointers are still l-values, rather than after list_entry() has transformed them into r-values. Signed-off-by: Paul E. McKenney Cc: Jeff Garzik Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7be77e20d59fc3dd3fdde31641e0bc821114d26b Author: Pavel Emelianov Date: Tue Jul 31 00:38:48 2007 -0700 Fix user struct leakage with locked IPC shem segment When user locks an ipc shmem segmant with SHM_LOCK ctl and the segment is already locked the shmem_lock() function returns 0. After this the subsequent code leaks the existing user struct: == ipc/shm.c: sys_shmctl() == ... err = shmem_lock(shp->shm_file, 1, user); if (!err) { shp->shm_perm.mode |= SHM_LOCKED; shp->mlock_user = user; } ... == Other results of this are: 1. the new shp->mlock_user is not get-ed and will point to freed memory when the task dies. 2. the RLIMIT_MEMLOCK is screwed on both user structs. The exploit looks like this: == id = shmget(...); setresuid(uid, 0, 0); shmctl(id, SHM_LOCK, NULL); setresuid(uid + 1, 0, 0); shmctl(id, SHM_LOCK, NULL); == My solution is to return 0 to the userspace and do not change the segment's user. Signed-off-by: Pavel Emelianov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad0b142772eb1f88f0e77cb63c38b0005e83c2bd Author: Ralf Baechle Date: Tue Jul 31 00:38:47 2007 -0700 kbuild: whitelist references from __dbe_table to .init This is needed on MIPS where the same mechanism as get_user() is used to intercept bus error exceptions for some hardware probes. Without this patch modpost will throw spurious warnings: LD vmlinux SYSMAP System.map SYSMAP .tmp_System.map MODPOST vmlinux WARNING: arch/mips/sgi-ip22/built-in.o(__dbe_table+0x0): Section mismatch: reference to .init.text: Signed-off-by: Ralf Baechle Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db0031947bad3feafc217d5ac4f320021f57c740 Author: Jesper Juhl Date: Tue Jul 31 00:38:46 2007 -0700 m68knommu: get rid of duplicate include Remove the duplicate inclusion of asm/irq.h from arch/m68knommu/platform/5206e/config.c Signed-off-by: Jesper Juhl Acked-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe9844d5a32e7b2552a557a42a2a2dc0e378672c Author: Andrew Morton Date: Tue Jul 31 00:38:45 2007 -0700 kdebug.h: forward-declare struct struct notifier_block alpha: In file included from kernel/notifier.c:1: include/linux/kdebug.h:14: warning: 'struct notifier_block' declared inside parameter list include/linux/kdebug.h:14: warning: its scope is only this definition or declaration, which is probably not what you want include/linux/kdebug.h:15: warning: 'struct notifier_block' declared inside parameter list kernel/notifier.c:529: error: conflicting types for 'register_die_notifier' include/linux/kdebug.h:14: error: previous declaration of 'register_die_notifier' was here kernel/notifier.c:533: error: conflicting types for 'register_die_notifier' include/linux/kdebug.h:14: error: previous declaration of 'register_die_notifier' was here kernel/notifier.c:536: error: conflicting types for 'unregister_die_notifier' include/linux/kdebug.h:15: error: previous declaration of 'unregister_die_notifier' was here kernel/notifier.c:539: error: conflicting types for 'unregister_die_notifier' include/linux/kdebug.h:15: error: previous declaration of 'unregister_die_notifier' was here Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a485d7ad2b68600e423f8799efc0d074029ec01 Author: Anton Vorontsov Date: Tue Jul 31 00:38:45 2007 -0700 spi_mpc83xx: support loopback mode This exposes the hardware loopback mode to drivers, primarily for testing. Signed-off-by: Anton Vorontsov Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22b238bdb93ed2fcb1d627ce81d8a2fcbe24de85 Author: Anton Vorontsov Date: Tue Jul 31 00:38:44 2007 -0700 spidev_test utility This is a simple utility used to test SPI functionality. It could stand growing options to support using other test data patterns; this initial version only issues full duplex transfers, which rules out 3WIRE or Microwire links. Signed-off-by: Anton Vorontsov Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f166e3833d953f0acf77eb7d426840da9e1a87f Author: Anton Vorontsov Date: Tue Jul 31 00:38:43 2007 -0700 spidev supports more communications modes The spidev driver doesn't currently expose all SPI communications modes to userspace. This passes them all through to the driver. Two of them are potentially troublesome, in the sense that they could cause hardware conflicts on shared busses. It might be appropriate to add some privilege checks for for those modes. Signed-off-by: Anton Vorontsov Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ef7af50373778ee248a2493c9cf62a2299806a8 Author: Anton Vorontsov Date: Tue Jul 31 00:38:43 2007 -0700 SPI loopback mode definition Loopback mode is supported by various controllers. This mode can be useful for testing, especially in conjunction with spidev driver. Signed-off-by: Anton Vorontsov Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35cc0b975057389548bfe5703d438fe0deb4807e Author: Anton Vorontsov Date: Tue Jul 31 00:38:42 2007 -0700 spi_mpc83xx: fix QE+LSB mode shifts spi_mpc83xx should use other shifts when running in QE+LSB mode. Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32421daaf8236b0fd6e032f6b1dd8086ccae2a46 Author: Anton Vorontsov Date: Tue Jul 31 00:38:41 2007 -0700 spi_mpc83xx: support for lsb-first transfers This controller supports LSB-first transfers; let drivers use them. Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20ba09b979f7e1de790968a9175c6caceda00261 Author: Anton Vorontsov Date: Tue Jul 31 00:38:41 2007 -0700 spi_mpc83xx: get rid of magic numbers Magic-numbers-R-Evil Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49bb23006b220c11bcf4e1d3eb99c289e6ab855e Author: Anton Vorontsov Date: Tue Jul 31 00:38:40 2007 -0700 spi_mpc83xx: turn off SPI unit while switching mode Documentation clearly states, that mode should not be changed till SPMODE_ENABLE bit set. I've seen hangs w/o this patch. Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99eb8a550dbccc0e1f6c7e866fe421810e0585f6 Author: Adrian Bunk Date: Tue Jul 31 00:38:19 2007 -0700 Remove the arm26 port The arm26 port has been in a state where it was far from even compiling for quite some time. Ian Molton agreed with the removal. Signed-off-by: Adrian Bunk Cc: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d0ed42e5ca2e22465c591341839c18025748fe8 Author: Alexey Dobriyan Date: Tue Jul 31 00:38:18 2007 -0700 Add CTL_PROC back commit eab03ac7bd3e0da99eb9dc068772a85a5e3f3577 aka "[PATCH] Get rid of /proc/sys/proc" was good commit except strace(1) compile breakage it introduced: system.c:1581: error: 'CTL_PROC' undeclared here (not in a function) So, add dummy enum back. Signed-off-by: Alexey Dobriyan Cc: Stephen Hemminger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7eacbbd32a98ab5b607f7773bb2692cc195db9b2 Author: Satyam Sharma Date: Tue Jul 31 00:38:17 2007 -0700 Fix a typo in Documentation/keys.txt Signed-off-by: Satyam Sharma Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a12e2c6cde6392287b9cd3b4bd8d843fd1458087 Author: Randy Dunlap Date: Tue Jul 31 00:38:17 2007 -0700 Doc: DMA-API update Fix typos and update function parameters. Signed-off-by: Randy Dunlap Acked-by: Muli Ben-Yehuda Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9eb3ff40376e505eafb927b4a4cbccc928df68ec Author: Ulrich Drepper Date: Tue Jul 31 00:38:16 2007 -0700 CPU online file permission Is there a reason why the "online" file in the subdirectories for the CPUs in /sys/devices/system isn't world-readable? I cannot imagine it to be security relevant especially now that a getcpu() syscall can be used to determine what CPUa thread runs on. The file is useful to correctly implement the sysconf() function to return the number of online CPUs. In the presence of hotplug we currently cannot provide this information. The patch below should to it. Signed-off-by: Ulrich Drepper Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07a304603cd0133468e3a153f4fe78b02733d0db Author: Eugene Teo Date: Tue Jul 31 00:38:15 2007 -0700 arch/i386/kernel/apm.c: apm_init() warning fix arch/i386/kernel/apm.c: In function 'apm_init': arch/i386/kernel/apm.c:2240: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'u32' apm_info.bios.offset is of type 'u32'. Signed-off-by: Eugene Teo Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135db3eb995e68b5cd2fb03377be7cffd9743d6f Author: Meelis Roos Date: Tue Jul 31 00:38:14 2007 -0700 add a missing LIB_Y to arch/alpha/boot Makefile Add $(LIBS_Y) to get lib/lib.a so srm_printk is present. Signed-off-by: Meelis Roos Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Jay Estabrook Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96e3e18eed3b48f6d4377dee0326a106e8a04569 Author: Sam Ravnborg Date: Tue Jul 31 00:38:13 2007 -0700 lib: move kasprintf to a separate file kasprintf pulls in kmalloc which proved to be fatal for at least bootimage target on alpha. Move it to a separate file so only users of kasprintf are exposed to the dependency on kmalloc. Signed-off-by: Sam Ravnborg Cc: Jeremy Fitzhardinge Cc: Meelis Roos Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Jay Estabrook Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9965a5d5a5aab575f995ba58dc80285aa0f6ecbf Author: Meelis Roos Date: Tue Jul 31 00:38:13 2007 -0700 alpha: fix boot/main.c warning In current 2.6.23-rc1+git, make bootimage gives the following warning while compiling arch/alpha/boot/main.c. The patch below fixes the warning by casting callback argument explicitly to void*. The original value comes from START_ADDR macro and is clearly numeric so only cast it for the callback. CC arch/alpha/boot/main.o arch/alpha/boot/main.c: In function 'load': arch/alpha/boot/main.c:135: warning: passing argument 3 of 'callback_read' makes pointer from integer without a cast Signed-off-by: Meelis Roos Cc: Jay Estabrook Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b2becffeed47ce88316724d1ee4cdbc7ee0180e Author: Meelis Roos Date: Tue Jul 31 00:38:12 2007 -0700 alpha: fix objstrip.c compilation warnings In current 2.6.23-rc1+git, make bootimage gives the following warnings while compiling objstrip.c. The patch below fixes these warnings by casting strncmp argument to char * - it does not seem feasible to change its type in struct elfhdr. HOSTCC arch/alpha/boot/tools/objstrip arch/alpha/boot/tools/objstrip.c: In function 'main': arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of '__builtin_strcmp' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of '__builtin_strcmp' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of '__builtin_strcmp' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of '__builtin_strcmp' differ in signedness arch/alpha/boot/tools/objstrip.c:147: warning: pointer targets in passing argument 1 of 'strncmp' differ in signedness Signed-off-by: Meelis Roos Cc: Jay Estabrook Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeb3f46252e26acdc60a1a8e31fb1ca6319d9a07 Author: Meelis Roos Date: Tue Jul 31 00:38:11 2007 -0700 alpha: fix mkbb compilation warnings In current 2.6.23-rc1+git, make bootimage gives the following warnings while compiling mkbb.c. The patch below fixes these warnings by using the proper include for exit() and using appropriate printf format. HOSTCC arch/alpha/boot/tools/mkbb arch/alpha/boot/tools/mkbb.c: In function 'main': arch/alpha/boot/tools/mkbb.c:95: warning: implicit declaration of function 'exit' arch/alpha/boot/tools/mkbb.c:95: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:102: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:110: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:117: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' arch/alpha/boot/tools/mkbb.c:118: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:125: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' arch/alpha/boot/tools/mkbb.c:126: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:143: warning: incompatible implicit declaration of built-in function 'exit' arch/alpha/boot/tools/mkbb.c:148: warning: incompatible implicit declaration of built-in function 'exit' Signed-off-by: Meelis Roos Cc: Jay Estabrook Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60fd4d6a1953accd3d57f8e4f3b0f4692598bf4e Author: Wyatt Banks Date: Tue Jul 31 00:38:10 2007 -0700 Documentation: document HFSPlus Documentation: document HFSPlus filesystem and its mount options. Signed-off-by: Wyatt Banks Cc: "Randy.Dunlap" Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afb2c1650b4c6f285596268d0a1de2a81542a765 Author: Daniel Ritz Date: Tue Jul 31 00:38:08 2007 -0700 pcmcia: give socket time to power down Give sockets up to 100ms of additional time to power down. otherwise we might generate false warnings with KERN_ERR priority (like in bug #8262). Signed-off-by: Daniel Ritz Cc: Nils Neumann Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b232ecfd9ac55adb237e78482ed8f3d3becb0d8 Author: Yoichi Yuasa Date: Tue Jul 31 00:38:06 2007 -0700 DDB5477: remove driver bits of support Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57d4810ea0d9ca58a7bcc1336607f0cede0a2abf Author: Andrew Morton Date: Tue Jul 31 00:38:02 2007 -0700 revert "x86, serial: convert legacy COM ports to platform devices" Revert 7e92b4fc345f5b6f57585fbe5ffdb0f24d7c9b26. It broke Sébastien Dugué's machine and Jeff said (persuasively) This seems like it will break decades-long-working stuff, in favor of breaking new ground in our favorite area, "trusting the BIOS." It's just not worth it for serial ports, IMO. Serial ports are something that just shouldn't break at this late stage in the game. My new Intel platform boxes don't even have serial ports, so I question the value of messing with serial port probing even more... because... just wait a year, and your box won't have a serial port either! :) I certainly don't object to the use of platform devices (or isa_driver), but the probe change seems questionable. That's sorta analagous to rewriting the floppy driver probe routine. Sure you could do it... but why risk all that damage and go through debugging all over again? It seems clear from this report that we cannot, should not, trust BIOS for something (a) so simple and (b) that has been working for over a decade. Much discussion ensued and we've decided to have another go at all of this. Cc: Sébastien Dugué Cc: Bjorn Helgaas Cc: Len Brown Cc: Adam Belay Cc: Matthew Garrett Cc: Russell King Cc: Jeff Garzik Acked-by: Alan Cox Cc: Michal Piotrowski Cc: Sascha Sommer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a583f1b54249b11ad1ffd14c6e74d28fcbc59c07 Author: Stephane Eranian Date: Tue Jul 31 00:38:00 2007 -0700 remove unused TIF_NOTIFY_RESUME flag Remove unused TIF_NOTIFY_RESUME flag for all processor architectures. The flag was not used excecpt on IA-64 where the patch replaces it with TIF_PERFMON_WORK. Signed-off-by: stephane eranian Cc: Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd4f0ef7c03e79f92a883843662e3d0eaae26fb4 Author: Alan Cox Date: Tue Jul 31 00:37:59 2007 -0700 doc/kernel-parameters: use X86-32 tag instead of IA-32 Signed-off-by: Alan Cox Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6f953aa99d456aff44ffdb1c77061d1a010eae2 Author: Arne Redlich Date: Tue Jul 31 00:37:57 2007 -0700 md: handle writes to broken raid10 arrays gracefully When writing to a broken array, raid10 currently happily emits empty bio lists. IOW, the master bio will never be completed, sending writers to UNINTERRUPTIBLE_SLEEP forever. Signed-off-by: Arne Redlich Acked-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14e713446aaca97dbe590fe845f7dcbd74ddbee2 Author: Maik Hampel Date: Tue Jul 31 00:37:57 2007 -0700 md: raid10: fix use-after-free of bio In case of read errors raid10d tries to print a nice error message, unfortunately using data from an already put bio. Signed-off-by: Maik Hampel Acked-By: NeilBrown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfe0d6867e36f46836d2c3755fa8b9ef8cf143ba Author: Randy Dunlap Date: Tue Jul 31 00:37:56 2007 -0700 fix filemap.c kernel-doc Fix kernel-doc warning: Warning(linux-2.6.23-rc1-mm1//mm/filemap.c:864): No description found for parameter 'ra' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64d158bc3db121fd2bec29057a44843930b044fa Author: Sam Ravnborg Date: Tue Jul 31 00:37:53 2007 -0700 alpha: fix two section mismatch warnings Fix the following section mismatch warnings: WARNING: o-alpha/vmlinux.o(.text+0x1a4d4): Section mismatch: reference to .init.text:free_area_init (between 'paging_init' and 'srm_paging_stop') WARNING: o-alpha/vmlinux.o(.text+0x1a4dc): Section mismatch: reference to .init.text:free_area_init (between 'paging_init' and 'srm_paging_stop') One instance of paging_init() was declared __init but not the other one - used by defconfig. Fixed by declaring the second instance ___init too. Signed-off-by: Sam Ravnborg Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a4b88317aa02c82e66e37debb764d4ff3eedd70 Author: J. Bruce Fields Date: Tue Jul 31 00:37:53 2007 -0700 knfsd: eliminate unnecessary -ENOENT returns on export downcalls A succesful downcall with a negative result (which indicates that the given filesystem is not exported to the given user) should not return an error. Currently mountd is depending on stdio to write these downcalls. With some versions of libc this appears to cause subsequent writes to attempt to write all accumulated data (for which writes previously failed) along with any new data. This can prevent the kernel from seeing responses to later downcalls. Symptoms will be that nfsd fails to respond to certain requests. Signed-off-by: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a725fc4d3bfc4734164863d6c50208b109ca5c7 Author: J. Bruce Fields Date: Tue Jul 31 00:37:52 2007 -0700 nfsd4: idmap upcalls should use unsigned uid and gid We shouldn't be using negative uid's and gid's in the idmap upcalls. Signed-off-by: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 749997e5127a1df6b68a10c686af3f5b819a41a2 Author: Jeff Layton Date: Tue Jul 31 00:37:51 2007 -0700 knfsd: set the response bitmask for NFS4_CREATE_EXCLUSIVE RFC 3530 says: If the server uses an attribute to store the exclusive create verifier, it will signify which attribute by setting the appropriate bit in the attribute mask that is returned in the results. Linux uses the atime and mtime to store the verifier, but sends a zeroed out bitmask back to the client. This patch makes sure that we set the correct bits in the bitmask in this situation. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 421cee293587081efef165b137514884b8472565 Author: Randy Dunlap Date: Tue Jul 31 00:37:50 2007 -0700 sched: fix kernel-doc warnings Fix kernel-doc warnings in sched.c: Warning(linux-2623-rc1g4//kernel/sched.c:1685): No description found for parameter 'notifier' Warning(linux-2623-rc1g4//kernel/sched.c:1696): No description found for parameter 'notifier' Warning(linux-2623-rc1g4//kernel/sched.c:1750): No description found for parameter 'prev' Signed-off-by: Randy Dunlap Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8a367935fc649c071a91c648c4a9c892f72113e Author: Randy Dunlap Date: Tue Jul 31 00:37:50 2007 -0700 pnp: fix kernel-doc warnings Fix PNP docbook warnings: Warning(linux-2623-rc1g4//drivers/pnp/core.c): no structured comments found Warning(linux-2623-rc1g4//drivers/pnp/driver.c): no structured comments found Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd54567a83057821a667109a5cadec6eed0295de Author: Mingming Cao Date: Tue Jul 31 00:37:46 2007 -0700 "ext4_ext_put_in_cache" uses __u32 to receive physical block number Yan Zheng wrote: > I think I found a bug in ext4/extents.c, "ext4_ext_put_in_cache" uses > "__u32" to receive physical block number. "ext4_ext_put_in_cache" is > used in "ext4_ext_get_blocks", it sets ext4 inode's extent cache > according most recently tree lookup (higher 16 bits of saved physical > block number are always zero). when serving a mapping request, > "ext4_ext_get_blocks" first check whether the logical block is in > inode's extent cache. if the logical block is in the cache and the > cached region isn't a gap, "ext4_ext_get_blocks" gets physical block > number by using cached region's physical block number and offset in > the cached region. as described above, "ext4_ext_get_blocks" may > return wrong result when there are physical block numbers bigger than > 0xffffffff. > You are right. Thanks for reporting this! Signed-off-by: Mingming Cao Cc: Yan Zheng Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6676ae62822f189e7bca80526eca514c399adcfc Author: Jeff Dike Date: Tue Jul 31 00:37:44 2007 -0700 UML: console should handle spurious IRQS The previous DEBUG_SHIRQ patch missed one case. The console doesn't set its host descriptors non-blocking. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8daedea656ef48d36d1bda3d1339da484387c710 Author: Andrew Morton Date: Tue Jul 31 00:37:43 2007 -0700 parport_pc locking fix http://bugzilla.kernel.org/show_bug.cgi?id=8821 reports a might_sleep() warning due to parport_pc_exit() running platform_device_unregister() while holding ports_lock. Just remove the locking: nobody else can access ports_list during module_exit. Cc: "Mike Sharkey" Cc: Tim Waugh Cc: Stas Sergeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c21b37f6449a3d799c7e75e978391674ee207600 Author: Richard Purdie Date: Tue Jul 31 00:37:42 2007 -0700 lzo: add some missing casts Add some casts to the LZO compression algorithm after they were removed during cleanup and shouldn't have been. Signed-off-by: Richard Purdie Cc: Edward Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3968cb49ab01588cbf6896951780a1e411a0ec38 Author: Jordan Crouse Date: Tue Jul 31 00:37:40 2007 -0700 lxfb: GEODE: Add framebuffer support for the AMD Geode LX Add framebuffer support for the AMD Geode LX graphics engine. Signed-off-by: Jordan Crouse Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8facbb62111f9333d00870b0d523f5036822d04 Author: Randy Dunlap Date: Tue Jul 31 00:37:40 2007 -0700 various doc/kernel-parameters fixes - tell what APIC (by request), MTD, & PARIDE mean - correct some source file names - remove IA64 "llsc*=" (seems to have been removed from source tree) - removel SCSI "53c7xx=" (driver already removed) Signed-off-by: Randy Dunlap Acked-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f53161d1088567dda41094a932f6a16dc0bdae59 Author: Grant Likely Date: Tue Jul 31 00:37:39 2007 -0700 xilinxfb: Don't bail if the xilinxfb platform device doesn't have any pdata Lack of pdata is not a fatal om