commit b0e0c9e7f6d5764633e93944dafd896dd6097318 Merge: dae8168... 53e6d8d... Author: Linus Torvalds Date: Tue Aug 12 16:39:22 2008 -0700 Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux * 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: fs/nfsd/export.c: Adjust error handling code involving auth_domain_put MAINTAINERS: mention lockd and sunrpc in nfs entries lockd: trivial sparse endian annotations commit dae816835e8d1276c9e50d9c4dba75b7705fe66c Merge: ddc752a... 3a3eae0... Author: Linus Torvalds Date: Tue Aug 12 16:38:45 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ehca: Discard double CQE for one WR IB/ehca: Check idr_find() return value IB/ehca: Repoll CQ on invalid opcode IB/ehca: Rename goto label in ehca_poll_cq_one() IB/ehca: Update qp_state on cached modify_qp() IPoIB/cm: Use vmalloc() to allocate rx_rings commit ddc752a4068088bfc5558a3f72e4f7cca3fc1210 Merge: 31bad92... 430ac5b... Author: Linus Torvalds Date: Tue Aug 12 16:07:48 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] use bcd2bin/bin2bcd [IA64] Ensure cpu0 can access per-cpu variables in early boot code commit 31bad9246b5e17d547430697791acca5e9712333 Author: Bernhard Walle Date: Tue Aug 12 15:09:14 2008 -0700 firmware/memmap: cleanup Various cleanup the drivers/firmware/memmap (after review by AKPM): - fix kdoc to conform to the standard - move kdoc from header to implementation files - remove superfluous WARN_ON() after kmalloc() - WARN_ON(x); if (!x) -> if(!WARN_ON(x)) - improve some comments Signed-off-by: Bernhard Walle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdd873540df9271634b0aae189f91c064f8b6147 Author: Alexander Clouter Date: Tue Aug 12 15:09:12 2008 -0700 ALi M7101 PMU also available on Sun Netra's too My Sun Netra T1 AC200 has one of these... bit harsh not letting me use it and all :) ========== alex@woodchuck:~$ lspci -nn 00:01.0 PCI bridge [0604]: Sun Microsystems Computer Corp. Simba Advanced PCI Bridge [108e:5000] (rev 13) 00:01.1 PCI bridge [0604]: Sun Microsystems Computer Corp. Simba Advanced PCI Bridge [108e:5000] (rev 13) 01:03.0 Non-VGA unclassified device [0000]: ALi Corporation M7101 Power Management Controller [PMU] [10b9:7101] 01:05.1 Ethernet controller [0200]: Sun Microsystems Computer Corp. RIO GEM [108e:1101] (rev 01) 01:05.3 USB Controller [0c03]: Sun Microsystems Computer Corp. RIO USB [108e:1103] (rev 01) 01:07.0 ISA bridge [0601]: ALi Corporation M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] [10b9:1533] 01:0c.0 Bridge [0680]: Sun Microsystems Computer Corp. RIO EBUS [108e:1100] (rev 01) 01:0c.1 Ethernet controller [0200]: Sun Microsystems Computer Corp. RIO GEM [108e:1101] (rev 01) 01:0c.3 USB Controller [0c03]: Sun Microsystems Computer Corp. RIO USB [108e:1103] (rev 01) 01:0d.0 IDE interface [0101]: ALi Corporation M5229 IDE [10b9:5229] (rev c3) 02:08.0 SCSI storage controller [0100]: LSI Logic / Symbios Logic 53C896/897 [1000:000b] (rev 07) 02:08.1 SCSI storage controller [0100]: LSI Logic / Symbios Logic 53C896/897 [1000:000b] (rev 07) ========== Signed-off-by: Alexander Clouter Cc: Wim Van Sebroeck Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f8c3c8edff426fd87098f057688463107fcd9ce Author: Michael Abbott Date: Tue Aug 12 15:09:11 2008 -0700 Make ioctl.h compatible with userland The attached patch seems to already exist in a number of branches -- it keeps popping up on Google for me, and is certainly already in Debian -- but is strangely absent from mainstream. The problem appears to be that the patched file ends up as part of the target toolchain, but unfortunately the gcc constant folding doesn't appear to eliminate the __invalid_size_argument_for_IOC value early enough. Certainly compiling C++ programs which use _IO... macros as constants fails without this patch. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 666593137185dc0ad1ee8966c8d7fef8f4bb84b2 Author: Randy Dunlap Date: Tue Aug 12 15:09:10 2008 -0700 docsrc: fix getdelays printk formats Fix printf format type warnings (seen on alpha & ia64): Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 6 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 7 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 8 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 9 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 12 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 13 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 16 has type '__u64' Documentation/accounting/getdelays.c:206: warning: format '%15llu' expects type 'long long unsigned int', but argument 17 has type '__u64' Documentation/accounting/getdelays.c:214: warning: format '%15llu' expects type 'long long unsigned int', but argument 4 has type '__u64' Documentation/accounting/getdelays.c:214: warning: format '%15llu' expects type 'long long unsigned int', but argument 5 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type '__u64' Documentation/accounting/getdelays.c:221: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type '__u64' Documentation/accounting/getdelays.c:236: warning: 'cmd_type' may be used uninitialized in this function Signed-off-by: Randy Dunlap Cc: Balbir Singh Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffab10ec65f0a9b009241a9126680f72ac2fda5b Author: Randy Dunlap Date: Tue Aug 12 15:09:08 2008 -0700 docsrc: fix crc32hash type Fix differing signedness warning: Documentation/pcmcia/crc32hash.c:29: warning: pointer targets in passing argument 1 of 'crc32' differ in signedness Signed-off-by: Randy Dunlap Acked-by: Dominik Brodowski Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3784a77f6f30a8ef5e37f3c7165930b1b66470b Author: Randy Dunlap Date: Tue Aug 12 15:09:08 2008 -0700 docsrc: fix ifenslave type Documentation/networking/ifenslave.c:1084: warning: pointer targets in assignment differ in signedness >From include/linux/socket.h: * 1003.1g requires sa_family_t and that sa_data is char. and from SUSv3: (http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html) The header shall define the sockaddr structure that includes at least the following members: sa_family_t sa_family Address family. char sa_data[] Socket address (variable-length data). Signed-off-by: Randy Dunlap Cc: Sam Ravnborg Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d39d9440dd6e590f78c295c5fdef195956da1c1 Author: Randy Dunlap Date: Tue Aug 12 15:09:06 2008 -0700 docsrc: fix procfs example Add MODULE_LICENSE() to DocBook/procfs_example.c since modpost complained about a missing license there. Remove tty procfs removal since the creation was deleted long ago (http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commitdiff;h=5ad9cb65e9b15e5b83e2dd1c10a4bcaccc4ec644). Signed-off-by: Randy Dunlap Cc: Cc: Sam Ravnborg Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3794f3e812ef707a4f7931742274d1d0ca6597b4 Author: Randy Dunlap Date: Tue Aug 12 15:09:06 2008 -0700 docsrc: build Documentation/ sources Currently source files in the Documentation/ sub-dir can easily bit-rot since they are not generally buildable, either because they are hidden in text files or because there are no Makefile rules for them. This needs to be fixed so that the source files remain usable and good examples of code instead of bad examples. Add the ability to build source files that are in the Documentation/ dir. Add to Kconfig as "BUILD_DOCSRC" config symbol. Use "CONFIG_BUILD_DOCSRC=1 make ..." to build objects from the Documentation/ sources. Or enable BUILD_DOCSRC in the *config system. However, this symbol depends on HEADERS_CHECK since the header files need to be installed (for userspace builds). Built (using cross-tools) for x86-64, i386, alpha, ia64, sparc32, sparc64, powerpc, sh, m68k, & mips. Signed-off-by: Randy Dunlap Reviewed-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc2aa80e18a1b43ea2b8066500006b729c4ba4a7 Author: Harvey Harrison Date: Tue Aug 12 15:09:05 2008 -0700 byteorder: add include/linux/byteorder.h to define endian helpers Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40c9f22210f2d22f45d4fb430c94f472d19407d6 Author: Harvey Harrison Date: Tue Aug 12 15:09:04 2008 -0700 byteorder: add a new include/linux/swab.h to define byteswapping functions Collect the implementations from include/linux/byteorder/swab.h, swabb.h in swab.h The functionality provided covers: u16 swab16(u16 val) - return a byteswapped 16 bit value u32 swab32(u32 val) - return a byteswapped 32 bit value u64 swab64(u64 val) - return a byteswapped 64 bit value u32 swahw32(u32 val) - return a wordswapped 32 bit value u32 swahb32(u32 val) - return a high/low byteswapped 32 bit value Similar to above, but return swapped value from a naturally-aligned pointer u16 swab16p(u16 *p) u32 swab32p(u32 *p) u64 swab64p(u64 *p) u32 swahw32p(u32 *p) u32 swahb32p(u32 *p) Similar to above, but swap the value in-place (in-situ) void swab16s(u16 *p) void swab32s(u32 *p) void swab64s(u64 *p) void swahw32s(u32 *p) void swahb32s(u32 *p) Arches can override any of these with an optimized version by defining an inline in their asm/byteorder.h (example given for swab16()): u16 __arch_swab16() {} #define __arch_swab16 __arch_swab16 Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f18e439d1035d059534d261c414af33f89aee89a Author: Alexey Dobriyan Date: Tue Aug 12 15:09:03 2008 -0700 genirq: switch /proc/irq/*/smp_affinity et al to seqfiles Switch /proc/irq/*/smp_affinity , /proc/irq/default_smp_affinity to seq_files. cat(1) reads with 1024 chunks by default, with high enough NR_CPUS, there will be -EINVAL. As side effect, there are now two less users of the ->read_proc interface. Signed-off-by: Alexey Dobriyan Cc: Paul Jackson Cc: Mike Travis Cc: Al Viro Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50ac2d694f2dd1658341cf97bcf2ffb836d772cb Author: Alexey Dobriyan Date: Tue Aug 12 15:09:02 2008 -0700 seq_file: add seq_cpumask(), seq_nodemask() Short enough reads from /proc/irq/*/smp_affinity return -EINVAL for no good reason. This became noticed with NR_CPUS=4096 patches, when length of printed representation of cpumask becase 1152, but cat(1) continued to read with 1024-byte chunks. bitmap_scnprintf() in good faith fills buffer, returns 1023, check returns -EINVAL. Fix it by switching to seq_file, so handler will just fill buffer and doesn't care about offsets, length, filling EOF and all this crap. For that add seq_bitmap(), and wrappers around it -- seq_cpumask() and seq_nodemask(). Signed-off-by: Alexey Dobriyan Reviewed-by: Paul Jackson Cc: Mike Travis Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd763460eb628b57814251a15a39f8d75c044d76 Author: Huang Weiyi Date: Tue Aug 12 15:09:01 2008 -0700 reiserfs: removed duplicated #include Removed duplicated #include in fs/reiserfs/super.c. Signed-off-by: Huang Weiyi Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 523723bb5032f291272f9732713713b9b82ccfe0 Author: Andrew Morton Date: Tue Aug 12 15:09:01 2008 -0700 fs/eventpoll.c: fix sys_epoll_create1() comment The `size' argument was removed. Reported-by: Geert Uytterhoeven Cc: Ulrich Drepper Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98b0da43079740ecd07197dacd9720d54bb4dce0 Author: Huang Weiyi Date: Tue Aug 12 15:09:00 2008 -0700 drivers/char/rtc.c: removed duplicated include Signed-off-by: Huang Weiyi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc1efbdb7a1175759b099d74b67921396e5e8e3d Author: Huang Weiyi Date: Tue Aug 12 15:09:00 2008 -0700 mm/sparse.c: removed duplicated include Signed-off-by: Huang Weiyi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 070cb06593006e7d565d4763380f3edd8dbdc134 Author: Uwe Kleine-König Date: Tue Aug 12 15:08:59 2008 -0700 move kernel-doc comment for might_sleep directly before its defining block Signed-off-by: Uwe Kleine-König Cc: Ingo Molnar Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a Author: Yi Yang Date: Tue Aug 12 15:08:58 2008 -0700 lib/vsprintf.c: wrong conversion function used Fix wrong conversion function used by strict_strtou* Signed-off-by: Yi Yang Reported-by: Swen Schillig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afa9b649aa699297258dbb67aaae651c9ad4245f Author: Krzysztof Helt Date: Tue Aug 12 15:08:57 2008 -0700 fbcon: prevent cursor disappearance after switching to 512 character font Adjust and honor the vc_scrl_erase_char for 256 and 512 character fonts. It fixes the issue with disappearing cursor during scrolling (http://bugzilla.kernel.org/show_bug.cgi?id=11258). The issue was reported and tracked by Peter Hanzel. Signed-off-by: Krzysztof Helt Reported-by: Peter Hanzel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea757acad5a5183c65a3e1b28b49a5978fe6a052 Author: Haavard Skinnemoen Date: Tue Aug 12 15:08:57 2008 -0700 atmel_lcdfb: add board parameter specify framebuffer memory size Specify how much physically continuous, DMA capable memory will be allocated at driver initialization time. This allow to create framebuffer device with larger virtual resolution. Combine with y-panning this can be used to implement double buffering acceleration method. Signed-off-by: Stanislaw Gruszka Acked-by: Haavard Skinnemoen Acked-by: Krzysztof Helt Cc: Nicolas Ferre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e730d8b0a5882b66c169e1bed09774d5d365e2e0 Author: Haavard Skinnemoen Date: Tue Aug 12 15:08:56 2008 -0700 atmel_lcdfb: set ypanstep to 1 and enable y-panning on AT91 Panning in the y-direction can be done by simply changing the DMA base address. This code is already in place, but FBIOPAN_DISPLAY will currently fail because ypanstep is 0. Set ypanstep to 1 to indicate that we do support y-panning and also set the necessary acceleration flags on AT91 (AVR32 already have them.) Signed-off-by: Haavard Skinnemoen Acked-by: Krzysztof Helt Cc: Nicolas Ferre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10546355323e4826d13e62f85ac6198385a817a9 Author: Jean Delvare Date: Tue Aug 12 15:08:55 2008 -0700 matrox maven: convert to a new-style i2c driver The legacy i2c model is going away soon, so switch to the new model. Signed-off-by: Jean Delvare Acked-by: Krzysztof Helt Cc: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73b7d92f6106e2f55206b8672e5ccf6206689899 Author: Jean Delvare Date: Tue Aug 12 15:08:54 2008 -0700 matroxfb: i2c structure templates clean-up Clean up the use of structure templates in i2c-matroxfb. In this case it's more efficient to initialize the few fields we need individually. This makes i2c-matroxfb.ko 16% smaller on my system. Signed-off-by: Jean Delvare Acked-by: Krzysztof Helt Cc: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ede40f87957c6ededf9284c8339722a97b9dfb6 Author: Jean Delvare Date: Tue Aug 12 15:08:53 2008 -0700 matrox maven: fix a broken error path I broke an error path with d03c21ec0be7787ff6b75dcf56c0e96209ccbfbd, sorry about that. The machine will crash if the i2c_attach_client() or maven_init_client() calls fail, although nobody has yet reported this happening. Signed-off-by: Jean Delvare Acked-by: Krzysztof Helt Cc: Petr Vandrovec Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6bf73e4340f52159c1d9f13836b62e20fcd12d3 Author: MinChan Kim Date: Tue Aug 12 15:08:52 2008 -0700 do_migrate_pages(): remove unused variable Signed-off-by: MinChan Kim Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a4ad39b3de60ad0e75a78098be0f0eb1722b753 Author: Randy Dunlap Date: Tue Aug 12 15:08:51 2008 -0700 GRU: fix preprocessor symbol for sparse Fix preprocessor symbol so that sparse sees it and does not generate errors: drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" drivers/misc/sgi-gru/grutlbpurge.c:185:11: error: undefined identifier 'GRUREGION' drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" drivers/misc/sgi-gru/grutables.h:286:2: error: "Unsupported architecture" Signed-off-by: Randy Dunlap Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 969830b2fedf8336c41d6195f49d250b1e166ff8 Author: David Miller Date: Tue Aug 12 15:08:51 2008 -0700 radeonfb: fix accel engine hangs Some chips appear to have the 2D engine hang during screen redraw, typically in a sequence of copyarea operations. This appear to be solved by adding a flush of the engine destination pixel cache and waiting for the engine to be idle before issuing the accel operation. The performance impact seems to be fairly small. Here is a trace on an RV370 (PCI device ID 0x5b64), it records the RBBM_STATUS register, then the source x/y, destination x/y, and width/height used for the copy: ---------------------------------------- radeonfb_prim_copyarea: STATUS[00000140] src[210:70] dst[210:60] wh[a0:10] radeonfb_prim_copyarea: STATUS[00000140] src[2b8:70] dst[2b8:60] wh[88:10] radeonfb_prim_copyarea: STATUS[00000140] src[348:70] dst[348:60] wh[40:10] radeonfb_prim_copyarea: STATUS[80020140] src[390:70] dst[390:60] wh[88:10] radeonfb_prim_copyarea: STATUS[8002613f] src[40:80] dst[40:70] wh[28:10] radeonfb_prim_copyarea: STATUS[80026139] src[a8:80] dst[a8:70] wh[38:10] radeonfb_prim_copyarea: STATUS[80026133] src[e8:80] dst[e8:70] wh[80:10] radeonfb_prim_copyarea: STATUS[8002612d] src[170:80] dst[170:70] wh[30:10] radeonfb_prim_copyarea: STATUS[80026127] src[1a8:80] dst[1a8:70] wh[8:10] radeonfb_prim_copyarea: STATUS[80026121] src[1b8:80] dst[1b8:70] wh[88:10] radeonfb_prim_copyarea: STATUS[8002611b] src[248:80] dst[248:70] wh[68:10] ---------------------------------------- When things are going fine the copies complete before the next ROP is even issued, but all of a sudden the 2D unit becomes active (bit 17 in RBBM_STATUS) and the FIFO retry (bit 13) and FIFO pipeline busy (bit 14) are set as well. The FIFO begins to backup until it becomes full. What happens next is the radeon_fifo_wait() times out, and we access the chip illegally leading to a bus error which usually wedges the box. None of this makes it to the console screen, of course :-) radeon_fifo_wait() should be modified to reset the accelerator when this timeout happens instead of programming the chip anyways. ---------------------------------------- radeonfb: FIFO Timeout ! ERROR(0): Cheetah error trap taken afsr[0010080005000000] afar[000007f900800e40] TL1(0) ERROR(0): TPC[595114] TNPC[595118] O7[459788] TSTATE[11009601] ERROR(0): TPC ERROR(0): M_SYND(0), E_SYND(0), Privileged ERROR(0): Highest priority error (0000080000000000) "Bus error response from system bus" ERROR(0): D-cache idx[0] tag[0000000000000000] utag[0000000000000000] stag[0000000000000000] ERROR(0): D-cache data0[0000000000000000] data1[0000000000000000] data2[0000000000000000] data3[0000000000000000] ERROR(0): I-cache idx[0] tag[0000000000000000] utag[0000000000000000] stag[0000000000000000] u[0000000000000000] l[00\ ERROR(0): I-cache INSN0[0000000000000000] INSN1[0000000000000000] INSN2[0000000000000000] INSN3[0000000000000000] ERROR(0): I-cache INSN4[0000000000000000] INSN5[0000000000000000] INSN6[0000000000000000] INSN7[0000000000000000] ERROR(0): E-cache idx[800e40] tag[000000000e049f4c] ERROR(0): E-cache data0[fffff8127d300180] data1[00000000004b5384] data2[0000000000000000] data3[0000000000000000] Ker:xnel panic - not syncing: Irrecoverable deferred error trap. ---------------------------------------- Another quirk is that these copyarea calls will not happen until the first drivers/char/vt.c:redraw_screen() occurs. This will only happen if you 1) VC switch or 2) run "consolechars" or 3) unblank the screen. This seems to happen because until a redraw_screen() the screen scrolling method used by fbcon is not finalized yet. I've seen this with other fb drivers too. So if all you do is boot straight into X you will never see this bug on the relevant chips. Signed-off-by: David S. Miller Signed-off-by: Benjamin Herrenschmidt Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b26736c88db85c038e04c2306d0745553e69602 Author: Andy Whitcroft Date: Tue Aug 12 15:08:49 2008 -0700 allocate structures for reservation tracking in hugetlbfs outside of spinlocks v2 [Andrew this should replace the previous version which did not check the returns from the region prepare for errors. This has been tested by us and Gerald and it looks good. Bah, while reviewing the locking based on your previous email I spotted that we need to check the return from the vma_needs_reservation call for allocation errors. Here is an updated patch to correct this. This passes testing here.] Signed-off-by: Andy Whitcroft Tested-by: Gerald Schaefer Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57303d80175e10056bf51206f9961d586f02f967 Author: Andy Whitcroft Date: Tue Aug 12 15:08:47 2008 -0700 hugetlbfs: allocate structures for reservation tracking outside of spinlocks In the normal case, hugetlbfs reserves hugepages at map time so that the pages exist for future faults. A struct file_region is used to track when reservations have been consumed and where. These file_regions are allocated as necessary with kmalloc() which can sleep with the mm->page_table_lock held. This is wrong and triggers may-sleep warning when PREEMPT is enabled. Updates to the underlying file_region are done in two phases. The first phase prepares the region for the change, allocating any necessary memory, without actually making the change. The second phase actually commits the change. This patch makes use of this by checking the reservations before the page_table_lock is taken; triggering any necessary allocations. This may then be safely repeated within the locks without any allocations being required. Credit to Mel Gorman for diagnosing this failure and initial versions of the patch. Signed-off-by: Andy Whitcroft Tested-by: Gerald Schaefer Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff1a4a7b14ae146142b1c93a001304caf662ae13 Author: Parag Warudkar Date: Tue Aug 12 15:08:46 2008 -0700 isight_firmware: fix a leak and double kfree() Signed-off-by: Parag Warudkar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66198f36aac21533245a77aac4a8f7c8c509d8bd Author: Rabin Vincent Date: Tue Aug 12 15:08:45 2008 -0700 cpuidle: make sysfs attributes sysdev class attributes These attributes are really sysdev class attributes. The incorrect definition leads to an oops because of recent changes which make sysdev attributes use a different prototype. Based on Andi's f718cd4add5aea9d379faff92f162571e356cc5f ("sched: make scheduler sysfs attributes sysdev class devices") Reported-by: Eric Sesterhenn Signed-off-by: Rabin Vincent Acked-by: Andi Kleen Cc: "Li, Shaohua" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 001e979d8f0c8fa04b5f01e829805dcd49d9416b Author: Alessandro Zummo Date: Tue Aug 12 15:08:44 2008 -0700 rtc-isl1208: fix double removal of a sysfs entry Signed-off-by: Alessandro Zummo Cc: Herbert Valerio Riedel Cc: Hartley Sweeten Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de15e9110b760c91a32197c4e4c88c32235ece1 Author: Yoshinori Sato Date: Tue Aug 12 15:08:43 2008 -0700 h8300: fix section mismatches WARNING: vmlinux.o(.text+0x2fdf): Section mismatch in reference from the variable .LM3 to the variable .init.text:___alloc_bootmem The function .LM3() references the variable __init ___alloc_bootmem. This is often because .LM3 lacks a __init annotation or the annotation of ___alloc_bootmem is wrong. WARNING: vmlinux.o(.text+0x2ff5): Section mismatch in reference from the variable .LM4 to the variable .init.text:___alloc_bootmem The function .LM4() references the variable __init ___alloc_bootmem. This is often because .LM4 lacks a __init annotation or the annotation of ___alloc_bootmem is wrong. WARNING: vmlinux.o(.text+0x300b): Section mismatch in reference from the variable .LM5 to the variable .init.text:___alloc_bootmem The function .LM5() references the variable __init ___alloc_bootmem. This is often because .LM5 lacks a __init annotation or the annotation of ___alloc_bootmem is wrong. WARNING: vmlinux.o(.text+0x304b): Section mismatch in reference from the variable .LM10 to the variable .init.text:_free_area_init The function .LM10() references the variable __init _free_area_init. This is often because .LM10 lacks a __init annotation or the annotation of _free_area_init is wrong. WARNING: vmlinux.o(.text+0x30a3): Section mismatch in reference from the variable .LM17 to the variable .init.text:_free_all_bootmem The function .LM17() references the variable __init _free_all_bootmem. This is often because .LM17 lacks a __init annotation or the annotation of _free_all_bootmem is wrong. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1c3c898274334a9255445ba0636d13eda8399d7 Author: David Brownell Date: Tue Aug 12 15:08:41 2008 -0700 revert "rtc: cdev lock_kernel() pushdown" Revert commit 51a776fa7a7997e726d4a478eda0854c6f9143bd ("rtc: cdev lock_kernel() pushdown"). The RTC framework does not need BKL protection. Signed-off-by: David Brownell Cc: Jonathan Corbet Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9623e078c1f4692a91531af2f639ec8aff8f0472 Author: Hugh Dickins Date: Tue Aug 12 15:08:41 2008 -0700 memcg: fix oops in mem_cgroup_shrink_usage Got an oops in mem_cgroup_shrink_usage() when testing loop over tmpfs: yes, of course, loop0 has no mm: other entry points check but this didn't. Signed-off-by: Hugh Dickins Cc: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ee1062b4ee82a56294808a065b64f4bc6781a56 Author: Heiko Carstens Date: Tue Aug 12 15:08:40 2008 -0700 cpu hotplug: s390 doesn't support additional_cpus anymore. s390 doesn't support the additional_cpus kernel parameter anymore since a long time. So we better update the code and documentation to reflect that. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74768ed833344bb0f82b97cee46320a3d7f09ecd Author: Jan Beulich Date: Tue Aug 12 15:08:39 2008 -0700 page allocator: use no-panic variant of alloc_bootmem() in alloc_large_system_hash() .. since a failed allocation is being (initially) handled gracefully, and panic()-ed upon failure explicitly in the function if retries with smaller sizes failed. Signed-off-by: Jan Beulich Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 866c36637f79506b283a6872a7c313b5ef499985 Author: Jan Kara Date: Tue Aug 12 15:08:39 2008 -0700 quota: documentation for sending "below quota" messages via netlink and tiny doc update Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caff3a2c333e11a794308bd9a875a09b94fee24a Author: Gerald Schaefer Date: Tue Aug 12 15:08:38 2008 -0700 hugetlb: call arch_prepare_hugepage() for surplus pages The s390 software large page emulation implements shared page tables by using page->index of the first tail page from a compound large page to store page table information. This is set up in arch_prepare_hugepage(), which is called from alloc_fresh_huge_page_node(). A similar call to arch_prepare_hugepage() is missing for surplus large pages that are allocated in alloc_buddy_huge_page(), which breaks the software emulation mode for (surplus) large pages on s390. This patch adds the missing call to arch_prepare_hugepage(). It will have no effect on other architectures where arch_prepare_hugepage() is a nop. Also, use the correct order in the error path in alloc_fresh_huge_page_node(). Acked-by: Martin Schwidefsky Signed-off-by: Gerald Schaefer Acked-by: Nick Piggin Acked-by: Adam Litke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02eb7eeb8990b9cbd32c7bc1ef2d431ca390e44a Author: Adrian Bunk Date: Tue Aug 12 15:08:37 2008 -0700 feature-removal-schedule.txt: remove the NCR53C9x entry Now that the driver is removed we should also remove the entry in Documentation/feature-removal-schedule.txt Signed-off-by: Adrian Bunk Acked-by: Christoph Hellwig Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a3eae0d66591572f771b9383e96ecacacee0abd Merge: 6773f07... b140406... Author: Roland Dreier Date: Tue Aug 12 13:52:54 2008 -0700 Merge branches 'ehca' and 'ipoib' into for-linus commit 430ac5ba9c74f236ddd695b1282a889630cb4f91 Author: Adrian Bunk Date: Fri Aug 8 19:34:45 2008 +0300 [IA64] use bcd2bin/bin2bcd This patch changes ia64 to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD2BIN/BIN2BCD macros. Signed-off-by: Adrian Bunk Signed-off-by: Tony Luck commit 6773f079b72ab0200fe9afa9bb0c656a6af5400c Author: Alexander Schmidt Date: Tue Aug 12 15:46:30 2008 +0200 IB/ehca: Discard double CQE for one WR Under rare circumstances, the ehca hardware might erroneously generate two CQEs for the same WQE, which is not compliant to the IB spec and will cause unpredictable errors like memory being freed twice. To avoid this problem, the driver needs to detect the second CQE and discard it. For this purpose, introduce an array holding as many elements as the SQ of the QP, called sq_map. Each sq_map entry stores a "reported" flag for one WQE in the SQ. When a work request is posted to the SQ, the respective "reported" flag is set to zero. After the arrival of a CQE, the flag is set to 1, which allows to detect the occurence of a second CQE. The mapping between WQE / CQE and the corresponding sq_map element is implemented by replacing the lowest 16 Bits of the wr_id with the index in the queue map. The original 16 Bits are stored in the sq_map entry and are restored when the CQE is passed to the application. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 129a10fb81309f455eeb444560ec38657d29c46f Author: Alexander Schmidt Date: Tue Aug 12 15:46:27 2008 +0200 IB/ehca: Check idr_find() return value The idr_find() function may fail when trying to get the QP that is associated with a CQE, e.g. when a QP has been destroyed between the generation of a CQE and the poll request for it. In consequence, the return value of idr_find() must be checked and the CQE must be discarded when the QP cannot be found. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 17c2b53adbf1ebd7a8b6a63e2597199676426dbf Author: Alexander Schmidt Date: Tue Aug 12 15:46:20 2008 +0200 IB/ehca: Repoll CQ on invalid opcode When the ehca driver detects an invalid opcode in a CQE, it currently passes the CQE to the application and returns with success. This patch changes the CQE handling to discard CQEs with invalid opcodes and to continue reading the next CQE from the CQ. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 6c02eed9302e7c27ee150d7911b83843c2206148 Author: Alexander Schmidt Date: Tue Aug 12 15:46:13 2008 +0200 IB/ehca: Rename goto label in ehca_poll_cq_one() Rename the "poll_cq_one_read_cqe" goto label to what it actually does, namely "repoll". Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 51ad241af45a0bfc02d1ed72a3ad58b46f8e30df Author: Alexander Schmidt Date: Tue Aug 12 15:46:07 2008 +0200 IB/ehca: Update qp_state on cached modify_qp() Since the introduction of the port auto-detect mode for ehca, calls to modify_qp() may be cached in the device driver when the ports are not activated yet. When a modify_qp() call is cached, the qp state remains untouched until the port is activated, which will leave the qp in the reset state. In the reset state, however, it is not allowed to post SQ WQEs, which confuses applications like ib_mad. The solution for this problem is to immediately set the qp state as requested by modify_qp(), even when the call is cached. Signed-off-by: Alexander Schmidt Signed-off-by: Roland Dreier commit 10617bbe84628eb18ab5f723d3ba35005adde143 Author: Tony Luck Date: Tue Aug 12 10:34:20 2008 -0700 [IA64] Ensure cpu0 can access per-cpu variables in early boot code ia64 handles per-cpu variables a litle differently from other architectures in that it maps the physical memory allocated for each cpu at a constant virtual address (0xffffffffffff0000). This mapping is not enabled until the architecture specific cpu_init() function is run, which causes problems since some generic code is run before this point. In particular when CONFIG_PRINTK_TIME is enabled, the boot cpu will trap on the access to per-cpu memory at the first printk() call so the boot will fail without the kernel printing anything to the console. Fix this by allocating percpu memory for cpu0 in the kernel data section and doing all initialization to enable percpu access in head.S before calling any generic code. Other cpus must take care not to access per-cpu variables too early, but their code path from start_secondary() to cpu_init() is all in arch/ia64 Signed-off-by: Tony Luck commit 45fc3c4d9b7ab12798af43a73aea53eeecd16acf Merge: 9634885... 9e6dd47... Author: Linus Torvalds Date: Tue Aug 12 09:14:24 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - support new AMD HDMI Audio (1002:970f) ALSA: hda_intel: ALSA HD Audio patch for Intel Ibex Peak DeviceIDs ALSA: wm8750: add missing VREF output ALSA: spitz: MONO -> MONO1 ALSA: wm8750: it's MONO1, not MONO commit 96348852cf8ff5597a39e866838679b3a9a38947 Merge: 1c89ac5... c2fc119... Author: Linus Torvalds Date: Tue Aug 12 08:49:53 2008 -0700 Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: fix stack and rcu interaction bug in smp_call_function_mask(), fix commit 1c89ac55017f982355c7761e1c912c88c941483d Merge: 88fa08f... b1b135c... Author: Linus Torvalds Date: Tue Aug 12 08:40:19 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: fix spinlock recursion in hvc_console stop_machine: remove unused variable modules: extend initcall_debug functionality to the module loader export virtio_rng.h lguest: use get_user_pages_fast() instead of get_user_pages() mm: Make generic weak get_user_pages_fast and EXPORT_GPL it lguest: don't set MAC address for guest unless specified commit 88fa08f67bee1a0c765237bdac106a32872f57d2 Merge: 1ea2950... 9139758... Author: Linus Torvalds Date: Tue Aug 12 08:28:32 2008 -0700 Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: fix SIS 5591/5592 wrong PCI id intel/agp: rewrite GTT on resume agp: use dev_printk when possible amd64-agp: run fallback when no bridges found, not when driver registration fails intel_agp: official name for GM45 chipset commit 9e6dd47bf365f8f7bccea10f22fbbdbecce429e8 Author: Libin Yang Date: Tue Aug 12 12:25:46 2008 +0200 ALSA: hda - support new AMD HDMI Audio (1002:970f) Signed-off-by: Libin Yang Signed-off-by: Takashi Iwai commit b29c2360f11060a8e3fe09b16b550494d979371b Author: Seth Heasley Date: Fri Aug 8 15:56:39 2008 -0700 ALSA: hda_intel: ALSA HD Audio patch for Intel Ibex Peak DeviceIDs This patch adds the Intel Ibex Peak (PCH) HD Audio Controller DeviceIDs. Signed-off by: Seth Heasley Signed-off-by: Takashi Iwai commit 04489eeb02a40bc15029886cef7285ada3ab0de6 Author: Dmitry Baryshkov Date: Tue Aug 12 02:45:31 2008 +0400 ALSA: wm8750: add missing VREF output Add missing output VREF. After a65f0568f6cc8433877fb71dd7d36b551854b0bc it's critical, since it makes chip routing initialisation to fail. Signed-off-by: Dmitry Baryshkov Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit ea381b7b11f189104af34004c5d832ebe49882cc Author: Dmitry Baryshkov Date: Tue Aug 12 02:45:30 2008 +0400 ALSA: spitz: MONO -> MONO1 Correct route name to be MONO1 instead of MONO to follow recent fix in wm8750. Signed-off-by: Dmitry Baryshkov Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit c2fc11985db304572322f1dcdcb0f71337315006 Author: Nick Piggin Date: Tue Aug 12 18:05:13 2008 +1000 generic-ipi: fix stack and rcu interaction bug in smp_call_function_mask(), fix > > Nick Piggin (1): > > generic-ipi: fix stack and rcu interaction bug in > > smp_call_function_mask() > > I'm still not 100% sure that I have this patch right... I might have seen > a lockup trace implicating the smp call function path... which may have > been due to some other problem or a different bug in the new call function > code, but if some more people can take a look at it before merging? OK indeed it did have a couple of bugs. Firstly, I wasn't freeing the data properly in the alloc && wait case. Secondly, I wasn't resetting CSD_FLAG_WAIT in the for each cpu loop (so only the first CPU would wait). After those fixes, the patch boots and runs with the kmalloc commented out (so it always executes the slowpath). Signed-off-by: Ingo Molnar commit b1b135c8d619cb2c7045d6ee4e48375882518bb5 Author: Christian Borntraeger Date: Thu Aug 7 09:18:34 2008 +0200 fix spinlock recursion in hvc_console commit 611e097d7707741a336a0677d9d69bec40f29f3d Author: Christian Borntraeger hvc_console: rework setup to replace irq functions with callbacks introduced a spinlock recursion problem. request_irq tries to call the handler if the IRQ is shared. The irq handler of hvc_console calls hvc_poll and hvc_kill which might take the hvc_struct spinlock. Therefore, we have to call request_irq outside the spinlock. We can move the notifier_add safely outside the spinlock as ->data must not be changed by the backend. Otherwise, tty_hangup would fail anyway. Signed-off-by: Christian Borntraeger Signed-off-by: Rusty Russell commit ed6d68763b8b589c0ae9d231cbd72bd01f6685c5 Author: Li Zefan Date: Thu Jul 31 10:31:02 2008 +0800 stop_machine: remove unused variable Signed-off-by: Li Zefan Signed-off-by: Rusty Russell commit 59f9415ffb9759e950d775f4c400f747b332cc02 Author: Arjan van de Ven Date: Wed Jul 30 12:49:02 2008 -0700 modules: extend initcall_debug functionality to the module loader The kernel has this really nice facility where if you put "initcall_debug" on the kernel commandline, it'll print which function it's going to execute just before calling an initcall, and then after the call completes it will 1) print if it had an error code 2) checks for a few simple bugs (like leaving irqs off) and 3) print how long the init call took in milliseconds. While trying to optimize the boot speed of my laptop, I have been loving number 3 to figure out what to optimize... ... and then I wished that the same thing was done for module loading. This patch makes the module loader use this exact same functionality; it's a logical extension in my view (since modules are just sort of late binding initcalls anyway) and so far I've found it quite useful in finding where things are too slow in my boot. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Rusty Russell commit 4bceba417a795b78a5146e3f85291cb7bb2402ef Author: Christian Borntraeger Date: Fri Aug 8 11:15:07 2008 +0200 export virtio_rng.h Hello Rusty, The entropy device was added after we exported all virtio headers. This patch adds virtio_rng.h to the exportable userspace headers. Signed-off-by: Christian Borntraeger Signed-off-by: Rusty Russell commit 71a3f4edc11b9dd7af28d003acbbd33496003da1 Author: Rusty Russell Date: Tue Aug 12 17:52:53 2008 -0500 lguest: use get_user_pages_fast() instead of get_user_pages() Using a simple page table thrashing program I measure a slight improvement. The program creates five processes. Each touches 1000 pages then schedules the next process. We repeat this 1000 times. As lguest only caches 4 cr3 values, this rebuilds a lot of shadow page tables requiring virt->phys mappings. Before: 5.93 seconds After: 5.40 seconds (Counts of slow vs fastpath in this usage are 6092 and 2852462 respectively.) And more importantly for lguest, the code is simpler. Signed-off-by: Rusty Russell commit 912985dce45ef18fcdd9f5439fef054e0e22302a Author: Rusty Russell Date: Tue Aug 12 17:52:52 2008 -0500 mm: Make generic weak get_user_pages_fast and EXPORT_GPL it Out of line get_user_pages_fast fallback implementation, make it a weak symbol, get rid of CONFIG_HAVE_GET_USER_PAGES_FAST. Export the symbol to modules so lguest can use it. Signed-off-by: Nick Piggin Signed-off-by: Rusty Russell commit 40c42076ebd362dc69210cccea101ac80b6d4bd4 Author: Rusty Russell Date: Tue Aug 12 17:52:51 2008 -0500 lguest: don't set MAC address for guest unless specified This shows up when trying to bridge: tap0: received packet with own address as source address As Max Krasnyansky points out, there's no reason to give the guest the same mac address as the TUN device. Signed-off-by: Rusty Russell Cc: Max Krasnyansky commit 91397585e3fb47b3900e17d70c6edc356e36bb46 Author: Krzysztof Helt Date: Wed Aug 6 18:48:45 2008 +0200 agp: fix SIS 5591/5592 wrong PCI id The correct id is the id of the main host (5591) not the id of the PCI-to-PCI bridge AGP (0001). Output from "lspci -nv" shows that only the former has AGP capabilities flag set: 00:00.0 0600: 1039:5591 (rev 02) Flags: bus master, medium devsel, latency 64 Memory at ec000000 (32-bit, non-prefetchable) [size=32M] Capabilities: [c0] AGP version 1.0 00:02.0 0604: 1039:0001 (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 0000c000-0000cfff Memory behind bridge: eb500000-eb5fffff Prefetchable memory behind bridge: eb300000-eb3fffff Signed-off-by: Krzysztof Helt Signed-off-by: Dave Airlie commit a8c84df9f71e4a7b14bdd41687a70d366c087eef Author: Keith Packard Date: Thu Jul 31 15:48:07 2008 +1000 intel/agp: rewrite GTT on resume On my Intel chipset (965GM), the GTT is entirely erased across suspend/resume. This patch simply re-plays the current mapping at resume time to restore the table.=20 I noticed this once I started relying on persistent GTT mappings across VT switch in our GEM work -- the old X server and DRM code carefully unbind all memory from the GTT on VT switch, but GEM does not bother. I placed the list management and rewrite code in the generic layer on the assumption that it will be needed on other hardware, but I did not add the rewrite call to anything other than the Intel resume function. Keep a list of current GATT mappings. At resume time, rewrite them into the GATT. This is needed on Intel (at least) as the entire GATT is cleared across suspend/resume. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Keith Packard Cc: Dave Jones Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit e3cf69511a2c5369c58f6fd6a065de152c3d4b22 Author: Bjorn Helgaas Date: Wed Jul 30 12:26:51 2008 -0700 agp: use dev_printk when possible Convert printks to use dev_printk(). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 55814b74c95a73dae6795e167294e6edc733aae9 Author: Bjorn Helgaas Date: Wed Jul 30 12:26:51 2008 -0700 amd64-agp: run fallback when no bridges found, not when driver registration fails I think the intent was that if no bridges matched agp_amd64_pci_table[], we would fall back to checking for any bridge with the AGP capability. But in the current code, we execute the fallback path only when pci_register_driver() itself fails, which is unrelated to whether any matching devices were found. This patch counts the AGP bridges found in the probe() method and executes the fallback path when none is found. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 99d32bd5c7b1caa05d1fe3c89b08aabd459bc12a Author: Zhenyu Wang Date: Wed Jul 30 12:26:50 2008 -0700 intel_agp: official name for GM45 chipset Signed-off-by: Zhenyu Wang Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 1ea2950884aa320c46315c8ddf62717c6ecf78d0 Merge: 67a077d... e26b33e... Author: Linus Torvalds Date: Mon Aug 11 16:46:31 2008 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks sched: fix mysql+oltp regression sched_clock: delay using sched_clock() sched clock: couple local and remote clocks sched clock: simplify __update_sched_clock() sched: eliminate scd->prev_raw sched clock: clean up sched_clock_cpu() sched clock: revert various sched_clock() changes sched: move sched_clock before first use sched: test runtime rather than period in global_rt_runtime() sched: fix SCHED_HRTICK dependency sched: fix warning in hrtick_start_fair() commit 67a077dca4e648a662e32cbeaaba8094d2e30229 Merge: 9b4d0ba... 2106b53... Author: Linus Torvalds Date: Mon Aug 11 16:46:11 2008 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers: fix posix_timer_event() vs dequeue_signal() race posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun commit 9b4d0bab32e18e4f72781f9fa309a81495b2aff3 Merge: 7019b1b... 23a0ee9... Author: Linus Torvalds Date: Mon Aug 11 16:45:46 2008 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: fix debug_lock_alloc lockdep: increase MAX_LOCKDEP_KEYS generic-ipi: fix stack and rcu interaction bug in smp_call_function_mask() lockdep: fix overflow in the hlock shrinkage code lockdep: rename map_[acquire|release]() => lock_map_[acquire|release]() lockdep: handle chains involving classes defined in modules mm: fix mm_take_all_locks() locking order lockdep: annotate mm_take_all_locks() lockdep: spin_lock_nest_lock() lockdep: lock protection locks lockdep: map_acquire lockdep: shrink held_lock structure lockdep: re-annotate scheduler runqueues lockdep: lock_set_subclass - reset a held lock's subclass lockdep: change scheduler annotation debug_locks: set oops_in_progress if we will log messages. lockdep: fix combinatorial explosion in lock subgraph traversal commit 7019b1b50097a94d0f8a77b81bee0b19b108c634 Merge: f08c076... b74548e... Author: Linus Torvalds Date: Mon Aug 11 16:44:35 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix 2.6.27rc1 cannot boot more than 8CPUs x86: make "apic" an early_param() on 32-bit, NULL check EFI, x86: fix function prototype x86, pci-calgary: fix function declaration x86: work around gcc 3.4.x bug x86: make "apic" an early_param() on 32-bit x86, debug: tone down arch/x86/kernel/mpparse.c debugging printk x86_64: restore the proper NR_IRQS define so larger systems work. x86: Restore proper vector locking during cpu hotplug x86: Fix broken VMI in 2.6.27-rc.. x86: fdiv bug detection fix commit 23a0ee908cbfba3264d19729c67c22b20fa73886 Merge: cc7a486... 0f2bc27... Author: Ingo Molnar Date: Tue Aug 12 00:11:49 2008 +0200 Merge branch 'core/locking' into core/urgent commit e26b33e9552c29c1d3fe67dc602c6264c29f5dc7 Merge: 279ef6b... cf206bf... Author: Ingo Molnar Date: Tue Aug 12 00:07:02 2008 +0200 Merge branch 'sched/clock' into sched/urgent commit 0f2bc27be27ca1dcc66b96131e44bf7648b959c6 Author: Peter Zijlstra Date: Mon Aug 11 22:45:51 2008 +0200 lockdep: fix debug_lock_alloc When we enable DEBUG_LOCK_ALLOC but do not enable PROVE_LOCKING and or LOCK_STAT, lock_alloc() and lock_release() turn into nops, even though we should be doing hlock checking (check=1). This causes a false warning and a lockdep self-disable. Rectify this. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit b74548e76a0eab1f29546e7c5a589429c069a680 Author: Yinghai Lu Date: Mon Aug 11 13:36:04 2008 -0700 x86: fix 2.6.27rc1 cannot boot more than 8CPUs Jeff Chua reported that booting a !bigsmp kernel on a 16-way box hangs silently. this is a long-standing issue, smp start AP cpu could check the apic id >=8 etc before trying to start it. achieve this by moving the def_to_bigsmp check later and skip the apicid id > 8 [ mingo@elte.hu: clean up the message that is printed. ] Reported-by: "Jeff Chua" Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar arch/x86/kernel/setup.c | 6 ------ arch/x86/kernel/smpboot.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) commit f08c0761d6ff79e2f4c81f95fd01b761e0410785 Author: Adrian Bunk Date: Mon Aug 11 11:59:21 2008 -0700 make struct scsi_dh_devlist's static This patch makes several needlessly global struct scsi_dh_devlist's static. Signed-off-by: Adrian Bunk Signed-off-by: Chandra Seetharaman Signed-off-by: Linus Torvalds commit 10fec20ef5eec1c91913baec1225400f0d02df40 Merge: 29bb1bd... 25d6cbd... Author: Linus Torvalds Date: Mon Aug 11 10:44:43 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: tc6393 cleanup and update mfd: have TMIO drivers and subdevices depend on ARM mfd: TMIO MMC driver mfd: driver for the TMIO NAND controller mfd: t7l66 MMC platform data mfd: tc6387 MMC platform data mfd: Fix 7l66 and 6387 according to the new mfd-core API mfd: Fix tc6393 according to the new tmio.h mfd: driver for the TC6387XB TMIO controller. mfd: driver for the T7L66XB TMIO SoC mfd: TMIO MMC structures and accessors. commit 29bb1bdb260cd504c6ec0f567cc0cba6a4cf40e7 Merge: 3f1ae22... 8ff69ee... Author: Linus Torvalds Date: Mon Aug 11 10:44:13 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (lm75) Drop legacy i2c driver i2c: correct some size_t printk formats i2c: Check for address business before creating clients i2c: Let users select algorithm drivers manually again i2c: Fix NULL pointer dereference in i2c_new_probed_device i2c: Fix oops on bus multiplexer driver loading commit 3f1ae223902834d81b54b5d333f9efca07ad656b Merge: e2205a1... 36cbaa8... Author: Linus Torvalds Date: Mon Aug 11 10:42:43 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] pcwd.c - fix open_allowed type. [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation [WATCHDOG] fix watchdog/wdt285.c compilation [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation [WATCHDOG] fix watchdog/shwdt.c compilation [WATCHDOG] fix watchdog/txx9wdt.c compilation [WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry [WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n commit 48d97cb65e62a5f1122ac2cf1149800d4f4693e8 Author: Rene Herman Date: Mon Aug 11 19:20:17 2008 +0200 x86: make "apic" an early_param() on 32-bit, NULL check Cyrill Gorcunov observed: > you turned it into early_param so now it's NULL injecting vulnerabled. > Could you please add checking for NULL str param? fix that. Also, change the name of 'str' into 'arg', to make it more apparent that this is an optional argument that can be NULL, not a string parameter that is empty when unset. Reported-by: Cyrill Gorcunov Signed-off-by: Rene Herman Signed-off-by: Ingo Molnar commit e2205a156f4dd727097f7f492bf03aa8920b0071 Merge: a7ef6a4... 13fa00a... Author: Linus Torvalds Date: Mon Aug 11 10:40:28 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Remove include/linux/harrier_defs.h powerpc: Do not ignore arch/powerpc/include powerpc: Delete completed "ppc removal" task from feature removal file powerpc/mm: Fix attribute confusion with htab_bolt_mapping() powerpc/pci: Don't keep ISA memory hole resources in the tree powerpc: Zero fill the return values of rtas argument buffer powerpc/4xx: Update defconfig files for 2.6.27-rc1 powerpc/44x: Incorrect NOR offset in Warp DTS powerpc/44x: Warp DTS changes for board updates powerpc/4xx: Cleanup Warp for i2c driver changes. powerpc/44x: Adjust warp-nand resource end address commit a7ef6a40f700496c60b8f7206fff74fecd67b3a2 Merge: 000b915... 35405f2... Author: Linus Torvalds Date: Mon Aug 11 10:38:36 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Limit VPD length for Broadcom 5708S PCI PM: Export pci_pme_active to drivers PCI: remove duplicate symbol from pci_ids.h PCI: check the return value of device_create_bin_file() in pci_create_bus() PCI: fully restore MSI state at resume time DMA: make dma-coherent.c documentation kdoc-friendly PCI: make pci_register_driver() a macro PCI: add Broadcom 5708S to VPD length quirk commit 000b9151d7851cc1e490b2a76d0206e524f43cca Author: Christian Borntraeger Date: Mon Aug 11 09:02:49 2008 +0100 Fix race/oops in tty layer after BKL pushdown While testing our KVM code for s390 (starting and killall kvm in a loop) I can reproduce the following oops: Unable to handle kernel pointer dereference at virtual kernel address 6b6b6b6b6b6b6000 Oops: 0038 [#1] SMP Modules linked in: dm_multipath sunrpc qeth_l3 qeth_l2 dm_mod qeth ccwgroup CPU: 1 Not tainted 2.6.27-rc1 #54 Process kuli (pid: 4409, task: 00000000b6aa5940, ksp: 00000000b7343e10) Krnl PSW : 0704e00180000000 00000000002e0b8c (disassociate_ctty+0x1c0/0x288) R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 EA:3 Krnl GPRS: 0000000000000000 6b6b6b6b6b6b6b6b 0000000000000001 00000000000003a6 00000000002e0a46 00000000004b4160 0000000000000001 00000000bbd79758 00000000b7343e58 00000000b8854148 00000000bd34dea0 00000000b7343c20 0000000000000001 00000000004b6d08 00000000002e0a46 00000000b7343c20 Krnl Code: 00000000002e0b7e: eb9fb0a00004 lmg %r9,%r15,160(%r11) 00000000002e0b84: 07f4 bcr 15,%r4 00000000002e0b86: e31090080004 lg %r1,8(%r9) >00000000002e0b8c: d501109cd000 clc 156(2,%r1),0(%r13) 00000000002e0b92: a784ff5d brc 8,2e0a4c 00000000002e0b96: b9040029 lgr %r2,%r9 00000000002e0b9a: c0e5fffff9c3 brasl %r14,2dff20 00000000002e0ba0: a7f4ff56 brc 15,2e0a4c Call Trace: ([<00000000002e0a46>] disassociate_ctty+0x7a/0x288) [<0000000000141fe6>] do_exit+0x212/0x8d4 [<0000000000142708>] do_group_exit+0x60/0xcc [<0000000000150660>] get_signal_to_deliver+0x270/0x3ac [<000000000010bfd6>] do_signal+0x8e/0x8dc [<0000000000113772>] sysc_sigpending+0xe/0x22 [<000001ff0000b134>] 0x1ff0000b134 INFO: lockdep is turned off. Last Breaking-Event-Address: [<00000000002e0a48>] disassociate_ctty+0x7c/0x288 Kernel panic - not syncing: Fatal exception: panic_on_oops It seems that tty was already free in disassocate_ctty when it tries to dereference tty->driver. After moving the lock_kernel before the mutex_unlock, I can no longer reproduce the problem. [ This is a temporary partial fix for the documented and long standing race in disassociate_tty. This stops most problem cases for now. For the next release the -next tree has an initial implementation of kref counting for tty structures and this quickfix will be dropped. - Alan ] Signed-off-by: Christian Borntraeger Signed-off-by; Alan Cox Signed-off-by: Linus Torvalds commit 0e7d5bb8480e10f98f89bd1d418a430393b1e995 Author: Geert Uytterhoeven Date: Mon Aug 11 09:00:30 2008 +0200 m68k{,nommu}: Wire up new system calls Wire up for m68k{,nommu} the system calls that were added in the last merge window: - 4006553b06306b34054529477b06b68a1c66249b ("flag parameters: inotify_init") - ed8cae8ba01348bfd83333f4648dd807b04d7f08 ("flag parameters: pipe") - 336dd1f70ff62d7dd8655228caed4c5bfc818c56 ("flag parameters: dup2") - a0998b50c3f0b8fdd265c63e0032f86ebe377dbf ("flag parameters: epoll_create") - 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 ("flag parameters add-on: remove epoll_create size param") - b087498eb5605673b0f260a7620d91818cd72304 ("flag parameters: eventfd") - 9deb27baedb79759c3ab9435a7d8b841842d56e9 ("flag parameters: signalfd") Signed-off-by: Geert Uytterhoeven Acked-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3838f59fc2ea9821f3ea13adb555bfc6ea43c74c Author: Linus Torvalds Date: Mon Aug 11 10:29:11 2008 -0700 Revert "fbcon: bgcolor fix" This reverts commit 2d04a4a72d7e1519b4838f24bdd4b5d0f3f426dc, which made it impossible to make the softcursor use the highlight colors. Yes, the fourth bit should be "blinking", but since we cannot reasonably blink in fbcon, highlighting it with a bright background is preferable. Reported-by: Pavel Machek Cc: Stefano Stabellini Cc: Krzysztof Helt Cc: Antonino A. Daplas Signed-off-by: Linus Torvalds commit b0fbaa6b5976962434349849673b9ff63631b6d4 Author: Randy Dunlap Date: Thu Aug 7 15:12:39 2008 -0700 EFI, x86: fix function prototype Fix function prototype in header file to match source code: linux-next-20080807/arch/x86/kernel/efi_64.c:100:14: error: symbol 'efi_ioremap' redeclared with different type (originally declared at include2/asm/efi.h:89) - different address spaces Signed-off-by: Randy Dunlap Signed-off-by: Ingo Molnar commit 9b0094f7f289d752868aae1a3984517d712cbb22 Author: Randy Dunlap Date: Thu Aug 7 15:14:55 2008 -0700 x86, pci-calgary: fix function declaration Fix function declaration: linux-next-20080807/arch/x86/kernel/pci-calgary_64.c:1353:36: warning: non-ANSI function declaration of function 'get_tce_space_from_tar' Signed-off-by: Randy Dunlap Acked-by: Acked-by: Muli Ben-Yehuda Signed-off-by: Ingo Molnar commit cf3e50501259f9a7cb108a69c3e1b912135628f6 Author: Jeremy Fitzhardinge Date: Fri Aug 8 13:46:07 2008 -0700 x86: work around gcc 3.4.x bug Simon Horman reported that gcc-3.4.x crashes when compiling pgd_prepopulate_pmd() when PREALLOCATED_PMDS == 0 and CONFIG_DEBUG_INFO is enabled. Adding an extra check for PREALLOCATED_PMDS == 0 [which is compiled out by gcc] seems to avoid the problem. Reported-by: Simon Horman Signed-off-by: Jeremy Fitzhardinge Acked-by: Simon Horman Signed-off-by: Ingo Molnar commit fb6bef8002d54a9c3062abc281893ec7c896d3ce Author: Rene Herman Date: Mon Aug 11 17:45:53 2008 +0200 x86: make "apic" an early_param() on 32-bit On 32-bit, "apic" is a __setup() param meaning it is parsed rather late in the game. Make it an early_param() for apic_printk() use by arch/x86/kernel/mpparse.c. On 64-bit, it already is an early_param(). Signed-off-by: Rene Herman Signed-off-by: Ingo Molnar commit eeb0d7d113895556db473ff1e638803d7d49bff9 Author: Rene Herman Date: Mon Aug 11 17:44:57 2008 +0200 x86, debug: tone down arch/x86/kernel/mpparse.c debugging printk commit 11a62a056093a7f25f1595fbd8bd5f93559572b6 turns some formerly nopped debugging printks in arch/x86/kernel/mppparse.c into regular ones. The one at the top of smp_scan_config() in particular also prints on !CONFIG_SMP/CONFIG_X86_LOCAL_APIC kernels and UP machines without anything resembling MP tables which makes their lowly UP owners wonder... Turn the former Dprintk()s into apic_printk()s instead meaning that their printing is dependent on passing the apic=verbose (or =debug) command line param. On 32-bit, "apic" is a __setup() param which isn't early enough for this code and therefore needs a followup changing it into an early_param(). On 64-bit, it already is. Signed-off-by: Rene Herman Cc: Andrew Morton Cc: Yinghai Lu Signed-off-by: Ingo Molnar commit 279ef6bbb8308488398c8f33b04c760148428378 Author: Dmitry Adamushko Date: Wed Jul 30 12:34:04 2008 +0200 sched, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks Mark Langsdorf reported: > One of my co-workers noticed that the powernow-k8 > driver no longer restarts when a CPU core is > hot-disabled and then hot-enabled on AMD quad-core > systems. > > The following comands work fine on 2.6.26 and fail > on 2.6.27-rc1: > > echo 0 > /sys/devices/system/cpu/cpu3/online > echo 1 > /sys/devices/system/cpu/cpu3/online > find /sys -name cpufreq > > For 2.6.26, the find will return a cpufreq > directory for each processor. In 2.6.27-rc1, > the cpu3 directory is missing. > > After digging through the code, the following > logic is failing when the core is hot-enabled > at runtime. The code works during the boot > sequence. > > cpumask_t = current->cpus_allowed; > set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); > if (smp_processor_id() != cpu) > return -ENODEV; So set the CPU active before calling the CPU_ONLINE notifier chain, there are a handful of notifiers that use set_cpus_allowed(). This fix also solves the problem with x86-microcode. I've sent alternative patches for microcode, but as this "rely on set_cpus_allowed_ptr() being workable in cpu-hotplug(CPU_ONLINE, ...)" assumption seems to be more broad than what we thought, perhaps this fix should be applied. With this patch we define that by the moment CPU_ONLINE is being sent, a 'cpu' is online and ready for tasks to be migrated onto it. Signed-off-by: Dmitry Adamushko Reported-by: Mark Langsdorf Tested-by: Mark Langsdorf Signed-off-by: Ingo Molnar commit e5f363e358cf16e4ad13a6826e15088c5495efe9 Author: Ingo Molnar Date: Mon Aug 11 12:37:27 2008 +0200 lockdep: increase MAX_LOCKDEP_KEYS certain configs produce: [ 70.076229] BUG: MAX_LOCKDEP_KEYS too low! [ 70.080230] turning off the locking correctness validator. tune them up. Signed-off-by: Ingo Molnar commit cc7a486cac78f6fc1a24e8cd63036bae8d2ab431 Author: Nick Piggin Date: Mon Aug 11 13:49:30 2008 +1000 generic-ipi: fix stack and rcu interaction bug in smp_call_function_mask() * Venki Pallipadi wrote: > Found a OOPS on a big SMP box during an overnight reboot test with > upstream git. > > Suresh and I looked at the oops and looks like the root cause is in > generic_smp_call_function_interrupt() and smp_call_function_mask() with > wait parameter. > > The actual oops looked like > > [ 11.277260] BUG: unable to handle kernel paging request at ffff8802ffffffff > [ 11.277815] IP: [] 0xffff8802ffffffff > [ 11.278155] PGD 202063 PUD 0 > [ 11.278576] Oops: 0010 [1] SMP > [ 11.279006] CPU 5 > [ 11.279336] Modules linked in: > [ 11.279752] Pid: 0, comm: swapper Not tainted 2.6.27-rc2-00020-g685d87f #290 > [ 11.280039] RIP: 0010:[] [] 0xffff8802ffffffff > [ 11.280692] RSP: 0018:ffff88027f1f7f70 EFLAGS: 00010086 > [ 11.280976] RAX: 00000000ffffffff RBX: 0000000000000000 RCX: 0000000000000000 > [ 11.281264] RDX: 0000000000004f4e RSI: 0000000000000001 RDI: 0000000000000000 > [ 11.281624] RBP: ffff88027f1f7f98 R08: 0000000000000001 R09: ffffffff802509af > [ 11.281925] R10: ffff8800280c2780 R11: 0000000000000000 R12: ffff88027f097d48 > [ 11.282214] R13: ffff88027f097d70 R14: 0000000000000005 R15: ffff88027e571000 > [ 11.282502] FS: 0000000000000000(0000) GS:ffff88027f1c3340(0000) knlGS:0000000000000000 > [ 11.283096] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b > [ 11.283382] CR2: ffff8802ffffffff CR3: 0000000000201000 CR4: 00000000000006e0 > [ 11.283760] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > [ 11.284048] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > [ 11.284337] Process swapper (pid: 0, threadinfo ffff88027f1f2000, task ffff88027f1f0640) > [ 11.284936] Stack: ffffffff80250963 0000000000000212 0000000000ee8c78 0000000000ee8a66 > [ 11.285802] ffff88027e571550 ffff88027f1f7fa8 ffffffff8021adb5 ffff88027f1f3e40 > [ 11.286599] ffffffff8020bdd6 ffff88027f1f3e40 ffff88027f1f3ef8 0000000000000000 > [ 11.287120] Call Trace: > [ 11.287768] [] ? generic_smp_call_function_interrupt+0x61/0x12c > [ 11.288354] [] smp_call_function_interrupt+0x17/0x27 > [ 11.288744] [] call_function_interrupt+0x66/0x70 > [ 11.289030] [] ? clockevents_notify+0x19/0x73 > [ 11.289380] [] ? acpi_idle_enter_simple+0x18b/0x1fa > [ 11.289760] [] ? acpi_idle_enter_simple+0x181/0x1fa > [ 11.290051] [] ? cpuidle_idle_call+0x70/0xa2 > [ 11.290338] [] ? cpu_idle+0x5f/0x7d > [ 11.290723] [] ? start_secondary+0x14d/0x152 > [ 11.291010] > [ 11.291287] > [ 11.291654] Code: Bad RIP value. > [ 11.292041] RIP [] 0xffff8802ffffffff > [ 11.292380] RSP > [ 11.292741] CR2: ffff8802ffffffff > [ 11.310951] ---[ end trace 137c54d525305f1c ]--- > > The problem is with the following sequence of events: > > - CPU A calls smp_call_function_mask() for CPU B with wait parameter > - CPU A sets up the call_function_data on the stack and does an rcu add to > call_function_queue > - CPU A waits until the WAIT flag is cleared > - CPU B gets the call function interrupt and starts going through the > call_function_queue > - CPU C also gets some other call function interrupt and starts going through > the call_function_queue > - CPU C, which is also going through the call_function_queue, starts referencing > CPU A's stack, as that element is still in call_function_queue > - CPU B finishes the function call that CPU A set up and as there are no other > references to it, rcu deletes the call_function_data (which was from CPU A > stack) > - CPU B sees the wait flag and just clears the flag (no call_rcu to free) > - CPU A which was waiting on the flag continues executing and the stack > contents change > > - CPU C is still in rcu_read section accessing the CPU A's stack sees > inconsistent call_funation_data and can try to execute > function with some random pointer, causing stack corruption for A > (by clearing the bits in mask field) and oops. Nice debugging work. I'd suggest something like the attached (boot tested) patch as the simple fix for now. I expect the benefits from the less synchronized, multiple-in-flight-data global queue will still outweigh the costs of dynamic allocations. But if worst comes to worst then we just go back to a globally synchronous one-at-a-time implementation, but that would be pretty sad! Signed-off-by: Ingo Molnar commit 77ae651347bdd46830da8b28b1efc5e4a9d7cbd0 Author: Mike Galbraith Date: Mon Aug 11 13:32:02 2008 +0200 sched: fix mysql+oltp regression Defer commit 6d299f1b53b84e2665f402d9bcc494800aba6386 to the next release. Testing of the tip/sched/clock tree revealed a mysql+oltp regression which bisection eventually traced back to this commit in mainline. Pertinent test results: Three run sysbench averages, throughput units in read/write requests/sec. clients 1 2 4 8 16 32 64 6e0534f 9646 17876 34774 33868 32230 30767 29441 2.6.26.1 9112 17936 34652 33383 31929 30665 29232 6d299f1 9112 14637 28370 33339 32038 30762 29204 Note: subsequent commits hide the majority of this regression until you apply the clock fixes, at which time it reemerges at full magnitude. We cannot see anything bad about the change itself so we defer it to the next release until this problem is fully analysed. Signed-off-by: Mike Galbraith Acked-by: Peter Zijlstra Cc: Gregory Haskins Signed-off-by: Ingo Molnar commit 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 Merge: 6679ce6... 796aade... Author: Ingo Molnar Date: Mon Aug 11 13:40:56 2008 +0200 Merge branch 'linus' into sched/urgent commit 13fa00a8780885edcdf0bc53b81e5d0fec71119a Author: Paul Mackerras Date: Mon Aug 11 20:59:59 2008 +1000 powerpc: Remove include/linux/harrier_defs.h It was only used by code in arch/ppc, and arch/ppc is gone, so remove the unused harrier_defs.h as well. Signed-off-by: Paul Mackerras commit b42e737e576339c795d9ac77a1fce6057f6bc0cf Author: Peter Zijlstra Date: Mon Aug 11 12:34:42 2008 +0200 lockdep: fix overflow in the hlock shrinkage code There is a overflow by 1 case in the new shrunken hlock code. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 3c7569b284e1be55d086b61a70d9f545326f6d74 Author: Eric W. Biederman Date: Sun Aug 10 00:35:50 2008 -0700 x86_64: restore the proper NR_IRQS define so larger systems work. As pointed out and tracked by Yinghai Lu : Dhaval Giani got: kernel BUG at arch/x86/kernel/io_apic_64.c:357! invalid opcode: 0000 [1] SMP CPU 24 ... his system (x3950) has 8 ioapic, irq > 256 This was caused by: commit 9b7dc567d03d74a1fbae84e88949b6a60d922d82 Author: Thomas Gleixner Date: Fri May 2 20:10:09 2008 +0200 x86: unify interrupt vector defines The interrupt vector defines are copied 4 times around with minimal differences. Move them all into asm-x86/irq_vectors.h It appears that Thomas did not notice that x86_64 does something completely different when he merge irq_vectors.h We can solve this for 2.6.27 by simply reintroducing the old heuristic for setting NR_IRQS on x86_64 to a usable value, which trivially removes the regression. Long term it would be nice to harmonize the handling of ioapic interrupts of x86_32 and x86_64 so we don't have this kind of confusion. Dhaval Giani tested an earlier version of this patch by YH which confirms simply increasing NR_IRQS fixes the problem. Signed-off-by: Eric W. Biederman Acked-by: Yinghai Lu Cc: Dhaval Giani Cc: Mike Travis Cc: Andrew Morton Signed-off-by: Ingo Molnar commit d388e5fdc461344d04307a3fa83862b9ed429647 Author: Eric W. Biederman Date: Sat Aug 9 15:09:02 2008 -0700 x86: Restore proper vector locking during cpu hotplug Having cpu_online_map change during assign_irq_vector can result in some really nasty and weird things happening. The one that bit me last time was accessing non existent per cpu memory for non existent cpus. This locking was removed in a sloppy x86_64 and x86_32 merge patch. Guys can we please try and avoid subtly breaking x86 when we are merging files together? Signed-off-by: Eric W. Biederman Signed-off-by: H. Peter Anvin commit 3295f0ef9ff048a4619ede597ad9ec9cab725654 Author: Ingo Molnar Date: Mon Aug 11 10:30:30 2008 +0200 lockdep: rename map_[acquire|release]() => lock_map_[acquire|release]() the names were too generic: drivers/uio/uio.c:87: error: expected identifier or '(' before 'do' drivers/uio/uio.c:87: error: expected identifier or '(' before 'while' drivers/uio/uio.c:113: error: 'map_release' undeclared here (not in a function) Signed-off-by: Ingo Molnar commit 23ba79bd79b94fb0205c15b35bac279237979861 Author: Dmitry Baryshkov Date: Sat Aug 9 15:05:28 2008 +0400 ALSA: wm8750: it's MONO1, not MONO Since first commit wm8750 contained output named MONO, but all routes mentioned MONO1. Correct MONO to be MONO1. Signed-off-by: Dmitry Baryshkov Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 8bfe0298f7a04952d19f4a2cf510d7a6311eeed0 Author: Rabin Vincent Date: Mon Aug 11 09:30:26 2008 +0200 lockdep: handle chains involving classes defined in modules Solve this by marking the classes as unused and not printing information about the unused classes. Reported-by: Eric Sesterhenn Signed-off-by: Rabin Vincent Acked-by: Huang Ying Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 7cd5a02f54f4c9d16cf7fdffa2122bc73bb09b43 Author: Peter Zijlstra Date: Mon Aug 11 09:30:25 2008 +0200 mm: fix mm_take_all_locks() locking order Lockdep spotted: ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.27-rc1 #270 ------------------------------------------------------- qemu-kvm/2033 is trying to acquire lock: (&inode->i_data.i_mmap_lock){----}, at: [] mm_take_all_locks+0xc2/0xea but task is already holding lock: (&anon_vma->lock){----}, at: [] mm_take_all_locks+0x70/0xea which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&anon_vma->lock){----}: [] __lock_acquire+0x11be/0x14d2 [] lock_acquire+0x5e/0x7a [] _spin_lock+0x3b/0x47 [] vma_adjust+0x200/0x444 [] split_vma+0x12f/0x146 [] mprotect_fixup+0x13c/0x536 [] sys_mprotect+0x1a9/0x21e [] system_call_fastpath+0x16/0x1b [] 0xffffffffffffffff -> #0 (&inode->i_data.i_mmap_lock){----}: [] __lock_acquire+0xedb/0x14d2 [] lock_release_non_nested+0x1c2/0x219 [] lock_release+0x127/0x14a [] _spin_unlock+0x1e/0x50 [] mm_drop_all_locks+0x7f/0xb0 [] do_mmu_notifier_register+0xe2/0x112 [] mmu_notifier_register+0xe/0x10 [] kvm_dev_ioctl+0x11e/0x287 [kvm] [] vfs_ioctl+0x2a/0x78 [] do_vfs_ioctl+0x257/0x274 [] sys_ioctl+0x55/0x78 [] system_call_fastpath+0x16/0x1b [] 0xffffffffffffffff other info that might help us debug this: 5 locks held by qemu-kvm/2033: #0: (&mm->mmap_sem){----}, at: [] do_mmu_notifier_register+0x55/0x112 #1: (mm_all_locks_mutex){--..}, at: [] mm_take_all_locks+0x34/0xea #2: (&anon_vma->lock){----}, at: [] mm_take_all_locks+0x70/0xea #3: (&anon_vma->lock){----}, at: [] mm_take_all_locks+0x70/0xea #4: (&anon_vma->lock){----}, at: [] mm_take_all_locks+0x70/0xea stack backtrace: Pid: 2033, comm: qemu-kvm Not tainted 2.6.27-rc1 #270 Call Trace: [] print_circular_bug_tail+0xb8/0xc3 [] __lock_acquire+0xedb/0x14d2 [] ? add_lock_to_list+0x7e/0xad [] ? mm_take_all_locks+0x70/0xea [] ? mm_take_all_locks+0x70/0xea [] lock_release_non_nested+0x1c2/0x219 [] ? mm_take_all_locks+0xc2/0xea [] ? mm_take_all_locks+0xc2/0xea [] ? trace_hardirqs_on_caller+0x4d/0x115 [] ? mm_drop_all_locks+0x7f/0xb0 [] lock_release+0x127/0x14a [] _spin_unlock+0x1e/0x50 [] mm_drop_all_locks+0x7f/0xb0 [] do_mmu_notifier_register+0xe2/0x112 [] mmu_notifier_register+0xe/0x10 [] kvm_dev_ioctl+0x11e/0x287 [kvm] [] ? file_has_perm+0x83/0x8e [] vfs_ioctl+0x2a/0x78 [] do_vfs_ioctl+0x257/0x274 [] sys_ioctl+0x55/0x78 [] system_call_fastpath+0x16/0x1b Which the locking hierarchy in mm/rmap.c confirms as valid. Fix this by first taking all the mapping->i_mmap_lock instances and then take all anon_vma->lock instances. Signed-off-by: Peter Zijlstra Acked-by: Hugh Dickins Signed-off-by: Ingo Molnar commit 454ed842d55740160334efc9ad56cfef54ed37bc Author: Peter Zijlstra Date: Mon Aug 11 09:30:25 2008 +0200 lockdep: annotate mm_take_all_locks() The nesting is correct due to holding mmap_sem, use the new annotation to annotate this. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit b7d39aff91454f2534db2275f55908656ec0470c Author: Peter Zijlstra Date: Mon Aug 11 09:30:24 2008 +0200 lockdep: spin_lock_nest_lock() Expose the new lock protection lock. This can be used to annotate places where we take multiple locks of the same class and avoid deadlocks by always taking another (top-level) lock first. NOTE: we're still bound to the MAX_LOCK_DEPTH (48) limit. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 7531e2f34d1d551b096143f19111139f0dd84c8b Author: Peter Zijlstra Date: Mon Aug 11 09:30:24 2008 +0200 lockdep: lock protection locks On Fri, 2008-08-01 at 16:26 -0700, Linus Torvalds wrote: > On Fri, 1 Aug 2008, David Miller wrote: > > > > Taking more than a few locks of the same class at once is bad > > news and it's better to find an alternative method. > > It's not always wrong. > > If you can guarantee that anybody that takes more than one lock of a > particular class will always take a single top-level lock _first_, then > that's all good. You can obviously screw up and take the same lock _twice_ > (which will deadlock), but at least you cannot get into ABBA situations. > > So maybe the right thing to do is to just teach lockdep about "lock > protection locks". That would have solved the multi-queue issues for > networking too - all the actual network drivers would still have taken > just their single queue lock, but the one case that needs to take all of > them would have taken a separate top-level lock first. > > Never mind that the multi-queue locks were always taken in the same order: > it's never wrong to just have some top-level serialization, and anybody > who needs to take locks might as well do , because they sure as > hell aren't going to be on _any_ fastpaths. > > So the simplest solution really sounds like just teaching lockdep about > that one special case. It's not "nesting" exactly, although it's obviously > related to it. Do as Linus suggested. The lock protection lock is called nest_lock. Note that we still have the MAX_LOCK_DEPTH (48) limit to consider, so anything that spills that it still up shit creek. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 4f3e7524b2e703d9f8b02ac338153a53dd7ede66 Author: Peter Zijlstra Date: Mon Aug 11 09:30:23 2008 +0200 lockdep: map_acquire Most the free-standing lock_acquire() usages look remarkably similar, sweep them into a new helper. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit f82b217e3513fe3af342c0f3ee1494e86250c21c Author: Dave Jones Date: Mon Aug 11 09:30:23 2008 +0200 lockdep: shrink held_lock structure struct held_lock { u64 prev_chain_key; /* 0 8 */ struct lock_class * class; /* 8 8 */ long unsigned int acquire_ip; /* 16 8 */ struct lockdep_map * instance; /* 24 8 */ int irq_context; /* 32 4 */ int trylock; /* 36 4 */ int read; /* 40 4 */ int check; /* 44 4 */ int hardirqs_off; /* 48 4 */ /* size: 56, cachelines: 1 */ /* padding: 4 */ /* last cacheline: 56 bytes */ }; struct held_lock { u64 prev_chain_key; /* 0 8 */ long unsigned int acquire_ip; /* 8 8 */ struct lockdep_map * instance; /* 16 8 */ unsigned int class_idx:11; /* 24:21 4 */ unsigned int irq_context:2; /* 24:19 4 */ unsigned int trylock:1; /* 24:18 4 */ unsigned int read:2; /* 24:16 4 */ unsigned int check:2; /* 24:14 4 */ unsigned int hardirqs_off:1; /* 24:13 4 */ /* size: 32, cachelines: 1 */ /* padding: 4 */ /* bit_padding: 13 bits */ /* last cacheline: 32 bytes */ }; [mingo@elte.hu: shrunk hlock->class too] [peterz@infradead.org: fixup bit sizes] Signed-off-by: Dave Jones Signed-off-by: Ingo Molnar Signed-off-by: Peter Zijlstra commit 1b12bbc747560ea68bcc132c3d05699e52271da0 Author: Peter Zijlstra Date: Mon Aug 11 09:30:22 2008 +0200 lockdep: re-annotate scheduler runqueues Instead of using a per-rq lock class, use the regular nesting operations. However, take extra care with double_lock_balance() as it can release the already held rq->lock (and therefore change its nesting class). So what can happen is: spin_lock(rq->lock); // this rq subclass 0 double_lock_balance(rq, other_rq); // release rq // acquire other_rq->lock subclass 0 // acquire rq->lock subclass 1 spin_unlock(other_rq->lock); leaving you with rq->lock in subclass 1 So a subsequent double_lock_balance() call can try to nest a subclass 1 lock while already holding a subclass 1 lock. Fix this by introducing double_unlock_balance() which releases the other rq's lock, but also re-sets the subclass for this rq's lock to 0. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 64aa348edc617dea17bbd01ddee4e47886d5ec8c Author: Peter Zijlstra Date: Mon Aug 11 09:30:21 2008 +0200 lockdep: lock_set_subclass - reset a held lock's subclass this can be used to reset a held lock's subclass, for arbitrary-depth iterated data structures such as trees or lists which have per-node locks. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit cf206bffbb7542df54043fad9898113172af99d8 Merge: c1955a3... 796aade... Author: Ingo Molnar Date: Mon Aug 11 08:59:21 2008 +0200 Merge branch 'linus' into sched/clock commit c1955a3d4762e7a9bf84035eb3c4886a900f0d15 Author: Peter Zijlstra Date: Mon Aug 11 08:59:03 2008 +0200 sched_clock: delay using sched_clock() Some arch's can't handle sched_clock() being called too early - delay this until sched_clock_init() has been called. Reported-by: Bill Gatliff Signed-off-by: Peter Zijlstra Tested-by: Nishanth Aravamudan CC: Russell King - ARM Linux Signed-off-by: Ingo Molnar commit 0afd2ac9a56767b4fc8dfb6aa086fc05fc324fda Author: Junio C Hamano Date: Thu Aug 7 18:45:08 2008 -0700 powerpc: Do not ignore arch/powerpc/include Back when .gitignore file was added to arch/powerpc/ in 06f2138 ([POWERPC] Add files build to .gitignore, 2006-11-26), there indeed was nothing tracked in the ignored hierarchy and ignoring everything made sense. But we have very many tracked files there these days, and having a higher level .gitignore that ignores everything is asking for future troubles.. This should have been part of b8b572e (powerpc: Move include files to arch/powerpc/include/asm, 2008-08-01). Signed-off-by: Junio C Hamano Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 274827c31cac955cd616c667a0825fe2e0f73a05 Author: Robert P. J. Day Date: Thu Aug 7 03:58:44 2008 +1000 powerpc: Delete completed "ppc removal" task from feature removal file Signed-off-by: Robert P. J. Day Signed-off-by: Paul Mackerras commit bc033b63bbfeb6c4b4eb0a1d083c650e4a0d2af8 Author: Benjamin Herrenschmidt Date: Tue Aug 5 16:19:56 2008 +1000 powerpc/mm: Fix attribute confusion with htab_bolt_mapping() The function htab_bolt_mapping() is used to create permanent mappings in the MMU hash table, for example, in order to create the linear mapping of vmemmap. It's also used by early boot ioremap (before mem_init_done). However, the way ioremap uses it is incorrect as it passes it the protection flags in the "linux PTE" form while htab_bolt_mapping() expects them in the hash table format. This is made more confusing by the fact that some of those flags are actually in the same position in both cases. This fixes it all by making htab_bolt_mapping() take normal linux protection flags instead, and use a little helper to convert them to htab flags. Callers can now use the usual PAGE_* definitions safely. Signed-off-by: Benjamin Herrenschmidt arch/powerpc/include/asm/mmu-hash64.h | 2 - arch/powerpc/mm/hash_utils_64.c | 65 ++++++++++++++++++++-------------- arch/powerpc/mm/init_64.c | 9 +--- 3 files changed, 44 insertions(+), 32 deletions(-) Signed-off-by: Paul Mackerras commit 8db13a0e1e87ae2741ca1677caa90e9592c4cc43 Author: Benjamin Herrenschmidt Date: Thu Jul 31 15:24:13 2008 +1000 powerpc/pci: Don't keep ISA memory hole resources in the tree When we have an ISA memory hole (ie, a PCI window that allows us to generate PCI memory cycles at low PCI address) mixed with other resources using a different CPU <=> PCI mapping, we must not keep the ISA hole in the bridge resource list. If we do, things might start trying to allocate device resources in there and will get the PCI addresses wrong. This fixes it by arranging to remove the ISA memory hole resource in this case. This fixes various cases of PCMCIA breakage on PowerBooks using the MPC106 "grackle" bridge. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b79998fc2e1144919b6b02acbd407a5db1f80ac0 Author: Nathan Fontenot Date: Thu Jul 31 02:23:27 2008 +1000 powerpc: Zero fill the return values of rtas argument buffer The kernel copy of the rtas args struct contains the return value(s) for the specified rtas call. These are copied back to user space with the assumption that every value has been set by the rtas call, which turns out to be not always true. Thus userspace can see random values and think the call failed when in fact it succeeded, but for some reason didn't set one of the return values. This fixes the problem by zeroing out the return value fields of the rtas args struct before processing the rtas call. Signed-off-by: Nathan Fontenot Signed-off-by: Paul Mackerras commit 36cbaa8777dd5a79cb56c2a3d7d56f0c80b2bab6 Author: Wim Van Sebroeck Date: Sun Aug 10 21:57:03 2008 +0000 [WATCHDOG] pcwd.c - fix open_allowed type. Fix following warnings: drivers/watchdog/pcwd.c: In function 'pcwd_open': drivers/watchdog/pcwd.c:703: warning: passing argument 2 of 'test_and_set_bit' from incompatible pointer type drivers/watchdog/pcwd.c: In function 'pcwd_close': drivers/watchdog/pcwd.c:723: warning: passing argument 2 of 'clear_bit' from incompatible pointer type Signed-off-by: Wim Van Sebroeck commit 25d6cbd840d958aada29a342c9ee370590ff7b21 Author: Ian Molton Date: Sun Aug 10 23:32:07 2008 +0200 mfd: tc6393 cleanup and update This patchset cleans up the TC6393XB support. * Add provision for the MMC subdevice * Disable / enable clocks on suspend / resume * Remove fragments of badly merged code (eg. linux/fb include etc.) * Use a device specific clock name to break dependancy on ARM/PXA2XX * Drop unnecessary resource names * Switch to tmio_io* accessors Signed-off-by: Ian Molton Signed-off-by: Samuel Ortiz commit 1c2c30acc52320d506d722f41d50e8eb8fda5cb5 Author: Samuel Ortiz Date: Tue Aug 5 19:27:58 2008 +0200 mfd: have TMIO drivers and subdevices depend on ARM The TMIO chips are only found (and thus tested) on ARM machines. Moreover, we don't want the TMIO cells to be built if one of the TMIO driver is not selected (which indirectly make the TMIO cells drivers depend on ARM as well). Signed-off-by: Samuel Ortiz commit 4a48998fa16121d0fe3436cce43afd6f47424103 Author: Ian Molton Date: Tue Jul 15 16:02:21 2008 +0100 mfd: TMIO MMC driver This patch adds support for the MMC subdevice 'cell' commonly found in TMIO based MFDs. Signed-off-by: Ian Molton Acked-by: Pierre Ossman Signed-off-by: Samuel Ortiz commit ec43b8161bd82535fa8099ee6e98cc554de48614 Author: Ian Molton Date: Tue Jul 15 16:04:22 2008 +0100 mfd: driver for the TMIO NAND controller This patch adds support for the NAND controller commonly found in TMIO based MFDs. Signed-off-by: Ian Molton Acked-By: David Woodhouse Signed-off-by: Samuel Ortiz commit 8ff69eebf5bf8a123a117b78412d5efb85765d8b Author: Jean Delvare Date: Sun Aug 10 22:56:16 2008 +0200 hwmon: (lm75) Drop legacy i2c driver Drop the legacy lm75 driver, and add a detect callback to the new-style driver to achieve the same functionality. Signed-off-by: Jean Delvare Cc: David Brownell commit 2ce5b34fd519275d788338ae692e4b71df6661d4 Author: David Brownell Date: Sun Aug 10 22:56:16 2008 +0200 i2c: correct some size_t printk formats Fix various printk format strings where %zd was passed a size_t; those should be %zu instead. (Courtesy of a version of GCC which warns when these details are wrong.) Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit c1159f9e8927f5732c19816a605926bc76c498b2 Author: Jean Delvare Date: Sun Aug 10 22:56:16 2008 +0200 i2c: Check for address business before creating clients We check for address business in i2c_probe_address(), i2c_detect_address() and i2c_new_probed_device(), but this isn't sufficient. Drivers can call i2c_attach_client() and i2c_new_device() on any address, so we must check the address there as well. This fixes bug #11239: http://bugzilla.kernel.org/show_bug.cgi?id=11239 Signed-off-by: Jean Delvare commit 8d24f8dcb7ead491704e274883b2c627062f6235 Author: Jean Delvare Date: Sun Aug 10 22:56:15 2008 +0200 i2c: Let users select algorithm drivers manually again In kernel 2.6.26, the ability to select I2C algorithm drivers manually was removed, as all in-kernel drivers do that automatically. However there were some complaints that it was a problem for out-of-tree I2C bus drivers. In order to address these complaints, let's allow manual selection of these drivers again, but still hide them by default for better general user experience. This closes bug #11140: http://bugzilla.kernel.org/show_bug.cgi?id=11140 Signed-off-by: Jean Delvare commit b25b791b13aaa336b56c4f9bd417ff126363f80b Author: Hans Verkuil Date: Sun Aug 10 22:56:15 2008 +0200 i2c: Fix NULL pointer dereference in i2c_new_probed_device Fix a NULL pointer dereference that happened when calling i2c_new_probed_device on one of the addresses for which we use byte reads instead of quick write for detection purpose (that is: 0x30-0x37 and 0x50-0x5f). Signed-off-by: Hans Verkuil Signed-off-by: Jean Delvare commit 399d6b26539d83dd734746dc2292d53fbc5807b2 Author: Jean Delvare Date: Sun Aug 10 22:56:15 2008 +0200 i2c: Fix oops on bus multiplexer driver loading The two I2C bus multiplexer drivers (i2c-amd756-s4882 and i2c-nforce2-s4985) make use of the bus they want to multiplex before checking if it is really present. Swap the instructions to test for presence first. This fixes a oops reported by Ingo Molnar. Signed-off-by: Jean Delvare Cc: Ingo Molnar commit 9229376e9beba0dd449dd4869283545c1d042128 Author: Adrian Bunk Date: Sun Aug 10 14:03:41 2008 +0300 [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation This patch fixes the following compile error caused by commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d ([WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl): <-- snip --> ... CC drivers/watchdog/ixp4xx_wdt.o ixp4xx_wdt.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__' ixp4xx_wdt.c: In function 'wdt_enable': ixp4xx_wdt.c:41: error: 'wdt_lock' undeclared (first use in this ixp4xx_wdt.c:41: error: (Each undeclared identifier is reported only ixp4xx_wdt.c:41: error: for each function it appears in.) ixp4xx_wdt.c: In function 'wdt_disable': ixp4xx_wdt.c:52: error: 'wdt_lock' undeclared (first use in this ixp4xx_wdt.c: In function 'ixp4xx_wdt_init': ixp4xx_wdt.c:186: error: 'wdt_lock' undeclared (first use in this make[3]: *** [drivers/watchdog/ixp4xx_wdt.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit 3f11df21ac09e1c75b32d903031550cfc55a7f81 Author: Adrian Bunk Date: Fri Aug 8 19:03:46 2008 +0300 [WATCHDOG] fix watchdog/wdt285.c compilation This patch fixes the following compile error caused by commit d0e58eed05f9baf77c4f75e794ae245f6dae240a ([WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up ...): <-- snip --> ... CC [M] drivers/watchdog/wdt285.o wdt285.c: In function 'footbridge_watchdog_init': wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function) wdt285.c:211: error: (Each undeclared identifier is reported only once wdt285.c:211: error: for each function it appears in.) wdt285.c:212: error: expected ')' before string constant make[3]: *** [drivers/watchdog/wdt285.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit 3c4fafd65055d16d98cfaff1e99d4b319336b9b4 Author: Adrian Bunk Date: Fri Aug 8 18:57:45 2008 +0300 [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation This patch fixes the following compile error: <-- snip --> ... CC drivers/watchdog/at91rm9200_wdt.o at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit 58cf41984a3791e7a516641f107ff70bd844ef72 Author: Adrian Bunk Date: Fri Aug 8 18:39:11 2008 +0300 [WATCHDOG] fix watchdog/shwdt.c compilation This patch fixes the following compile errors caused by commit 70b814ec1a484279a51bf9f7193551b996627247 ([WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_io): <-- snip --> ... CC drivers/watchdog/shwdt.o shwdt.c:64: error: 'WTCSR_CKS_4096' undeclared here (not in a function) shwdt.c: In function 'sh_wdt_start': shwdt.c:92: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:92: error: (Each undeclared identifier is reported only once shwdt.c:92: error: for each function it appears in.) shwdt.c:97: error: implicit declaration of function 'sh_wdt_read_csr' shwdt.c:98: error: 'WTCSR_WT' undeclared (first use in this function) shwdt.c:99: error: implicit declaration of function 'sh_wdt_write_csr' shwdt.c:101: error: implicit declaration of function 'sh_wdt_write_cnt' shwdt.c:112: error: 'WTCSR_TME' undeclared (first use in this function) shwdt.c:113: error: 'WTCSR_RSTS' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_stop': shwdt.c:142: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:147: error: 'WTCSR_TME' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_keepalive': shwdt.c:160: error: 'wdt_lock' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_set_heartbeat': shwdt.c:176: error: 'wdt_lock' undeclared (first use in this function) shwdt.c: In function 'sh_wdt_ping': shwdt.c:192: error: 'wdt_lock' undeclared (first use in this function) shwdt.c:197: error: 'WTCSR_IOVF' undeclared (first use in this function) shwdt.c: At top level: shwdt.c:417: error: conflicting type qualifiers for 'sh_wdt_info' shwdt.c:71: error: previous declaration of 'sh_wdt_info' was here make[3]: *** [drivers/watchdog/shwdt.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit f8494e061799905dc2eb787c148cfbfb134b928f Author: Adrian Bunk Date: Fri Aug 8 18:18:46 2008 +0300 [WATCHDOG] fix watchdog/txx9wdt.c compilation This patch fixes the following compile error caused by commit 8dc244f7deac4c0e95ce0ffd26f494bb6e1534c0 ([WATCHDOG 48/57] txx9: Fix locking, switch to unlocked_ioctl): <-- snip --> ... CC drivers/watchdog/txx9wdt.o txx9wdt.c:48: warning: type defaults to 'int' in declaration of txx9wdt.c:48: warning: parameter names (without types) in function txx9wdt.c: In function 'txx9wdt_ping': txx9wdt.c:52: error: 'txx9_lock' undeclared (first use in this function) txx9wdt.c:52: error: (Each undeclared identifier is reported only once txx9wdt.c:52: error: for each function it appears in.) txx9wdt.c: In function 'txx9wdt_start': txx9wdt.c:59: error: 'txx9_lock' undeclared (first use in this function) txx9wdt.c: In function 'txx9wdt_stop': txx9wdt.c:71: error: 'txx9_lock' undeclared (first use in this function) make[3]: *** [drivers/watchdog/txx9wdt.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit e0960f4bfbe98152ee5edfd25d7da9e2b00e1aba Author: Adrian Bunk Date: Thu Aug 7 00:10:52 2008 +0300 [WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry - maintainer has not been active for years - maintainer email bounces - URL no longer exists - covered by the WATCHDOG DEVICE DRIVERS entry Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck commit d6efcab8a394c6493ccc2fcaf23c5dc0a16f052d Author: Jean Delvare Date: Fri Aug 8 10:29:21 2008 +0200 [WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n The problem is that iTCO_vendor_support.ko is still being built while iTCO_vendor.h claims that its functions do not exist. The following Makefile update fixes that. It causes iTCO_vendor_support.ko to no longer be built if CONFIG_ITCO_VENDOR_SUPPORT=n. Signed-off-by: Jean Delvare Signed-off-by: Wim Van Sebroeck commit 8a4fbe013fb6a2a65a4eddcddb888ebe38d0270d Author: Ian Molton Date: Mon Aug 4 18:06:18 2008 +0200 mfd: t7l66 MMC platform data The tmio MMC driver needs the cell to be passed as a platform data. Signed-off-by: Samuel Ortiz commit d2432a6321b8f578018690d0c5384ee5de19737d Author: Ian Molton Date: Mon Aug 4 18:58:18 2008 +0200 mfd: tc6387 MMC platform data We need to pass the cell as the platform data. Signed-off-by: Samuel Ortiz commit 56bf2bda0651ca368a259468e4f309c71ed35c35 Author: Samuel Ortiz Date: Fri Aug 1 00:16:13 2008 +0200 mfd: Fix 7l66 and 6387 according to the new mfd-core API Signed-off-by: Samuel Ortiz commit befb844415f4e3b9c48594d05238a8a4c2af8941 Author: Samuel Ortiz Date: Fri Aug 1 00:11:56 2008 +0200 mfd: Fix tc6393 according to the new tmio.h Signed-off-by: Samuel Ortiz commit cbdfb426392557d49b1a0e7cb59b16c20dc42955 Author: Ian Molton Date: Tue Jul 15 15:12:52 2008 +0100 mfd: driver for the TC6387XB TMIO controller. This patch adds support for the TC6387XB. Unlike other TMIO devices this one has only one subdevice and no interrupt mux, however using the MFD framework allows it to share the TMIO MMC driver. Signed-off-by: Ian Molton Signed-off-by: Samuel Ortiz commit 1f192015ca5b2f4d0a79c191f03f64e72fd8fc29 Author: Ian Molton Date: Tue Jul 15 15:09:43 2008 +0100 mfd: driver for the T7L66XB TMIO SoC This patchset provides support for the core functinality of the T7L66XB SoC from Toshiba. Supported in this patchset is the IRQ MUX, MMC controller and NAND flash controller. Signed-off-by: Ian Molton Signed-off-by: Samuel Ortiz commit d3a2f71853ce543c5515d4982e202751e15b0b6d Author: Ian Molton Date: Thu Jul 31 20:44:28 2008 +0200 mfd: TMIO MMC structures and accessors. Signed-off-by: Ian Molton Signed-off-by: Samuel Ortiz commit 4fbb71597af591fa0ef565df1ba745c92d5070f7 Merge: e6ca232... 5595cff... Author: Linus Torvalds Date: Sat Aug 9 16:21:33 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: dynamic per-cache MIN_PARTIAL mm: unexport ksize commit e6ca23289f865f0372b89f42884c258a8e85460b Author: Adrian Bunk Date: Fri Aug 8 21:33:34 2008 +0300 uninline atl1e_setup_mac_ctrl() There doesn't seem to be a compelling reason why atl1e_setup_mac_ctrl() is marked as "inline": It's not used in any place where speed would matter much, and as long as it has only one caller non-ancient gcc versions anyway inline it automatically. This patch fixes the following compile error with gcc 3.4: CC drivers/net/atl1e/atl1e_main.o atl1e_main.c: In function `atl1e_check_link': atl1e_main.c:50: sorry, unimplemented: inlining failed in call to atl1e_main.c:196: sorry, unimplemented: called from here Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 28efb9e1a758435bb9d49798400fb0373d018d5c Merge: 796aade... 33f197a... Author: Linus Torvalds Date: Sat Aug 9 10:53:42 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Make atstk1006_nand_data definition static avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100 avr32: Update defconfigs avr32: Clean up HMATRIX code avr32: Add MMIO address definitions for certain controllers avr32: Introduce avr32: Remove include/asm-avr32/arch-at32ap commit 796aadeb1b2db9b5d463946766c5bbfd7717158c Merge: 56831a1... 34ae7f3... Author: Linus Torvalds Date: Fri Aug 8 16:19:49 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ][2/2] preregister support for powernow-k8 [CPUFREQ][1/2] whitespace fix for powernow-k8 [CPUFREQ] Update MAINTAINERS to reflect new mailing list. [CPUFREQ] Fix warning in elanfreq [CPUFREQ] Fix -Wshadow warning in conservative governor. [CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig. commit 56831a1a883bb8376ea56ce8f3b1d5844c94d257 Merge: 6724cce... ad8b15f... Author: Linus Torvalds Date: Fri Aug 8 16:18:34 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] list entry can not return null turn cifs_setattr into a multiplexor that calls the correct function move file time and dos attribute setting logic into new function spin off cifs_setattr with unix extensions to its own function [CIFS] Code cleanup in old sessionsetup code [CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg change CIFSSMBSetTimes to CIFSSMBSetPathInfo [CIFS] fix trailing whitespace bundle up Unix SET_PATH_INFO args into a struct and change name Fix missing braces in cifs_revalidate() remove locking around tcpSesAllocCount atomic variable [CIFS] properly account for new user= field in SPNEGO upcall string allocation [CIFS] remove level of indentation from decode_negTokenInit [CIFS] cifs send2 not retrying enough in some cases on full socket [CIFS] oid should also be checked against class in cifs asn commit 6724cce8fb4b408ae1a2fab455050f3407c80144 Author: Randy Dunlap Date: Fri Aug 8 13:56:20 2008 -0700 list.h: fix fatal kernel-doc error Fix fatal multi-line kernel-doc error in list.h: function short description must be on one line. Error(linux-2.6.27-rc2-git3//include/linux/list.h:318): duplicate section name 'Description' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit b1404069f64457c94de241738fdca142c2e5698f Author: David J. Wilder Date: Fri Aug 8 15:51:29 2008 -0700 IPoIB/cm: Use vmalloc() to allocate rx_rings There are users that are running UDP applications that require a large receive queue size in order to get good performance. To prevent allocation failures for rx_rings when using non-SRQ mode and large recv_queue_size (1K or larger), use vmalloc() instead of kcalloc() to alocate rx_rings. Signed-off-by: David Wilder Signed-off-by: Roland Dreier commit 31343d8a5079cda57ffd539fcf4f00cea344fe98 Author: Alok Kataria Date: Fri Aug 8 12:15:57 2008 -0700 x86: Fix broken VMI in 2.6.27-rc.. The lowmem mapping table created by VMI need not depend on max_low_pfn at all. Instead we now create an extra large mapping which covers all possible lowmem instead of the physical ram that is actually available. This allows the vmi initialization to be done before max_low_pfn could be computed. We also move the vmi_init code very early in the boot process so that nobody accidentally breaks the fixmap dependancy. Signed-off-by: Alok N Kataria Acked-by: Zachary Amsden Signed-off-by: H. Peter Anvin commit ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401 Author: Steve French Date: Fri Aug 8 21:10:16 2008 +0000 [CIFS] list entry can not return null Signed-off-by: Steve French commit 34ae7f35a21694aa5cb8829dc5142c39d73d6ba0 Author: Mark Langsdorf Date: Thu Jul 31 12:39:12 2008 -0500 [CPUFREQ][2/2] preregister support for powernow-k8 This patch provides support for the _PSD ACPI object in the Powernow-k8 driver. Although it looks like an invasive patch, most of it is simply the consequence of turning the static acpi_performance_data structure into a pointer. AMD has tested it on several machines over the past few days without issue. [trivial checkpatch warnings fixed up by davej] [X86_POWERNOW_K8_ACPI=n buildfix from Randy Dunlap] Signed-off-by: Mark Langsdorf Tested-by: Frank Arnold Signed-off-by: Randy Dunlap Signed-off-by: Dave Jones commit 23431b495fcbbde6d09aba30019b6a224d543cf9 Author: Mark Langsdorf Date: Thu Jul 31 12:39:05 2008 -0500 [CPUFREQ][1/2] whitespace fix for powernow-k8 Trivial whitespace fix for powernow-k8. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit bc5f65d42e6276747f3daf2a9e0617e7763193fa Author: Dave Jones Date: Thu Jul 31 18:22:59 2008 -0400 [CPUFREQ] Update MAINTAINERS to reflect new mailing list. Mailing list moved to vger. Signed-off-by: Dave Jones commit 460f5ef2835dbc33825f611f408eb09c29be4b85 Author: Dave Jones Date: Wed Jul 30 13:01:42 2008 -0400 [CPUFREQ] Fix warning in elanfreq arch/x86/kernel/cpu/cpufreq/elanfreq.c:47:26: warning: symbol 'elan_multiplier' was not declared. Should it be static? Yes, yes it should. Signed-off-by: Dave Jones commit f068c04ba6f308774fdd2ed5e113da7cf4ff2f2b Author: Dave Jones Date: Wed Jul 30 12:59:56 2008 -0400 [CPUFREQ] Fix -Wshadow warning in conservative governor. drivers/cpufreq/cpufreq_conservative.c:336:15: warning: symbol 'freq_step' shadows an earlier one Just rename the local variable. Signed-off-by: Dave Jones commit ec983f7060cd73e14cdd3edd910339127a8a4e96 Author: Dave Jones Date: Wed Jul 30 12:05:03 2008 -0400 [CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig. This has been pretty solid, and doesn't see much change at all. Noticed by Harald Welte. Signed-off-by: Dave Jones commit 49b75b87ce2dfbd99e59a50c3681b154d07e3a22 Merge: f1c7f79... 097d9eb... Author: Linus Torvalds Date: Fri Aug 8 11:38:42 2008 -0700 Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB [ARM] 5166/1: magician: add MAINTAINERS entry [ARM] fix pnx4008 build errors [ARM] Fix SMP booting with non-zero PHYS_OFFSET [ARM] 5185/1: Fix spi num_chipselect for lubbock [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead [ARM] Eliminate useless includes of asm/mach-types.h [ARM] Fix circular include dependency with IRQ headers avr32: Use instead of avr32: Introduce arch/avr32/mach-*/include/mach avr32: Move include/asm-avr32 to arch/avr32/include/asm [ARM] sa1100_wdt: use reset_status to remember watchdog reset status [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage [ARM] pxa: introduce reset.h for reset specific header information commit f1c7f79b6ab4f7ada002a0fae47f462ede6b6857 Author: Adrian Bunk Date: Fri Aug 8 19:26:42 2008 +0300 [NFSD] uninline nfsd4_op_name() There doesn't seem to be a compelling reason why nfsd4_op_name() is marked as "inline": It's only used in a dprintk(), and as long as it has only one caller non-ancient gcc versions anyway inline it automatically. This patch fixes the following compile error with gcc 3.4: ... CC fs/nfsd/nfs4proc.o nfs4proc.c: In function `nfsd4_proc_compound': nfs4proc.c:854: sorry, unimplemented: inlining failed in call to nfs4proc.c:897: sorry, unimplemented: called from here make[3]: *** [fs/nfsd/nfs4proc.o] Error 1 Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk [ Also made it "const char *" - Linus] Signed-off-by: Linus Torvalds commit 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 Merge: c41107c... aeee90d... Author: Russell King Date: Fri Aug 8 17:33:47 2008 +0100 Merge Linus' latest into master Conflicts: drivers/watchdog/at91rm9200_wdt.c drivers/watchdog/davinci_wdt.c drivers/watchdog/ep93xx_wdt.c drivers/watchdog/ixp2000_wdt.c drivers/watchdog/ixp4xx_wdt.c drivers/watchdog/ks8695_wdt.c drivers/watchdog/omap_wdt.c drivers/watchdog/pnx4008_wdt.c drivers/watchdog/sa1100_wdt.c drivers/watchdog/wdt285.c commit f2d7499be1b1fe1cd8a5e6a01c1f44173894a241 Merge: 8d659f5... 76aab2c... Author: Linus Torvalds Date: Fri Aug 8 11:15:23 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits) pkt_sched: Fix actions referencing bnx2x: fix logical op tcp: (whitespace only) fix confusing indentation pkt_sched: Fix qdisc config when link is down. [Bluetooth] Add full quirk implementation for btusb driver [Bluetooth] Removal of unnecessary ignore module parameter [Bluetooth] Add parameters to control BNEP header compression ath9k: Revamp wireless mode usage ath9k: More unused macros ath9k: Remove a few unused macros and fix indentation ath9k: Use mac80211's band macros and remove enum hal_freq_band ath9k: Remove redundant data structure ath9k_txq_info ath9k: Cleanup data structures related to HW capabilities ath9k: work around gcc ICEs ath9k: Add new Atheros IEEE 802.11n driver ath5k: remove Atheros 11n devices from supported list list.h: add list_cut_position() list.h: Add list_splice_tail() and list_splice_tail_init() p54: swap short slot time dcf values rt2x00: Block all unsupported modes ... commit 8d659f5e43c5db2630e85f507b7384365e9e1c1e Merge: 9da1f7e... 433c5f7... Author: Linus Torvalds Date: Fri Aug 8 11:14:32 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix end-of-stack checking in save_stack_trace(). sparc: don't use asm/of_device.h sparc64: Use kernel/uid16.c helpers instead of own copy. of/sparc: remove include of linux/of_platform.h from asm/of_platform.h sparc: i8042-sparcio.h: fix warning commit 9da1f7e69aa4545d45d3435865c56f1e67c4b26a Author: Junio C Hamano Date: Thu Aug 7 18:45:08 2008 -0700 powerpc: Do not ignore arch/powerpc/include Back when .gitignore file was added to arch/powerpc/ in 06f2138 ([POWERPC] Add files build to .gitignore, 2006-11-26), there indeed was nothing tracked in the ignored hierarchy and ignoring everything made sense. But we have very many tracked files there these days, and having a higher level .gitignore that ignores everything is asking for future troubles.. This should have been part of b8b572e (powerpc: Move include files to arch/powerpc/include/asm, 2008-08-01). Signed-off-by: Junio C Hamano Acked-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit c41107c2d4fd31924533f4dbc4c3428acc2b5894 Author: Adrian Bunk Date: Sat Jul 19 17:54:22 2008 +0100 [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB This patch removes the commented out line for the not available CONFIG_SA1100_USB option. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 3b8861715a9c17151e24f03e4ab2c30e6d8a0748 Author: Philipp Zabel Date: Wed Jul 9 21:27:15 2008 +0100 [ARM] 5166/1: magician: add MAINTAINERS entry Signed-off-by: Philipp Zabel Acked-by: Eric Miao Signed-off-by: Russell King commit 2727f226a65e034f93846def7fab314dee430df3 Author: Russell King Date: Fri Aug 8 15:13:27 2008 +0100 [ARM] fix pnx4008 build errors include/linux/i2c-pnx.h was missed when moving the include files. Fix it now; it doesn't really need to include mach/i2c.h at all. Successfully build tested with pnx4008_defconfig, which had failed in linux-next. Signed-off-by: Russell King commit 33f197a603e61ddd099c29e94166d3172cdf57e4 Author: Haavard Skinnemoen Date: Sat Jun 28 14:16:31 2008 +0200 avr32: Make atstk1006_nand_data definition static Signed-off-by: Haavard Skinnemoen commit 0fe9497e77acbca5205d48a620c80e5de1ab47b4 Author: Haavard Skinnemoen Date: Fri Aug 1 17:06:01 2008 +0200 avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100 Doing this in combination with "atmel_spi: fix hang due to missed interrupt" appears to eliminate the overruns I'm seeing when using JFFS2-on-DataFlash as /usr filesystem on the ATNGW100. Signed-off-by: Haavard Skinnemoen commit 30930a44a4eaf17601f18ee0676ab891cad8eeb6 Author: Haavard Skinnemoen Date: Tue Aug 5 17:07:53 2008 +0200 avr32: Update defconfigs Enable power management, DMA and MMC on all boards except ATSTK1004, and add defconfig for the new ATSTK1006 board with NAND flash, UBI and UBIFS enabled as well. Signed-off-by: Haavard Skinnemoen commit b47eb4092f81ae9fe406fa2c6719eaa9cd7a593c Author: Haavard Skinnemoen Date: Thu Jul 31 15:56:36 2008 +0200 avr32: Clean up HMATRIX code Introduce a few helper functions for HMATRIX configuration and clean up the register definitions. Also add definitions for the HMATRIX master and slave IDs on the AT32AP700x chips. Also make the definitions in hmatrix.h available to board code by moving it to Signed-off-by: Haavard Skinnemoen commit a8d902db221e1e2dcbbd32efbf89055ed69f8e56 Author: Haavard Skinnemoen Date: Thu Jul 31 16:06:58 2008 +0200 avr32: Add MMIO address definitions for certain controllers Hardcoded MMIO base addresses are used a few places throughout the platform code. Move these into the chip-specific header file so that adding support for new chips becomes a bit easier. Signed-off-by: Haavard Skinnemoen commit 8f8a59c664e976f0c32d7d4550fd99dca7c4ef7b Author: Haavard Skinnemoen Date: Thu Jun 5 13:32:05 2008 +0200 avr32: Introduce This file includes the appropriate chip-specific header with MMIO, IRQ and GPIO definitions used by the platform code. It may also be used to provide inline GPIO accessors for drivers that are willing to sacrifice portability for faster bitbanging. Signed-off-by: Haavard Skinnemoen commit a7448db4826efb097e94f601f4cd9b37053e81bf Author: Haavard Skinnemoen Date: Tue Aug 5 14:50:11 2008 +0200 avr32: Remove include/asm-avr32/arch-at32ap Since all users have been converted over to use , there's no need for the arch-at32ap directory and associated symlink anymore. Signed-off-by: Haavard Skinnemoen commit 433c5f706856689be25928a99636e724fb3ea7cf Author: David S. Miller Date: Thu Aug 7 23:04:37 2008 -0700 sparc64: Fix end-of-stack checking in save_stack_trace(). Bug reported by Alexander Beregalov. Before we dereference the stack frame or try to peek at the pt_regs magic value, make sure the entire object is within the kernel stack bounds. Signed-off-by: David S. Miller commit 76aab2c1eae491a5d73ac83deec97dd28ebac584 Author: Jamal Hadi Salim Date: Thu Aug 7 20:37:22 2008 -0700 pkt_sched: Fix actions referencing When an action is added several times with the same exact index it gets deleted on every even-numbered attempt. This fixes that issue. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 4ab84d450e24b3a309608182a8d8e30626b46f8f Author: Randy Dunlap Date: Thu Aug 7 20:33:19 2008 -0700 bnx2x: fix logical op Fix dubious logical operation that was found by sparse: linux-next-20080807/drivers/net/bnx2x_main.c:7205:27: warning: dubious: !x & y Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c1c6c11a6860c8135fd0d923c3d49fb368889b10 Merge: 2aaab9a... cfeb414... Author: David S. Miller Date: Thu Aug 7 20:28:46 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5 Author: Adam Langley Date: Thu Aug 7 20:27:45 2008 -0700 tcp: (whitespace only) fix confusing indentation The indentation in part of tcp_minisocks makes it look like one of the if statements is much more important than it actually is. Signed-off-by: Adam Langley Signed-off-by: David S. Miller commit 827ebd6410005b05b3c930ef6a116666c6986886 Author: David S. Miller Date: Thu Aug 7 20:26:40 2008 -0700 pkt_sched: Fix qdisc config when link is down. Bug reported by Stephen Hemminger. We need to fetch the root from ->qdisc_sleeping not ->qdisc. Signed-off-by: David S. Miller commit 22c7fdf4a7acfa24d9d498b1357e6c07d0e6c553 Merge: 5423b2e... 86b89ee... Author: David S. Miller Date: Thu Aug 7 18:52:57 2008 -0700 Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit aeee90dfa01844168cd7f8051d0a0f969c573067 Merge: 273b257... 5861bbf... Author: Linus Torvalds Date: Thu Aug 7 18:14:24 2008 -0700 Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace * 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: tracehook: fix CLONE_PTRACE commit 273b2578392bbf6e5c47a8a3d1ee461ce6fc7182 Merge: 8e43e12... 06a91a0... Author: Linus Torvalds Date: Thu Aug 7 18:14:07 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL IB/mlx4: Allow 4K messages for UD QPs mlx4_core: Add ethernet fields to CQE struct IB/ipath: Fix printk format warnings RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device RDMA/cxgb3: Fix up MW access rights RDMA/cxgb3: Fix QP capabilities RDMA/cma: Remove padding arrays by using struct sockaddr_storage IB/ipath: Use unsigned long for irq flags IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr() commit 8e43e12d638f732fa32600c324711f4be8fe0b1d Merge: 01b09b6... 62aa005... Author: Linus Torvalds Date: Thu Aug 7 18:13:30 2008 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: xen-blkfront.c: make blkif_ioctl() static bio: make use of bvec_nr_vecs cciss: fix bug if scsi tape support is disabled cciss: add support for multi lun tape devices cciss: change the way we notify scsi midlayer of tape drives cciss: fix negative logical drive count in procfs cciss: remove redundant code cciss: make rebuild_lun_table behave better cciss: return -EFAULT if copy_from_user() fails commit 01b09b6c605ed119fba75b82582f017e44dd4a55 Merge: c1ec829... bf9c8c9... Author: Linus Torvalds Date: Thu Aug 7 18:12:41 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers commit c1ec8295f6e8c888230bbc9b7a416dc26d03688e Author: Linus Torvalds Date: Thu Aug 7 18:10:12 2008 -0700 Fix up duplicate '__s3c2410wdt_stop()' function Looks like somebody didn't get enough sleep. Noticed-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 Merge: 4c514a5... 5875013... Author: Linus Torvalds Date: Thu Aug 7 18:07:33 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm. commit 4c514a5ad1314b872e3185dabaf105c81d39d7e8 Author: Stephen Rothwell Date: Thu Aug 7 14:08:27 2008 +1000 powerpc/iseries: remove the old viocons driver This driver was declared obsolete over 2 years ago, the alternative console driver for legacy iSeries (hvc_iseries) was made the default over 1 year ago and this driver has been build broken for over 3 months, so remove it. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit b80b601f0087391e55d3859e70f08278632b1185 Merge: a06dee4... 04793dd... Author: Linus Torvalds Date: Thu Aug 7 18:06:19 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits) V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams V4L/DVB (8611): Add suspend/resume to pxa_camera driver V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. V4L/DVB (8564): fix vino driver build error V4L/DVB (8563): fix drivers/media/video/arv.c compilation V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select V4L/DVB (8558): media/video/Kconfig: fix a typo ... commit a06dee41a31bff488a261dfc542776ffd2f24ff1 Merge: b588e2b... 816d8c6... Author: Linus Torvalds Date: Thu Aug 7 18:05:39 2008 -0700 Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle hwmon: ad7414 driver hwmon: (thmc50) Add support for critical temperature limits hwmon: (adm9240) Remove EXPERIMENTAL dependency hwmon: (w83627hf) Drop reset module parameter hwmon: (w83627hf) Add pwm_enable sysfs interface hwmon: (w83791d) Use fan divisor bits from vbat register hwmon: (f71882fg) Delete needless forward declarations hwmon: (dme1737) Add support for the SMSC SCH5027 hwmon: (dme1737) Skip detection if forced hwmon: (dme1737) Cleanups commit b588e2bbd7b872c9cdf635fe0f04840534e72443 Merge: 3df302f... 7944d3a... Author: Linus Torvalds Date: Thu Aug 7 18:05:09 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits) [WATCHDOG] more coding style clean-up's [WATCHDOG] sbc8360.c - move stop code into a function [WATCHDOG] Coding style - Indentation - part 2 [WATCHDOG] Coding style - Indentation - part 1 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs [WATCHDOG] mpc8xxx_wdt: fix build [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver [WATCHDOG] pcwd: a couple of watchdogs escaped conversion [WATCHDOG] Clean-up includes [WATCHDOG] hpwdt.c - fix double includes [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl ... commit 3df302ff56fac91d54e964faed9d293018ac71ca Merge: 685d87f... 64a99d2... Author: Linus Torvalds Date: Thu Aug 7 18:04:28 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: a better way to generate cscope database change Kconfig: Extend "menuconfig" for modules to simplify Kconfig file bugfix for scripts/patch-kernel in 2.6 sublevel stepping kbuild: fix O=.. build with arm commit 35405f256de924be56ea5edaca4cdc627f1bb0f8 Author: Dean Hildebrand Date: Thu Aug 7 17:31:45 2008 -0700 PCI: Limit VPD length for Broadcom 5708S BCM5706S wont work correctly unless VPD length truncated to 128 Signed-off-by: Dean Hildebrand Signed-off-by: Jesse Barnes commit 5861bbfcc10fc0358abf52c7d22850c8d180f0b0 Author: Roland McGrath Date: Thu Aug 7 16:55:03 2008 -0700 tracehook: fix CLONE_PTRACE In the change in commit 09a05394fe2448a4139b014936330af23fa7ec83, I overlooked two nits in the logic and this broke using CLONE_PTRACE when PTRACE_O_TRACE* are not being used. A parent that is itself traced at all but not using PTRACE_O_TRACE*, using CLONE_PTRACE would have its new child fail to be traced. A parent that is not itself traced at all that uses CLONE_PTRACE (which should be a no-op in this case) would confuse the bookkeeping and lead to a crash at exit time. This restores the missing checks and fixes both failure modes. Reported-by: Eduardo Habkost Signed-off-by: Roland McGrath commit 764f2579d95120e1c76b7af1256d02466ddd00bf Author: Stephen Rothwell Date: Thu Aug 7 15:33:36 2008 -0700 sparc: don't use asm/of_device.h Use linux/of_device.h instead. Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 5a6c9b60b4cc15b22d3102b0033e5cb842125456 Author: Rafael J. Wysocki Date: Fri Aug 8 00:14:24 2008 +0200 PCI PM: Export pci_pme_active to drivers Export pci_pme_active() to drivers, so that they can clear the PME_status bit and disable PME# for their devices without involving ACPI. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 058ddee5625ade9e9e011b9ae155ac3b8d4eda3a Author: Russell King Date: Thu Aug 7 22:36:59 2008 +0100 [ARM] Fix SMP booting with non-zero PHYS_OFFSET The existing code tries to get the pmd for the temporary page table by doing: pgd = pgd_alloc(&init_mm); pmd = pmd_offset(pgd, PHYS_OFFSET); Since we have a two level page table, pmd_offset() is a no-op, so this just has a casting effect from a pgd to a pmd - the address argument is unused. So this can't work. Normally, we'd do: pgd = pgd_offset(&init_mm, PHYS_OFFSET); ... pmd = pmd_offset(pgd, PHYS_OFFSET); to get the pmd you want. However, pgd_offset() takes the mm_struct, not the (unattached) pgd we just allocated. So, instead use: pgd = pgd_alloc(&init_mm); pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET); Reported-by: Antti P Miettinen Signed-off-by: Russell King commit 06a91a02e9b249695f964bb59c8b02152c21e90c Merge: 3f44675... be43324... 70117b9... e081981... cd55ef5... 6e0d733... Author: Roland Dreier Date: Thu Aug 7 14:12:03 2008 -0700 Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus commit cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 Author: Julien Brunel Date: Thu Aug 7 14:11:56 2008 -0700 IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL In case of error, the function ib_create_send_mad() returns an ERR pointer, but never returns a NULL pointer. So testing the return value for error should be done with IS_ERR, not by comparing with NULL. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @correct_null_test@ expression x,E; statement S1, S2; @@ x = ib_create_send_mad(...) <... when != x = E if ( ( - x@p2 != NULL + ! IS_ERR ( x ) | - x@p2 == NULL + IS_ERR( x ) ) ) S1 else S2 ...> ? x = E; // Signed-off-by: Julien Brunel Signed-off-by: Julia Lawall Signed-off-by: Roland Dreier commit 6e0d733d921526e628107fb8b1aff5f7de870d6f Author: Alex Naslednikov Date: Thu Aug 7 14:06:50 2008 -0700 IB/mlx4: Allow 4K messages for UD QPs Current code limits the max message size to 2K for UD QPs, while MTU might be as big as 4K. This patch sets the maximum message size to 4K, which is needed for UD to work correctly on fabrics with a 4K MTU. Signed-off-by: Alex Naslednikov Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit cfeb414537b1d7c23ba202f198fa4154cd5a4856 Author: Marcel Holtmann Date: Thu Aug 7 22:26:56 2008 +0200 [Bluetooth] Add full quirk implementation for btusb driver This implements all the quirk handling from the hci_usb driver to the new btusb driver. Signed-off-by: Oliver Neukum Signed-off-by: Marcel Holtmann commit 943d56b0a578cfc10e0340c6f8d6b8795d380e67 Author: Marcel Holtmann Date: Thu Aug 7 22:26:55 2008 +0200 [Bluetooth] Removal of unnecessary ignore module parameter This removes the unnecessary ignore parameter, which is useless. There are alternate methods of kicking a driver off an USB device. Signed-off-by: Oliver Neukum Signed-off-by: Marcel Holtmann commit 28111eb2f5087c5aa5ec3697388f6c7d354b2ad8 Author: Marcel Holtmann Date: Thu Aug 7 22:26:54 2008 +0200 [Bluetooth] Add parameters to control BNEP header compression The Bluetooth qualification for PAN demands testing with BNEP header compression disabled. This is actually pretty stupid and the Linux implementation outsmarts the test system since it compresses whenever possible. So to pass qualification two need parameters have been added to control the compression of source and destination headers. Signed-off-by: Marcel Holtmann commit 7bed523a95425b70af7a59df61d5adb422ef2038 Author: akpm@linux-foundation.org Date: Tue Aug 5 14:07:53 2008 -0700 PCI: remove duplicate symbol from pci_ids.h pci.ids.h: remove a duplicated symbol Cc: Doug Thompson Signed-off-by: Grant Coady Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit a844158a642ffe8b3b29964a88ee802c2834ed0a Author: Simon Horman Date: Thu Aug 7 14:56:34 2008 +1000 PCI: check the return value of device_create_bin_file() in pci_create_bus() Check the return value of device_create_bin_file in pci_create_bus and unwind if necessary. Don't propagate error to caller, as failure to create these files shouldn't prevent PCI from being initialised. Instead, just log a warning. Cc: Sven Wegener Cc: Michael Ellerman Cc: Matthew Wilcox Signed-off-by: Simon Horman Signed-off-by: Jesse Barnes commit abad2ec98f2ef357d62026cbc3989dabf33f2435 Author: Jesse Barnes Date: Thu Aug 7 08:52:37 2008 -0700 PCI: fully restore MSI state at resume time With the recent change to avoid masking MSIs using the MSI enable bit, devices without an MSI mask bit will have their MSI capability always enabled when MSI is in use, so we need to restore it regardless of the mask bit state. Fixes kernel bz 11178. Acked-by: Matthew Wilcox Signed-off-by: Alan Jenkins Signed-off-by: Jesse Barnes commit cb3952bf7853667a1cb3515e67f27e67f0fce9e8 Author: Dmitry Baryshkov Date: Wed Jul 30 14:46:50 2008 +0400 DMA: make dma-coherent.c documentation kdoc-friendly Spotted by Randy. Acked-by: Randy Dunlap Signed-off-by: Dmitry Baryshkov Signed-off-by: Jesse Barnes commit bba81165867313766534dd31603de51bdd36ef9b Author: Andrew Morton Date: Wed Jul 30 12:07:04 2008 -0700 PCI: make pci_register_driver() a macro alpha: CC [M] drivers/usb/gadget/u_ether.o In file included from include/asm/dma-mapping.h:7, from include/linux/dma-mapping.h:52, from include/linux/dmaengine.h:29, from include/linux/skbuff.h:29, from include/linux/if_ether.h:114, from include/linux/etherdevice.h:27, from drivers/usb/gadget/u_ether.c:29: include/linux/pci.h: In function 'pci_register_driver': include/linux/pci.h:673: error: 'KBUILD_MODNAME' undeclared (first use in this function) include/linux/pci.h:673: error: (Each undeclared identifier is reported only once include/linux/pci.h:673: error: for each function it appears in.) Sam says: The problem is that u_ether.o is used by two modules so when we build it KBUILD_MODNAME is not defined because kbuild does not know what value to use. And in pci.h we have the following inline: static inline int __must_check pci_register_driver(struct pci_driver *driver) { return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME); } And alpha uses dma-mapping.h to nullify a number of functions that seem to require something from pci.h. Making it a macro fixes this particular problem. However, the underlying issue of a file using KBUILD_MODNAME and being shared between multiple modules is *not* addressed. I guess the answer there is "don't do that". Cc: Sam Ravnborg Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 9d82d8eaec032bf935144e0d5789a5cd4b95e958 Author: Eric Dumazet Date: Thu Jul 31 20:27:31 2008 +0200 PCI: add Broadcom 5708S to VPD length quirk BCM5708S wont work correctly unless VPD length truncated to 128 Signed-off-by: Eric Dumazet Signed-off-by: Jesse Barnes commit 86b89eed9aca2a4a335b9c1bf7380f9183db431f Author: Sujith Date: Thu Aug 7 10:54:57 2008 +0530 ath9k: Revamp wireless mode usage Use a single enum for managing modes, store supported modes by the HW in a bitmask. Register legacy rates with mac80211 only at init. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 3b95978ddadbab594aad6280bfa660a49948af86 Author: Sujith Date: Thu Aug 7 10:54:33 2008 +0530 ath9k: More unused macros Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit f22f558dcaaf2ca413571df0ae8219474af1a46f Author: Sujith Date: Thu Aug 7 10:54:07 2008 +0530 ath9k: Remove a few unused macros and fix indentation Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 06df8bea27e9d6fe4657e8ca0557ab7515695f00 Author: Sujith Date: Thu Aug 7 10:53:39 2008 +0530 ath9k: Use mac80211's band macros and remove enum hal_freq_band Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ea9880fb059e0e95d651eab6029f58e7c81b8602 Author: Sujith Date: Thu Aug 7 10:53:10 2008 +0530 ath9k: Remove redundant data structure ath9k_txq_info Use ath9k_tx_queue_info which contains the same elements, and merge get/set functions of tx queue properties. Also, fix whitespace damage in struct ath_softc. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 60b67f519213cf6d59236d065b0953962b56abca Author: Sujith Date: Thu Aug 7 10:52:38 2008 +0530 ath9k: Cleanup data structures related to HW capabilities Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit b08cbcd4546445740c2a04291204b56f8baf7be2 Author: Adrian Bunk Date: Tue Aug 5 22:06:51 2008 +0300 ath9k: work around gcc ICEs This patch works around an internal compiler error (gcc bug #37014) in all gcc 4.2 compilers and the gcc 4.3 series up to at least 4.3.1 on at least powerpc and mips. Many thanks to Andrew Pinski for analyzing the gcc bug. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit f078f209704849c86bd43c0beccfc1f410ed1c66 Author: Luis R. Rodriguez Date: Mon Aug 4 00:16:41 2008 -0700 ath9k: Add new Atheros IEEE 802.11n driver This adds the new mac80211 11n ath9k Atheros driver. Only STA support is currently enabled and tested. Signed-off-by: Senthil Balasubramanian Signed-off-by: Felix Fietkau Signed-off-by: Jack Howarth Signed-off-by: Jouni Malinen Signed-off-by: Sujith Manoharan Signed-off-by: Luis R. Rodriguez Signed-off-by: Pavel Roskin Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b1a5215004130689aeee9e522585c879d3b71472 Author: Luis R. Rodriguez Date: Mon Aug 4 00:16:40 2008 -0700 ath5k: remove Atheros 11n devices from supported list Remove Atheros 11n devices from being claimed by ath5k as its now handled by ath9k. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 00e8a4da8cf0d7dba8cc4b0da28ea0f12dcf6b36 Author: Luis R. Rodriguez Date: Wed Aug 6 13:28:54 2008 -0700 list.h: add list_cut_position() This adds list_cut_position() which lets you cut a list into two lists given a pivot in the list. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7d283aee50351ec19eaf654a8690d77c4e1dff50 Author: Luis R. Rodriguez Date: Wed Aug 6 15:21:26 2008 -0700 list.h: Add list_splice_tail() and list_splice_tail_init() If you are using linked lists for queues list_splice() will not do what you would expect even if you use the elements passed reversed. We need to handle these differently. We add list_splice_tail() and list_splice_tail_init(). Signed-off-by: Peter Zijlstra Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5423b2ed25993e13009ce39f55d742c3c6d03edb Author: Christian Lamparter Date: Thu Aug 7 10:22:28 2008 +0200 p54: swap short slot time dcf values these "magic" values must to be the other way round... Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 0fc980392e5a06cff34ca7acaac5790bb59528d1 Author: Ivo van Doorn Date: Wed Aug 6 16:18:31 2008 +0200 rt2x00: Block all unsupported modes It was possible for unsupported operating modes to be accepted by the add_interface callback function. This patch will block those modes until proper support has been implemented for them. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8dbc1722a78343eb80f0ce1a3ef1965a9774ad5b Author: Luis Carlos Cobo Date: Wed Aug 6 13:17:54 2008 +0200 mac80211: keep mesh ifaces in allmulti mode Currently a mesh node will not forward a multicast frame if it is not subscribed to the specific multicast address. This patch addresses the issue and fixes mesh multicast forwarding. Signed-off-by: Luis Carlos Cobo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit e32f85f7b917456265d4c30d15f734c4912cfa6a Author: Luis Carlos Cobo Date: Tue Aug 5 19:34:52 2008 +0200 mac80211: fix use of skb->cb for mesh forwarding Now we deal with mesh forwarding before the 802.11->802.3 conversion, thus eliminating a few unnecessary steps. The next hop lookup is called from ieee80211_master_start_xmit() instead of subif_start_xmit(). Until the next hop is found, RA in the frame will be all zeroes for frames originating from the device. For forwarded frames, RA will contain the TA of the received frame, which will be necessary to send a path error if a next hop is not found. Signed-off-by: Luis Carlos Cobo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit eda0c003d1ff14c99d8476b482377ccfaf967b6c Author: Larry Finger Date: Tue Aug 5 11:23:16 2008 -0500 p54: Fix for TX sequence number problem Following "mac80211: fix TX sequence numbers", if a packet has the IEEE80211_TX_CTL_ASSIGN_SEQ assigned, a sequence number must be supplied, either by hardware or software. AFAIK, no such hardware exists for the p54, thus it must be done in software. With this patch, a connection qith p54usb is stable, whereas the interface went off-line in 2-3 hours without this change. Note that this code will have to be reworked for proper sequence numbers on beacons. In addition, the sequence number has been placed in the hardware state, not the vif state. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f367422794315b7632f2a78c93e15b3c757d4be8 Author: Tomas Winkler Date: Mon Aug 4 16:00:44 2008 +0800 iwlwifi: cleanup iwl_tx_skb This patch cleans up iwl_tx_skb function. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 Merge: 1f4de5a... 214c6a7... Author: Russell King Date: Thu Aug 7 11:05:25 2008 +0100 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 Conflicts: arch/arm/mach-pxa/generic.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa2xx.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/reset.c arch/arm/mach-pxa/spitz.c arch/arm/mach-pxa/tosa.c drivers/watchdog/sa1100_wdt.c commit 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 Author: Jonathan Cameron Date: Mon Aug 4 14:41:27 2008 +0100 [ARM] 5185/1: Fix spi num_chipselect for lubbock Change num_chipselect for lubbock ssp master to reflect requirement of spi subsystem that all buses have at least 1 chip select. Signed-off-by: Jonathan Cameron Acked-by: Eric Miao Acked-by: David Brownell Signed-off-by: Russell King commit e6fce5b916cd7f7f79b2b3e53ba74bbfc1d7cf8b Author: Robert Olsson Date: Thu Aug 7 02:23:01 2008 -0700 pktgen: multiqueue etc. Sofar far pktgen have had a restriction to only use one device per kernel thread. With the new multiqueue architecture this is no longer adequate. The patch below is an effort to remove this by in pktgen configuration adding a tag to the device name a la eth0@0 etc. The tag is used for usual device config just as before. Also a new flag is introduced to mirror queue_map with sending threads smp_processor_id() QUEUE_MAP_CPU. An example: We use 4 CPU's to send to one 10g interface (eth0) and we use the new tagging to send a mix of packet sizes, 64, 576 and 1500 bytes. Also we use TX queues according to smp_processor_id() PGDEV=/proc/net/pktgen/kpktgend_0 pgset "add_device eth0@0" PGDEV=/proc/net/pktgen/kpktgend_1 pgset "add_device eth0@1" PGDEV=/proc/net/pktgen/kpktgend_2 pgset "add_device eth0@2" PGDEV=/proc/net/pktgen/kpktgend_3 pgset "add_device eth0@3" .... PGDEV=/proc/net/pktgen/eth0@0 pgset "pkt_size 64" pgset "flag QUEUE_MAP_CPU" PGDEV=/proc/net/pktgen/eth0@1 pgset "pkt_size 572" pgset "flag QUEUE_MAP_CPU" PGDEV=/proc/net/pktgen/eth0@2 pgset "pkt_size 1496" PGDEV=/proc/net/pktgen/eth0@3 pgset "pkt_size 1496" pgset "flag QUEUE_MAP_CPU" Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 32bb93b02da8c75031e601ff1f9a25f99febbe5f Merge: 6edafaa... 3859069... Author: David S. Miller Date: Thu Aug 7 02:10:27 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit a09e64fbc0094e3073dbb09c3b4bfe4ab669244b Author: Russell King Date: Tue Aug 5 16:14:15 2008 +0100 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King commit a1b81a84fff05dbfef45b7012c26e1fee9973e5d Merge: 4fb8af1... 3663b73... Author: Russell King Date: Thu Aug 7 09:55:16 2008 +0100 Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 commit 4fb8af10d0fd09372d52966b76922b9e82bbc950 Merge: f44f82e... 64a99d2... Author: Russell King Date: Thu Aug 7 09:55:03 2008 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes commit f44f82e8a20b98558486eb14497b2f71c78fa325 Author: Russell King Date: Sat Aug 2 19:36:14 2008 +0100 [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include Signed-off-by: Russell King commit be509729356b7433f73df2b9a966674a437fbbc1 Author: Russell King Date: Mon Aug 4 10:41:28 2008 +0100 [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead Remove includes of asm/hardware.h in addition to asm/arch/hardware.h. Then, since asm/hardware.h only exists to include asm/arch/hardware.h, update everything to directly include asm/arch/hardware.h and remove asm/hardware.h. Signed-off-by: Russell King commit 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 Author: Russell King Date: Sun Aug 3 15:06:16 2008 +0100 [ARM] Eliminate useless includes of asm/mach-types.h There are 43 includes of asm/mach-types.h by files that don't reference anything from that file. Remove these unnecessary includes. Signed-off-by: Russell King commit 897d85275d7f061ff0ec838bd5224a9e76ad07d6 Author: Russell King Date: Sun Aug 3 15:04:04 2008 +0100 [ARM] Fix circular include dependency with IRQ headers Signed-off-by: Russell King commit 3859069bc3358772b08bd91efe9edec39a746ea8 Merge: e2c709b... 867240f... Author: Jeff Garzik Date: Thu Aug 7 04:05:46 2008 -0400 Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp commit e2c709b0ba2886b5438b666222b4b3faf82d65a9 Author: Krzysztof Halasa Date: Mon Jun 30 22:09:15 2008 +0200 WAN: remove extra help text from HDLC_PPP config option Remove extra help text from HDLC_PPP config option. Signed-off-by: Krzysztof Hałasa Signed-off-by: Jeff Garzik commit f982307f22db96201e41540295f24e8dcc10c78f Author: Joe Eykholt Date: Wed Jul 2 18:22:02 2008 -0700 net/core: Allow receive on active slaves. If a packet_type specifies an active slave to bonding and not just any interface, allow it to receive frames that came in on that interface. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 0d7a3681232f545c6a59f77e60f7667673ef0e93 Author: Joe Eykholt Date: Wed Jul 2 18:22:01 2008 -0700 net/core: Allow certain receives on inactive slave. Allow a packet_type that specifies the exact device to receive even on an inactive bonding slave devices. This is important for some L2 protocols such as LLDP and FCoE. This can eventually be used for the bonding special cases as well. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit cc9bd5cebc0825e0fabc0186ab85806a0891104f Author: Joe Eykholt Date: Wed Jul 2 18:22:00 2008 -0700 net/core: Uninline skb_bond(). Otherwise subsequent changes need multiple return values. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit db018a5f49e1768891221a580e59f6825c52ab7a Author: Moni Shoua Date: Wed Jul 2 18:21:59 2008 -0700 bonding: Don't destroy bonding master when removing slave via sysfs It is wrong to destroy a bonding master from a context that uses the sysfs of that bond. When last IPoIB slave is unenslaved from by writing to a sysfs file (for bond0 this would be /sys/class/net/bond0/bonding/slaves) the driver tries to destroy the bond. This is wrong and can lead to a lockup or a crash. This fix lets the bonding master stay and relies on the user to destroy the bonding master if necessary (i.e. before module ib_ipoib is unloaded) This patch affects only bonds of IPoIB slaves. Ethernet slaves stay unaffected. Signed-off-by: Moni Shoua Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit f0c76d61779b153dbfb955db3f144c62d02173c2 Author: Jay Vosburgh Date: Wed Jul 2 18:21:58 2008 -0700 bonding: refactor mii monitor Refactor mii monitor. As with the previous ARP monitor refactor, the motivation for this is to handle locking rationally (in this case, removing conditional locking) and generally clean up the code. This patch breaks up the monolithic mii monitor into two phases: an inspection phase, followed by an optional commit phase. The commit phase is the only portion that requires RTNL or makes changes to state, and is only called when inspection finds something to change. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 Author: Gui Jianfeng Date: Wed Aug 6 23:50:04 2008 -0700 tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup If the following packet flow happen, kernel will panic. MathineA MathineB SYN ----------------------> SYN+ACK <---------------------- ACK(bad seq) ----------------------> When a bad seq ACK is received, tcp_v4_md5_do_lookup(skb->sk, ip_hdr(skb)->daddr)) is finally called by tcp_v4_reqsk_send_ack(), but the first parameter(skb->sk) is NULL at that moment, so kernel panic happens. This patch fixes this bug. OOPS output is as following: [ 302.812793] IP: [] tcp_v4_md5_do_lookup+0x12/0x42 [ 302.817075] Oops: 0000 [#1] SMP [ 302.819815] Modules linked in: ipv6 loop dm_multipath rtc_cmos rtc_core rtc_lib pcspkr pcnet32 mii i2c_piix4 parport_pc i2c_core parport ac button ata_piix libata dm_mod mptspi mptscsih mptbase scsi_transport_spi sd_mod scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan] [ 302.849946] [ 302.851198] Pid: 0, comm: swapper Not tainted (2.6.27-rc1-guijf #5) [ 302.855184] EIP: 0060:[] EFLAGS: 00010296 CPU: 0 [ 302.858296] EIP is at tcp_v4_md5_do_lookup+0x12/0x42 [ 302.861027] EAX: 0000001e EBX: 00000000 ECX: 00000046 EDX: 00000046 [ 302.864867] ESI: ceb69e00 EDI: 1467a8c0 EBP: cf75f180 ESP: c0792e54 [ 302.868333] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 302.871287] Process swapper (pid: 0, ti=c0792000 task=c0712340 task.ti=c0746000) [ 302.875592] Stack: c06f413a 00000000 cf75f180 ceb69e00 00000000 c05d0d86 000016d0 ceac5400 [ 302.883275] c05d28f8 000016d0 ceb69e00 ceb69e20 681bf6e3 00001000 00000000 0a67a8c0 [ 302.890971] ceac5400 c04250a3 c06f413a c0792eb0 c0792edc cf59a620 cf59a620 cf59a634 [ 302.900140] Call Trace: [ 302.902392] [] tcp_v4_reqsk_send_ack+0x17/0x35 [ 302.907060] [] tcp_check_req+0x156/0x372 [ 302.910082] [] printk+0x14/0x18 [ 302.912868] [] tcp_v4_do_rcv+0x1d3/0x2bf [ 302.917423] [] tcp_v4_rcv+0x563/0x5b9 [ 302.920453] [] ip_local_deliver_finish+0xe8/0x183 [ 302.923865] [] ip_rcv_finish+0x286/0x2a3 [ 302.928569] [] dev_alloc_skb+0x11/0x25 [ 302.931563] [] netif_receive_skb+0x2d6/0x33a [ 302.934914] [] pcnet32_poll+0x333/0x680 [pcnet32] [ 302.938735] [] net_rx_action+0x5c/0xfe [ 302.941792] [] __do_softirq+0x5d/0xc1 [ 302.944788] [] __do_softirq+0x0/0xc1 [ 302.948999] [] do_softirq+0x55/0x88 [ 302.951870] [] handle_fasteoi_irq+0x0/0xa4 [ 302.954986] [] irq_exit+0x35/0x69 [ 302.959081] [] do_IRQ+0x99/0xae [ 302.961896] [] common_interrupt+0x23/0x28 [ 302.966279] [] default_idle+0x2a/0x3d [ 302.969212] [] cpu_idle+0xb2/0xd2 [ 302.972169] ======================= [ 302.974274] Code: fc ff 84 d2 0f 84 df fd ff ff e9 34 fe ff ff 83 c4 0c 5b 5e 5f 5d c3 90 90 57 89 d7 56 53 89 c3 50 68 3a 41 6f c0 e8 e9 55 e5 ff <8b> 93 9c 04 00 00 58 85 d2 59 74 1e 8b 72 10 31 db 31 c9 85 f6 [ 303.011610] EIP: [] tcp_v4_md5_do_lookup+0x12/0x42 SS:ESP 0068:c0792e54 [ 303.018360] Kernel panic - not syncing: Fatal exception in interrupt Signed-off-by: Gui Jianfeng Signed-off-by: David S. Miller commit ee7af8264dafa0c8c76a8dc596803966c2e29ebc Author: David S. Miller Date: Wed Aug 6 23:35:59 2008 -0700 pkt_sched: Fix "parent is root" test in qdisc_create(). As noticed by Stephen Hemminger, the root qdisc is denoted by TC_H_ROOT, not zero. Signed-off-by: David S. Miller commit c16d118537cadb21d186e35aebad90a13cd78846 Author: Wang Chen Date: Tue Jul 22 13:13:12 2008 +0800 [netdrvr] Drivers should not set IFF_* flag themselves Some hardware set promisc when they are requested to set IFF_ALLMULTI flag. It's ok, but if drivers set IFF_PROMISC flag when they set promisc, it will broken upper layer handle for promisc and allmulti. In addition, drivers can use their own hardware programming to make it. So do not allow drivers to set IFF_* flags. This is a general driver fix, so I didn't split it to pieces and send to specific driver maintainers. Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit fe414248551e2880fe8913577699003ff145ab9d Author: Laurent Pinchart Date: Wed Jul 23 17:41:52 2008 +0200 dm9000: Support MAC address setting through platform data. The dm9000 driver reads the chip's MAC address from the attached EEPROM. When no EEPROM is present, or when the MAC address is invalid, it falls back to reading the address from the chip. This patch lets platform code set the desired MAC address through platform data. Signed-off-by: Laurent Pinchart Signed-off-by: Jeff Garzik commit 9a5d3414202a21ed4b053657345ea0fd492d513a Author: Stephen Hemminger Date: Fri Jul 25 12:07:22 2008 -0700 3c59x: use netdev_alloc_skb Fix possible bug where end of receive buffer could be overwritten. The allocation needs to allow for the reserved space. This would only happen if device received packet greater than Ethernet standard MTU. Change this driver to use netdev_alloc_skb rather than setting skb->dev directly. For the initial allocation it doesn't need to be GFP_ATOMIC. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4 Author: Brandon Philips Date: Tue Jul 15 02:18:41 2008 -0700 ethtool: Expand ethtool_cmd.speed to 32 bits Introduce the speed_hi field to ethtool_cmd, using the reserved space, to expand the speed field to 2^32 Megabits/second. Making this field expansion now gives us plenty of time to fix up the user-space pieces that use SIOCETHTOOL before hardware faster than 64 Gb/s is available. Signed-off-by: Brandon Philips Signed-off-by: Jeff Garzik commit 4f63135eb23015a17eaf4f7478deedf63e98ff5c Author: Ben Collins Date: Wed Jul 30 12:39:02 2008 -0700 pegasus: add blacklist support to fix Belkin bluetooth dongle. Reference: https://launchpad.net/bugs/140511 The Belkin bluetooth dongle unfortunately shares the vendor and device id with the network adapter which causes lockups whenever the bluetooth dongle is inserted. Signed-off-by: Stefan Bader Signed-off-by: Ben Collins Cc: Greg Kroah-Hartman Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 11a859e591befae7413505c68dd241ad8e14748c Author: Andrew Morton Date: Wed Jul 30 12:50:12 2008 -0700 drivers/net/netxen/netxen_nic_hw.c: fix printk warnings drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_read_direct': drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_write_direct': drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' You don't know what type was used for u64 hence they cannot be printed without casting. Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5608784fdf417467cbb2ccfb1129500464416f79 Author: Eugene Teo Date: Wed Jul 30 12:38:59 2008 -0700 hamradio: add missing sanity check to tty operation Add missing sanity check to tty operation. Acked-by: Alan Cox Signed-off-by: Eugene Teo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 11795aa4f89cf68e7aafc8a606feee14c97a12e5 Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:13 2008 -0300 drivers/net: coding styles fixes to drivers/net/8390.c Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit caa1687c0123705182dc0388304a4c9b78fcf41c Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:12 2008 -0300 drivers/net: coding styles fixes to drivers/net/8390p.c Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit 057b61afca098d3ad3d9e8d15914bc9f9315e425 Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:11 2008 -0300 drivers/net: Remove 'return' of void function NS8390p_init() We don't need this into a void function. Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit 71557a37adb5df17631c493b3b7d912938c720b2 Author: Yoshinori Sato Date: Wed Aug 6 19:49:00 2008 -0400 [netdrvr] sh_eth: Add SH7619 support Add support SH7619 Internal ethernet controler. Signed-off-by: Yoshinori Sato Signed-off-by: Jeff Garzik commit d91d4bb9db4a7b2a78accff3560bfd42988c56e4 Author: Thomas Bogendoerfer Date: Thu Jul 31 01:14:24 2008 +0200 METH: fix MAC address setup Setup of the mac filter lost the upper 16bit of the mac address. This bug got unconvered by a patch, which fixed the promiscous handling. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit 0b1ab1b8a4f663a34c23f31d796fd08283b6077a Author: Eduardo Habkost Date: Thu Jul 31 17:36:55 2008 -0300 xen-netfront: use netif_start_queue() on xennet_open() xen-netfront never called netif_start_queue() and was was waking the queue on xennet_open(), triggering the BUG_ON() on __netif_schedule(). Signed-off-by: Eduardo Habkost Signed-off-by: Jeff Garzik commit b08c42b283141d1a79fb748d258dcd1da8baa32e Author: root Date: Thu Jul 31 13:46:08 2008 -0700 qla3xxx: driver version change. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 4ea0d6e5b8dc6c46c1a981e971fa0b78bfe6e5d3 Author: Ron Mercer Date: Thu Jul 31 13:46:07 2008 -0700 qla3xxx: cleanup: Remove some unused structure definitions and structure elements. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 6bc0ed97d5ddb49248cfb76827d72557f4bd0aae Author: Ron Mercer Date: Thu Jul 31 13:46:06 2008 -0700 qla3xxx: cleanup: Remove some unused defined constants in the header file. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit eb115b00992ed21fb8734cbee45d46d37f4010ce Author: Ron Mercer Date: Thu Jul 31 13:46:05 2008 -0700 qla3xxx: fix: Fix IFF_MULTICAST setting. The driver was erroneously clearing this bit though the hardware supports multicast. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 49ef26eb8dc76531b197b591072c403f0e6ec598 Author: Ron Mercer Date: Thu Jul 31 13:46:04 2008 -0700 qla3xxx: fix: Remove unused set_multicast function. This device is one side of a two-function adapter (NIC and iSCSI). Promiscuous mode setting/clearing is not allowed from the NIC side. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 9ad27643f3a054dff9211bb9938f2323907c2ffe Author: Dhananjay Phadke Date: Fri Aug 1 03:14:59 2008 -0700 netxen: fix promisc mode, mtu setting For NX3031, multicast filtering, promisc mode, and max frame size setting is handled by firmware, driver needs to send request to enable/disable it. For old chip revisions / firmware, driver still sets it directly. Added function pointer to set mtu according to chip revision. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 83821a078a1617e120d76954f455204cec78fe9d Author: Dhananjay Phadke Date: Fri Aug 1 03:14:58 2008 -0700 netxen: fix cmd ring init Initialize producer and consumer indices during netdev open(), only for old firmware/chip. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit d71e1be8edd355668a12a18660da03ae993dd9df Author: Dhananjay Phadke Date: Fri Aug 1 03:14:57 2008 -0700 netxen: fix legacy interrupts Fix legacy interrupt mode for NX3031 chips, read pci interrupt state in hardware to guard against spurious interrupt. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit ea771bd51c3b9b9683860515d93e6155a345fa2f Author: David S. Miller Date: Wed Aug 6 23:11:08 2008 -0700 sparc64: Use kernel/uid16.c helpers instead of own copy. Noticed by Adrian Bunk. Signed-off-by: David S. Miller commit a70f939338cae650f177ae79562ec44659788bb4 Author: Dhananjay Phadke Date: Fri Aug 1 03:14:56 2008 -0700 netxen: add new board types Add couple of new board configurations based on NX3031 chip. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 24a7a45511f89959b4f1dc60a66260d09777901a Author: Dhananjay Phadke Date: Fri Aug 1 03:14:55 2008 -0700 netxen: fix link status, link speed For NX3031, the phy is managed by firmware, so driver should avoid setting any phy registers. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 4ad7a018cf4ac3cbad661c28c0f783ee0a6e3bf6 Author: Adrian Bunk Date: Mon Aug 4 11:59:36 2008 +0300 remove bogus CONFIG_GFAR_NAPI's The commit that made the CONFIG_GFAR_NAPI code unconditional was included at the same time as a new CONFIG_GFAR_NAPI user, resulting in these bugus #ifdef's. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 5b1c29b4365d2eaf05eb81899cb1ca847dfe026e Author: Li Yang Date: Wed Aug 6 15:08:50 2008 +0800 net/fs_enet: remove redundant messages for performance Currently when we do a packet flood to the Ethernet port, the console reports error every time when a packet is dropped. This is too redundant and cost performance. Remove message for this type of event. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 9a33e883564c2db8e1b3b645de4579a98ac084d2 Author: Ayaz Abdulla Date: Wed Aug 6 12:12:34 2008 -0400 forcedeth: add tx pause limit This patch adds support for limiting the number of tx pause frames to a default of 8. Previously, hardware would send out continuous stream of pause frames. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 06941931d8697dd939d7cac379565b1b2de1415f Author: Ayaz Abdulla Date: Wed Aug 6 12:12:18 2008 -0400 forcedeth: add jumbo frame support for mcp79 This patch adds jumbo frame support for MCP79 chipsets. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9c6624352cdba7ef4859dae44eb48d538ac78d1b Author: Ayaz Abdulla Date: Wed Aug 6 12:11:42 2008 -0400 forcedeth: add new tx stat counters This patch adds support for new tx statistic counters in the hardware - unicast, multicast, and broadcast Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 1ef6841b4c4d9cc26e53271016c1d432ea65ed24 Author: Ayaz Abdulla Date: Wed Aug 6 12:11:03 2008 -0400 forcedeth: fix rx error policy This patch enforces a stricter policy on rx errors. The driver needs to verify whether there are multiple rx errors versus a single error. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 8bad4afe1257585967a1b38cd3f21324b260812b Merge: f71eb1a... 3c4dc71... Author: Jeff Garzik Date: Thu Aug 7 02:05:01 2008 -0400 Merge branch 'via-velocity' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into tmp commit f71eb1a24a8cdde8d388c8f93e935aa7ac491047 Author: Stephen Hemminger Date: Mon Aug 4 13:33:37 2008 -0700 sky2: fix PM related regressions Fix the problems reported for 2.6.27-rc1 caused by over aggressive power management. Turning clock off on PCI Express is problematic for WOL, and when doing multi-booting. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a6ef5e9d7dd6f3de4f88b68c390f0f0d7072944c Author: Alexander Duyck Date: Mon Aug 4 15:00:27 2008 -0700 igb: remove igb_init_managability as it is deprecated igb_init_managability does not actually perform any function as the two registers it attempts to write are both read only on the host. This patch removes the function and all references to it from the driver. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit ec796b4ffc947f74e9e85198d1648e9556300c55 Author: Alexander Duyck Date: Mon Aug 4 15:00:18 2008 -0700 igb: remove three redundant functions left in the code Three functions were left in the code that are no longer used. I am removing these functions just to keep the code clean. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 549bdd84dce242e15a9d7b42787ae481ba29f458 Author: Alexander Duyck Date: Mon Aug 4 15:00:06 2008 -0700 igb: correct issue of set_mta member of mac.ops not being populated The igb_mta_set function was not being correctly used Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 726c09e7b6b7b9f9015ae7ce803ba4cd67121d67 Author: Alexander Duyck Date: Mon Aug 4 14:59:56 2008 -0700 igb: fixes 82576 serdes init to correctly support manual flow control changes This patch changes the PCS configuration for serdes so that the flow control options change be set via the ethtool -A option. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c743a87eabc50110ba5e473e707079c9b429779a Author: Alexander Duyck Date: Mon Aug 4 14:59:46 2008 -0700 igb: fix null pointer dereference seen with fiber NICs With a fiber or serdes NIC installed the driver was causing a null pointer dereference on driver unload. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 106ef2fef3778f4af2e0f796a108cc19c6114264 Author: Alexander Duyck Date: Mon Aug 4 14:59:37 2008 -0700 igb: fix comments The internal name was used in comments, replaced with silicon part number. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c2ac3ef35c44195ca2b9c29275c7c6830eb2d9aa Author: Jay Cliburn Date: Mon Aug 4 19:05:10 2008 -0500 atl1: deal with hardware rx checksum bug The L1 hardware contains a bug that flags a fragmented IP packet as having an incorrect TCP/UDP checksum, even though the packet is perfectly valid and its checksum is correct. There's no way to distinguish between one of these good packets and a packet that actually contains a TCP/UDP checksum error, so all we can do is allow the packet to be handed up to the higher layers and let it be sorted out there. Add a comment describing this condition and remove the code that currently fails to handle what may or may not be a checksum error. Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit f0f422e5735ba9f48039aa7dd4c9daa16b996c2c Author: Bruce Allan Date: Mon Aug 4 17:21:53 2008 -0700 e1000e: remove inapplicable test for ioport There are currently no devices supported by the e1000e driver which need ioport resources, remove the test for it and all unnecessary code associated with it (struct e1000_adapter elements, local variables, etc.) Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c43bc57e5d72932b5e64bc5e4e7741bedbcaaf5f Author: Jesse Brandeburg Date: Mon Aug 4 17:21:40 2008 -0700 e1000e: fix drv load issues a few people seem to have problems maintaining gigabit link and it was root caused to an interaction between the managability firmware on the host and the driver, not communicating. The form of communication they use is the drv_load bit. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 10aa4c0447c308738dade244e23036f2fcbfb140 Author: Auke Kok Date: Mon Aug 4 17:21:20 2008 -0700 e1000e: perform basic 82573 EEPROM checks for known issues 82573 EEPROMs have been shipped out with known issues. While most people will never see the issues some people do and we know how to address them. Warn the user if we find one of these EEPROM issues. Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 44defeb3f6f98ea9bb48a2fe6eb9004e9e1a49a1 Author: Jeff Kirsher Date: Mon Aug 4 17:20:41 2008 -0700 e1000e: convert ndev_ printks to something smaller The ndev_* printk's are too lenghty and we don't need to specify the adapter/netdev struct at all, making this a lot more readable. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 77970ea50b8e7ee9733a6589bf61ed9c02f20ee9 Author: Brice Goglin Date: Wed Aug 6 16:15:23 2008 +0200 myri10ge: set 64bits consistent DMA mask Set 64bits consistent DMA mask since it improves performance in some cases. No need to check the return value since it is not required for the driver to work. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 6a4c4ad2f0aa331324649579649c5d9064893079 Author: Brice Goglin Date: Wed Aug 6 16:14:43 2008 +0200 myri10ge: update firmware headers Update myri10ge firmware headers. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 58750139001bae11a1f9b074f3a9c774fecf5ba8 Author: Greg Ungerer Date: Thu Jul 31 14:38:07 2008 +1000 Move all of include/asm-m68knommu to arch/m68knommu/include/asm. With the current kbuild infrastructure in place no other changes are required for this to work. Signed-off-by: Greg Ungerer commit f780a9f119caa48088b230836a7fa73d1096de7c Author: Yevgeny Petrilin Date: Wed Aug 6 20:14:06 2008 -0700 mlx4_core: Add ethernet fields to CQE struct Add ethernet-related fields to struct mlx4_cqe so that the mlx4_en ethernet NIC driver can share the same definition. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 685d87f7ccc649ab92b55e18e507a65d0e694eb9 Author: Linus Torvalds Date: Wed Aug 6 19:24:47 2008 -0700 Revert "pcm_native.c: remove unused label" This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2. The label is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible snd_assert() macro. That macro could probably be improved to be along the lines of #define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0) or similar to make sure that we always both evaluate 'expr' and parse 'args', but while gcc should optimize it all away, I'm too lazy to really verify that. So I'll just admit defeat and will continue to live with the annoying warning. Noted-by: Robert P. J. Day Signed-off-by: Linus "Grr.." Torvalds commit 11d46123bfea068a48483f00518d301f452647fb Author: David S. Miller Date: Wed Aug 6 18:30:43 2008 -0700 ipv4: Fix over-ifdeffing of ip_static_sysctl_init. Noticed by Paulius Zaleckas. Signed-off-by: David S. Miller commit f8d91faff3bb82c7026d6a2a5c97ee7d88bc0229 Author: Stephen Rothwell Date: Wed Aug 6 18:14:28 2008 -0700 of/sparc: remove include of linux/of_platform.h from asm/of_platform.h Now that we have removed all inclusions of asm/of_platform.h, this compatability include can be removed. Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit f99e8f277f1172c49ac7b0585aed5b094fe235d4 Author: Linus Torvalds Date: Wed Aug 6 17:36:23 2008 -0700 iSeries: Fix up viotty_ioctl BKL locking fallout The bogus code to call into the n_tty layer got removed in commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe ("Remove bogons from the iSeries console"), but it left a now uninitialized "return ret;" around. Not that this code has ever even compiled since the BKL pushdown, since not only is "ret" no longer initialized, it was never actually declared even originally. Replace it with a "return -ENOIOCTLCMD" Pointed-out-by: Paul Mackerras Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 0510eeb7367aca017c6320d04cfd9cbc3b5dd992 Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 turn cifs_setattr into a multiplexor that calls the correct function Signed-off-by: Jeff Layton Signed-off-by: Steve French commit feb3e20cee25729447e1abdcb40c040b691d457a Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 move file time and dos attribute setting logic into new function Break up cifs_setattr further by moving the logic that sets file times and dos attributes into a separate function. This patch also refactors the logic a bit so that when the file is already open then we go ahead and do a SetFileInfo call. SetPathInfo seems to be unreliable when setting times on open files. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 3fe5c1dd0a8bf3756c447a28a578593176949d1d Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 spin off cifs_setattr with unix extensions to its own function Create a new cifs_setattr_unix function to handle a setattr when unix extensions are enabled and have cifs_setattr call it. Also, clean up variable declarations in cifs_setattr. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 680db0136e0778a0d7e025af7572c6a8d82279e2 Author: Linus Torvalds Date: Wed Aug 6 15:14:13 2008 -0700 pcm_native.c: remove unused label This fixes the warning sound/core/pcm_native.c: In function 'snd_pcm_fasync': sound/core/pcm_native.c:3262: warning: label 'out' defined but not used Signed-off-by: Linus Torvalds commit 816d8c6a2580562698cf0fa0b9e5b4dd570e636e Author: Andrew Paprocki Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 The it8705 chip supports 16-bit fan tachometers in revisions at least >= 0x03 (Version G). This patch enables 16-bit fan readings on all revisions >= 0x03 just like the it8712, it8716, and it8718 chips. Signed-off-by: Andrew Paprocki Signed-off-by: Jean Delvare commit 0475169c13e177e1af5a02f5e9f30fda13dc0b86 Author: Andrew Paprocki Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 The it8712 chip supports 16-bit fan tachometers in revisions >= 0x07. Revisions >= 0x08 dropped support for 8-bit fan divisor registers. The patch enables 16-bit fan readings on all revisions >= 0x07 just like the it8716 and it8718 chips. Signed-off-by: Andrew Paprocki Signed-off-by: Jean Delvare commit 116d0486bdefc11f71e567cadf0c47f788b4dd06 Author: Frank Myhr Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus AMD NPT 0Fh cpus use 6 bit VID codes. Successive codes with msb 0 describe 25mV decrements, while those with msb 1 describe 12.5mV decrements. Existing hwmon-vid.c is correct only for codes with msb 0; add support for the codes with msb 1. Ref: p 309, Table 71 AMD Publication 32559, BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf Signed-off-by: Frank Myhr Signed-off-by: Jean Delvare commit 15872212e876de9ae404108e4ad231a645b55b54 Author: Frank Myhr Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle Signed-off-by: Frank Myhr Signed-off-by: Jean Delvare commit 6c633c3025c75f5fcf3a76d375faff34e3be021b Author: Sean MacLennan Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: ad7414 driver Driver for the Analog Devices AD7414 temperature monitoring chip. Signed-off-by: Sean MacLennan Signed-off-by: Jean Delvare commit 84f768c1633cfc547d82b9dc671ffea2f3785542 Author: Krzysztof Helt Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: (thmc50) Add support for critical temperature limits Add critical temperature limits to the driver. These limits are read only. Signed-off-by: Krzysztof Helt Signed-off-by: Jean Delvare commit 68f823de3f1916cc0694376330c08377706b877d Author: Grant Coady Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: (adm9240) Remove EXPERIMENTAL dependency The adm9240 driver is in the kernel for three years now, time to remove the EXPERIMENTAL dependency. Signed-off-by: Grant Coady Signed-off-by: Jean Delvare commit 2f8ea97a45e9db382787dd7afa7f500ee661aa7b Author: Jean Delvare Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83627hf) Drop reset module parameter Drop the reset parameter of the w83627hf driver. It seems it wasn't that useful. It was dropped from the Linux 2.4 version of this driver back in July 2004. The only users who have reported that they were still using this parameter, needed it to switch the chip from automatic fan speed control back to manual mode. Now that the driver creates pwmN_enable sysfs files, users will be able to use these files instead, which is way less agressive. Signed-off-by: Jean Delvare Acked-by: Dominik Geyer commit a95a5ed856e902e513119d4cc5b745faa202f761 Author: Dominik Geyer Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83627hf) Add pwm_enable sysfs interface Adds support for pwm_enable sysfs interface for the w83627hf driver. Signed-off-by: Dominik Geyer Signed-off-by: Jean Delvare commit ad02ad85cf221c9a0574b48516762e37cceca0da Author: Marc Hulsman Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83791d) Use fan divisor bits from vbat register Update w83791d with fan bits in vbat mon register (7.48 of the datasheet). This change allows all fans to have a divisor of 128, and fixes a problem with incorrectly reported fan speeds. Signed-off-by: Marc Hulsman Signed-off-by: Jean Delvare commit 05a5e477687ac7a22c0791b3e899ed7d539f7b95 Author: Jean Delvare Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (f71882fg) Delete needless forward declarations These functions aren't used before being defined, so there's no point in forward-declaring them. Signed-off-by: Jean Delvare Acked-by: Hans de Goede commit 549edb83327f2a5027a22d65b10603b01dc40175 Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Add support for the SMSC SCH5027 Add support for the SCH5027. The differences to the DME1737 are: - No support for programmable temp offsets - In auto mode, PWM outputs stay on min value if temp goes below low threshold and can't be programmed to fully turn off - Different voltage scaling - No VID input Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 55d68d75ab00e60953f8784af5927b60967a297f Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Skip detection if forced Skip the checking of the device ID register in the hwmon register block if the force_id option is used. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 73ce48f6c6b9d9dcf6a2bba0bcde39ede76809f0 Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Cleanups Fix names of attribute structs to make them more consistent with the rest of the code. Minor comment changes. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 970a8a513c30a1c3e8995609a153658a34bc02bf Author: Geert Uytterhoeven Date: Wed Aug 6 22:19:39 2008 +0200 m68k/amiserial: fix fallout of tty break handling rework commit 9e98966c7bb94355689478bc84cc3e0c190f977e (tty: rework break handling) forgot to update one exit point of rs_break() in the Amiga serial driver. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9 Author: Wim Van Sebroeck Date: Wed Aug 6 20:19:41 2008 +0000 [WATCHDOG] more coding style clean-up's More coding style clean-up's. Signed-off-by: Wim Van Sebroeck commit 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc Author: Denis ChengRq Date: Mon Aug 4 09:51:40 2008 +0800 kbuild: a better way to generate cscope database change It's a problem about cscope target of kernel Makefile, and the cscope plugin of emacs: 1. `make cscope` will generate cscope.files cscope.{in,po,}.out; 2. the cscope plugin expect a cscope.out.{in,po,}; 3. the default `cscope -b` would generate cscope.{in,po,}.out; There are three approach to solve it: 1. modify the cscope C code; 2. modify the cscope emacs plugin lisp code; 3. modify the Makefile; I have tried to communicate with the cscope upstream, but later I realize the third approach is most meaningful. Signed-off-by: Sam Ravnborg commit 0b0de144333fca335a0111a6f9c59176ad43ba0a Author: Robert P. J. Day Date: Mon Aug 4 13:31:32 2008 -0400 Kconfig: Extend "menuconfig" for modules to simplify Kconfig file Given that the init/Kconfig file uses a "menuconfig" directive for modules already, might as well wrap all the submenu entries in an "if" to toss all those dependencies. Signed-off-by: Robert P. J. Day Acked-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 0758416325dc75e203ab974aa5e937bef7d2afef Author: Erkki Lintunen Date: Wed Aug 6 22:11:33 2008 +0200 bugfix for scripts/patch-kernel in 2.6 sublevel stepping scripts/patch-kernel script can't patch a tree, say, from 2.6.25 to 2.6.26.1, because of a wrong comparison in context of patching 2.6.x base. Fix it. Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 7a48bdd01b5cab9c043b4d42a3f377624d6259f2 Author: Sam Ravnborg Date: Wed Aug 6 21:56:53 2008 +0200 kbuild: fix O=.. build with arm With a make O=... build kbuild would only create the include2/asm symlink for archs that not yet had moved headers to include/$ARCH/include There is no longer any reason to avoid the symlink for archs that has moved their headers so create it unconditionally. This fixes arm because kbuild checked for include/asm-$ARCH/errno.h and that file was not present for arm but the platform files are not yet moved. Signed-off-by: Sam Ravnborg Cc: Russell King commit 2e4f40d2eb763a17c75c07fff605402737260c59 Merge: d660668... e34a8ae... Author: Linus Torvalds Date: Wed Aug 6 12:07:36 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: async_tx: fix missing braces in async_xor_zero_sum commit d6606683a5e3dac35cb979c7195f54ed827567bd Author: Linus Torvalds Date: Wed Aug 6 12:04:54 2008 -0700 Revert duplicate "mm/hugetlb.c must #include " This reverts commit 7cb93181629c613ee2b8f4ffe3446f8003074842, since we did that patch twice, and the problem was already fixed earlier by 78a34ae29bf1c9df62a5bd0f0798b6c62a54d520. Reported-by: Andi Kleen Signed-off-by: Linus Torvalds commit a14ad05f47b55ea84136eb4da43ea96fa469326a Merge: 0016fe9... 8401d92... Author: Linus Torvalds Date: Wed Aug 6 12:03:43 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: Preserve response data alignment bug when it is harmless commit 0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b Merge: 8bc5fb6... bcbd2b6... Author: Linus Torvalds Date: Wed Aug 6 11:46:39 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Update generic config [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU [IA64] Eliminate trailing backquote in IA64_SGI_UV [IA64] update generic_defconfig to support sn2. [IA64] update generic_defconfig for 2.6.27-rc1 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 [IA64] Cleanup generated file not ignored by .gitignore [IA64] pv_ops: fix ivt.S paravirtualization commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe Author: Alan Cox Date: Wed Aug 6 14:06:29 2008 +0100 Remove bogons from the iSeries console The iSeries driver calls into the n_tty ldisc code directly for some bizarre reason. I previously tagged this with a query but this actually does need fixing as n_tty methods when you have a different ldisc set are not a good thing to call. In n_tty mode this change should have no effect, the core tty layer has always called the ldisc ioctl method *anyway* and will call the one for the right ldisc. Signed-off-by: Alan Cox Acked-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3a35c27ac68cea19c252e127ec61099648eb4870 Author: Randy Dunlap Date: Wed Aug 6 10:08:56 2008 -0700 docbook: fix v4l fatal filename error docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory make[1]: *** [Documentation/DocBook/videobook.xml] Error 1 Signed-off-by: Randy Dunlap cc: mchehab@infradead.org Signed-off-by: Linus Torvalds commit 12b7a1523eda9cd72362fdda928ddb995ecdc06d Author: Wim Van Sebroeck Date: Fri Jul 18 19:59:48 2008 +0000 [WATCHDOG] sbc8360.c - move stop code into a function Move the sbc8360.c watchdog stop code into a seperate function. Signed-off-by: Wim Van Sebroeck commit 0c06090c9472db0525cb6fe229c3bea33bbbbb3c Author: Wim Van Sebroeck Date: Fri Jul 18 11:41:17 2008 +0000 [WATCHDOG] Coding style - Indentation - part 2 This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1. Main changes: * Re-structure the ioctl switch call for all drivers as follows: switch (cmd) { case WDIOC_GETSUPPORT: case WDIOC_GETSTATUS: case WDIOC_GETBOOTSTATUS: case WDIOC_GETTEMP: case WDIOC_SETOPTIONS: case WDIOC_KEEPALIVE: case WDIOC_SETTIMEOUT: case WDIOC_GETTIMEOUT: case WDIOC_GETTIMELEFT: default: } This to make the migration from the drivers to the uniform watchdog device driver easier in the future. Signed-off-by: Wim Van Sebroeck commit 5eb82498e3a6da8a979c48945e3c1a85c10ccc25 Author: Wim Van Sebroeck Date: Thu Jul 17 18:08:47 2008 +0000 [WATCHDOG] Coding style - Indentation - part 1 This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1: The preferred way to ease multiple indentation levels in a switch statement is to align the "switch" and its subordinate "case" labels in the same column instead of "double-indenting" the "case" labels. Signed-off-by: Wim Van Sebroeck commit 0d7b101404f7bedcf3f448c1667c3744551cd9ee Author: Anton Vorontsov Date: Thu Jul 3 23:51:36 2008 -0700 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs The mpc8xxx_wdt driver is using two registers: SWSRR to push magic numbers, and SWCRR to control the watchdog. Both registers are available on the MPC8xx, and seem to have the same offsets and semantics as in MPC83xx/MPC86xx watchdogs. The only difference is prescale value. So this driver simply works on the MPC8xx CPUs. One quirk is needed for the MPC8xx, though. It has small prescale value and slow CPU, so the watchdog resets board prior to the driver has time to load. To solve this we should split initialization in two steps: start ping the watchdog early, and register the watchdog userspace interface later. MPC823 seem to be the first CPU in MPC8xx line, so we use fsl,mpc823-wdt compatible matching. Signed-off-by: Anton Vorontsov Tested-by: Jochen Friedrich Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit cb55d282a0d2156e7d40ee81726ab16b569e96d7 Author: Anton Vorontsov Date: Thu Jul 3 23:51:36 2008 -0700 [WATCHDOG] mpc8xxx_wdt: fix build CC drivers/watchdog/mpc8xxx_wdt.o drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_ioctl': drivers/watchdog/mpc8xxx_wdt.c:156: error: 'cmd' undeclared (first use in this function) drivers/watchdog/mpc8xxx_wdt.c:156: error: (Each undeclared identifier is reported only once drivers/watchdog/mpc8xxx_wdt.c:156: error: for each function it appears in.) drivers/watchdog/mpc8xxx_wdt.c: At top level: drivers/watchdog/mpc8xxx_wdt.c:176: warning: initialization from incompatible pointer type This patch ought to be folded into mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 59ca1b0d14ca71bdefef372ccd5035341e0ca091 Author: Anton Vorontsov Date: Thu Jul 3 23:51:35 2008 -0700 [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g mpc83xx_wdt.c renamed to mpc8xxx_wdt.c, now we can do various renames in the file itself. Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f Author: Anton Vorontsov Date: Thu Jul 3 23:51:34 2008 -0700 [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt Rename the driver because now we support some MPC86xx processors. There are no changes to the mpc83xx_wdt.c file, yet. When possible, we do file renames and changes separately (because Linus once asked so, because it helps git to track the renamed files). Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 500c919e3d699644cc9d6c1e93022481baafd8e1 Author: Anton Vorontsov Date: Thu Jul 3 23:51:34 2008 -0700 [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs On MPC86xx the watchdog could be enabled only at power-on-reset, and could not be disabled afterwards. We must ping the watchdog from the kernel until the userspace handles it. MPC83xx CPUs are only differ in a way that watchdog could be disabled once, but after it was enabled via software it becomes just the same as MPC86xx. Thus, to support MPC86xx I added the kernel timer which pings the watchdog until the userspace opens it. Since we implemented the timer, now we're able to implement proper handling for the CONFIG_WATCHDOG_NOWAYOUT case, for MPC83xx and MPC86xx. Also move the probe code into subsys_initcall, because we want start pinging the watchdog ASAP, and misc devices are available in subsys_initcall. Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit ef8ab12ec2d663f9b146c920a4dd589a7e767f2d Author: Anton Vorontsov Date: Thu Jul 3 23:51:32 2008 -0700 [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver This patch simply converts mpc83xx_wdt to the OF platform driver so we can directly work with the device tree without passing various stuff through platform data. Signed-off-by: Anton Vorontsov Acked-by: Stephen Rothwell Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit c9488520512df659ad21df5d100b52fed96bdf07 Author: Alan Cox Date: Thu Jul 3 23:51:32 2008 -0700 [WATCHDOG] pcwd: a couple of watchdogs escaped conversion Fix them up. Once we know the long term plan the watchdogs can all get shrunk massively anyway Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 089ab0791d127e8ada526c4b4d18b7584be8acf0 Author: Wim Van Sebroeck Date: Tue Jul 15 11:46:11 2008 +0000 [WATCHDOG] Clean-up includes Use #include instead of Use #include instead of Clean-up includes. Signed-off-by: Wim Van Sebroeck commit 9e74114d96bb5dbaa17b9292139b0c6205e0b971 Author: Wim Van Sebroeck Date: Tue Jul 15 11:18:04 2008 +0000 [WATCHDOG] hpwdt.c - fix double includes The last clean-up created 2 times the same include. delete the doubles. Signed-off-by: Wim Van Sebroeck commit 96e2e6fafaedd83bd899f682907e14d1eec17390 Merge: 0967d61... 7c4be5a... Author: Wim Van Sebroeck Date: Wed Aug 6 11:58:26 2008 +0000 [WATCHDOG] Merge code clean-up's from Alan Cox. Merge branch 'alan' of ../linux-2.6-watchdog-mm Fixed Conflicts in the following files: drivers/watchdog/booke_wdt.c drivers/watchdog/mpc5200_wdt.c drivers/watchdog/sc1200wdt.c Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Wim Van Sebroeck commit 9ea7d5ad84d61a4e8b892d5ed12ccc26f9d6351b Author: Josh Boyer Date: Tue Aug 5 18:50:18 2008 -0400 powerpc/4xx: Update defconfig files for 2.6.27-rc1 Update the defconfig files for 4xx boards. This also makes the mutli-board defconfigs a bit more useful by enabling some of the more common modules. Signed-off-by: Josh Boyer commit 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3 Author: Adrian Bunk Date: Mon Aug 4 11:59:05 2008 +0200 xen-blkfront.c: make blkif_ioctl() static This patch makes the needlessly global blkif_ioctl() static. Signed-off-by: Adrian Bunk Acked-by: Jeremy Fitzhardinge Signed-off-by: Jens Axboe commit 1ac0ae062cecd37587f5b951089f90e1d9d91769 Author: Denis ChengRq Date: Mon Aug 4 11:56:30 2008 +0200 bio: make use of bvec_nr_vecs Since introduced in 7ba1ba12eee, it should be made use of. Signed-off-by: Denis ChengRq Signed-off-by: Jens Axboe commit ba198efb5ef4e5f4927a18ff95a58f40c58cbaa9 Author: Mike Miller Date: Mon Aug 4 11:54:55 2008 +0200 cciss: fix bug if scsi tape support is disabled Bug fix. If SCSI tape support is turned off we get an implicit declaration of cciss_unregister_scsi error in cciss_remove_one. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 935dc8d7575e6c1292b057e39045a40f1fbe26e7 Author: Mike Miller Date: Mon Aug 4 11:54:54 2008 +0200 cciss: add support for multi lun tape devices This patch adds support for multi-lun devices in a SAS environment. It's required for the support of media changers. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit f4a93bcda74edfe6977dcf296ed8c86119638871 Author: Mike Miller Date: Mon Aug 4 11:54:53 2008 +0200 cciss: change the way we notify scsi midlayer of tape drives This patch changes way we notify the scsi layer that something has changed on the SCSI tape side of the driver. The user can now just tell the driver to rescan a particular controller rather than having to know the SCSI nexus to echo into the SCSI mid-layer. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit eece695f8bf9d1aacf3a119ab8e21db31948e40b Author: Mike Miller Date: Mon Aug 4 11:54:53 2008 +0200 cciss: fix negative logical drive count in procfs This patch fixes a problem where the logical volume count may go negative. In some instances if several logical are configured on a controller and all of them are deleted using the online utilities the volume count in /proc may go negative with no way get it correct again. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40 Author: Mike Miller Date: Mon Aug 4 11:54:52 2008 +0200 cciss: remove redundant code This patch removes redundant code where ever logical volumes are added or removed. It adds 3 new functions that are called instead of having the same code spread throughout the driver. It also removes the cciss_getgeometry function. The patch is fairly complex but we haven't figured out how to make it any simpler and still do everything that needs to be done. Some of the complexity comes from having to special case booting from cciss. Otherwise the gendisk doesn't get added in time and the switchroot will fail. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit a72da29b6cbc5cf918567f2a0d76df6871e94b01 Author: Mike Miller Date: Mon Aug 4 11:54:51 2008 +0200 cciss: make rebuild_lun_table behave better This patch makes the rebuild_lun_table smart enough to not rip a logical volume out from under the OS. Without this fix if a customer is running hpacucli to monitor their storage the driver will blindly remove and re-add the disks whenever the utility calls the CCISS_REGNEWD ioctl. Unfortunately, both hpacucli and ACUXE call the ioctl repeatedly. Customers have reported IO coming to a standstill. Calling the ioctl is the problem, this patch is the fix. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit f7108f91cdcaca07c6a99777b2724093294f36ee Author: Nikanth Karthikesan Date: Mon Aug 4 10:56:07 2008 +0200 cciss: return -EFAULT if copy_from_user() fails Return -EFAULT instead of -ENOMEM if copy_from_user() fails. Signed-off-by: Nikanth Karthikesan Acked-by: Mike Miller Signed-off-by: Jens Axboe commit 04793dd041bbb88a39b768b714c725de2c339b51 Author: Laurent Pinchart Date: Thu Jul 31 17:11:12 2008 -0300 V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. Data buffers on the stack are not allowed for USB I/O. Use dynamically allocated buffers instead. Signed-off-by: Bruce Schmid Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 835f09c6594aa98cbfae05c5466a81fda3081d2c Author: Laurent Pinchart Date: Wed Jul 30 18:54:48 2008 -0300 V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams The Bison Electronics 5986:0300 and 5986:0303 webcams require the UVC_QUIRK_PROBE_MINMAX quirk. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 3f6ac497b036533d1a63ba04fdbe710c55e14cda Author: Robert Jarzmik Date: Sat Aug 2 07:10:04 2008 -0300 V4L/DVB (8611): Add suspend/resume to pxa_camera driver PXA suspend switches off DMA core, which loses all context of previously assigned descriptors. As pxa_camera driver relies on DMA transfers, setup the lost descriptors on resume and retrigger frame acquisition if needed. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 2e521061db61a35dd64ea85a1642f9a9dfde2872 Author: Robert Jarzmik Date: Fri Aug 1 20:14:50 2008 -0300 V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. Add suspend/resume hooks to call soc operation specific suspend and resume functions. This ensures the camera chip has been previously resumed, as well as the camera bus. These hooks in camera chip drivers should save/restore chip context between suspend and resume time. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 01c1e4ca8ec39d21be0cd9d1b300d479de97298a Author: Paul Mundt Date: Fri Aug 1 19:48:51 2008 -0300 V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. So, platform_driver_unregister() doesn't actually have a return value, nor do any of the void __exit routines. It's reassuring to know that people copy and paste blindly. This completely blew up my compiler. Signed-off-by: Paul Mundt Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d483b730681fa527f343dcc859185e06d60ae121 Author: Robert Lowery Date: Wed Jul 30 19:43:11 2008 -0300 V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 quoting Robert Lowery: I think I've found the cause of the oops. [...] BTW it appears I have fixed my tuning problems with the updated patch below. This reverts a change Mauro made a while back. All is good now :) [...] The good news is that I've got a better patch that definitely works this time and even better, makes use of the standard firmware (rather than the Australian specific one). ...based on an earlier patch by Hans-Frieder Vogt: http://www.linuxtv.org/pipermail/linux-dvb/2008-May/026280.html Signed-off-by: Robert Lowery Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fcf5cb2406827fc9d3f3fe260ac883ef72b8bac0 Author: Rabin Vincent Date: Sun Aug 3 07:58:54 2008 -0300 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 Bad mini/max check in setting control values (the gamma in zc3xx could be set to null). Signed-off-by: Rabin Vincent Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit cebf3b67f7f80fd69bd1ff5787fee69ab8fd3c2a Author: Jean-Francois Moine Date: Sun Aug 3 07:52:53 2008 -0300 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. The crash is due to USB exchanges done at interrupt level. These exchanges, tied to autogain, are now done by the application. Also, there is a fix about autogain start. Concerned subdrivers: etoms, pac7311, sonixj and spca561. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 594f5b8b3cce6d3137ebf260b7386520b2534385 Author: Jean-Francois Moine Date: Fri Aug 1 06:37:51 2008 -0300 V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. The hflip and vflip controls work for ov519 - ov7670 only. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a674a3b492d8085fd02ee49ed11cb42c63f0f71a Author: Eugeniy Meshcheryakov Date: Fri Aug 1 08:23:41 2008 -0300 V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro Pinnacle Hybrid Pro (2304:0226) requires mts_firmware flag to have any sound. Without this flag it is useful only for watching silent movies. Signed-off-by: Eugeniy Meshcheryakov Signed-off-by: Mauro Carvalho Chehab commit 00b27ce6205be8a943ae63d7bcce5208a9802bc3 Author: Jean-Francois Moine Date: Wed Jul 30 05:47:54 2008 -0300 V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 01b988b2abdd60cc58c7916c5f91602d2571e0c5 Author: Jean-Francois Moine Date: Wed Jul 30 05:33:11 2008 -0300 V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. Bug introduced in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 16fca0449997f1d77cd2d45d6c34b015f3853012 Author: Jean-Francois Moine Date: Wed Jul 30 05:14:38 2008 -0300 V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 335b3f88f2c3cb101059970f57860503b20d210f Author: Jean-Francois Moine Date: Wed Jul 30 04:53:02 2008 -0300 V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. This option is changed to GSPCA_DEBUG and it is set by default in gspca.h. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 8f47a3cefbb275893ce26ade7094599e4b129bb3 Author: Jean-Francois Moine Date: Tue Jul 29 14:14:04 2008 -0300 V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. The values from win traces do not seem to work while the webcams did work with gspca v1. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0cd6759da646aae9d117df278ce3d5f3cab31904 Author: Jean-Francois Moine Date: Tue Jul 29 05:25:28 2008 -0300 V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. The hflip and vflip controls work for ov7670 only. This bridge/sensor inverts blue and red - not fixed. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c2cfcf701881c9a4ef42d5a956f9f2d006c2af8e Author: Yoichi Yuasa Date: Tue Jul 29 05:30:58 2008 -0300 V4L/DVB (8564): fix vino driver build error The vino driver needs #include drivers/media/video/vino.c: In function 'vino_ioctl': drivers/media/video/vino.c:4364: error: implicit declaration of function 'video_usercopy' make[3]: *** [drivers/media/video/vino.o] Error 1 Signed-off-by: Yoichi Yuasa Signed-off-by: Mauro Carvalho Chehab commit dfb9aff025c4c874f9169e2fd690ce6fee2309fe Author: Adrian Bunk Date: Mon Jul 28 16:58:19 2008 -0300 V4L/DVB (8563): fix drivers/media/video/arv.c compilation This patch fixes the following compile errors: <-- snip --> ... CC [M] drivers/media/video/arv.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: In function 'ar_ioctl': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:544: error: implicit declaration of function 'video_usercopy' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: At top level: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:758: error: unknown field 'type' specified in initializer make[4]: *** [drivers/media/video/arv.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 886f8d678a28882c193c2886c7280c0eccd8c9dd Author: Adrian Bunk Date: Mon Jul 28 16:58:05 2008 -0300 V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select Also for the new DVB_DRX397XD driver the FW_LOADER select and the corresponding dependency on HOTPLUG can be removed. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 35774f42dc6e765fc1d8a92f36e218f617a17e1a Author: Mauro Carvalho Chehab Date: Mon Jul 28 18:07:35 2008 -0300 V4L/DVB (8558): media/video/Kconfig: fix a typo Thanks to Hermann Gausterer for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit b01466e14ce82ff96b74db19ebdaefb34a430a24 Author: Jean-Francois Moine Date: Mon Jul 28 07:52:27 2008 -0300 V4L/DVB (8552): gspca: Bad pixel format in the spca508 subdriver. The pixel format should have been changed in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 738608ae08572bf915c3fcd40e9579fbca06464b Author: Jean-Francois Moine Date: Mon Jul 28 06:41:51 2008 -0300 V4L/DVB (8550): gspca: Change a bit the init of ov7660 and Sonix JPEG bridges. Set back some values of gspcav1 in init of sonixj sensor ov7660. Add some comments. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit edc9189c879af8cc8f1bf9746e63c5b014801a8a Author: Randy Dunlap Date: Mon Jul 28 15:39:38 2008 -0300 V4L/DVB (8549a): fix kernel-doc warning, function name, and docbook filename Change function name in kernel-doc and add kernel-doc for parameter @index: Warning(linhead//drivers/media/video/videodev.c:2090): No description found for parameter 'index' Also change source file name in DocBook/videobook.tmpl to match the new source file name. Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 8c6a5cad1eec38c2bf3af94eb2d4350be29fa208 Author: Alexander Beregalov Date: Wed Aug 6 02:43:24 2008 -0700 sparc: i8042-sparcio.h: fix warning drivers/input/serio/i8042-sparcio.h:95: warning: 'sparc_i8042_driver' defined but not used Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit abf5cdb89d09ca981db10e1a85fd8531440165f2 Author: Joakim Koskela Date: Wed Aug 6 02:40:25 2008 -0700 ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer Here's a revised version, based on Herbert's comments, of a fix for the ipv4-inner, ipv6-outer interfamily ipsec beet mode. It fixes the network header adjustment during interfamily, as well as makes sure that we reserve enough room for the new ipv6 header if we might have something else as the inner family. Also, the ipv4 pseudo header construction was added. Signed-off-by: Joakim Koskela Acked-by: Herbert Xu Signed-off-by: David S. Miller commit eb49e63093498cd17382018495b8cfb5b4a679bd Author: Joakim Koskela Date: Wed Aug 6 02:39:30 2008 -0700 ipsec: Interfamily IPSec BEET Here's a revised version, based on Herbert's comments, of a fix for the ipv6-inner, ipv4-outer interfamily ipsec beet mode. It fixes the network header adjustment in interfamily, and doesn't reserve space for the pseudo header anymore when we have ipv6 as the inner family. Signed-off-by: Joakim Koskela Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 9714be7da8b32f36d2468fe08ff603b6402df8cf Author: Krzysztof Piotr Oledzki Date: Wed Aug 6 02:35:44 2008 -0700 netfilter: fix two recent sysctl problems Starting with 9043476f726802f4b00c96d0c4f418dde48d1304 ("[PATCH] sanitize proc_sysctl") we have two netfilter releated problems: - WARNING: at kernel/sysctl.c:1966 unregister_sysctl_table+0xcc/0x103(), caused by wrong order of ini/fini calls - net.netfilter is duplicated and has truncated set of records Thanks to very useful guidelines from Al Viro, this patch fixes both of them. Signed-off-by: Krzysztof Piotr Oledzki Acked-by: Al Viro Signed-off-by: David S. Miller commit 1ca615fb816ba85dc765209a9b58ab82cc99bce0 Author: Rami Rosen Date: Wed Aug 6 02:34:21 2008 -0700 ipv6: replace dst_metric() with dst_mtu() in net/ipv6/route.c. This patch replaces dst_metric() with dst_mtu() in net/ipv6/route.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 6d273f8d011c351c9603c1dbfeae2c7458edd30d Author: Rami Rosen Date: Wed Aug 6 02:33:49 2008 -0700 ipv4: replace dst_metric() with dst_mtu() in net/ipv4/route.c. This patch replaces dst_metric() with dst_mtu() in net/ipv4/route.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 26b994fad6a062697846a861ecc008447409dfb6 Author: Steve French Date: Wed Aug 6 05:11:33 2008 +0000 [CIFS] Code cleanup in old sessionsetup code Remove some long lines Signed-off-by: Steve French commit 95089910933e10768cfef1ab0bab0c55b962aacb Author: Jeff Layton Date: Wed Aug 6 04:39:02 2008 +0000 [CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir If a server supports unix extensions but does not support POSIX create routines, then the client will create a new inode with a standard SMB mkdir or create/open call and then will set the mode. When it does this, it does not take the setgid bit on the parent directory into account. This patch has CIFS flip on the setgid bit when the parent directory has it. If the share is mounted with "setuids" then also change the group owner to the gid of the parent. This patch should apply cleanly on top of the setattr cleanup patches that I sent a few weeks ago. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 2dd2dfa060650118661422d4e666ac804c388751 Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg The new name is more clear since this is also used to set file attributes. We'll need the pid_of_opener arg so that we can pass in filehandles of other pids and spare ourselves an open call. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 6fc000e5190234c7e5b244d1e2095d50b630d63f Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 change CIFSSMBSetTimes to CIFSSMBSetPathInfo CIFSSMBSetTimes is a deceptive name. This function does more that just set file times. Change it to CIFSSMBSetPathInfo, which is closer to its real purpose. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 063ea27925d70b1d9dd4343d685f722f0274bfd1 Author: Steve French Date: Wed Aug 6 04:23:13 2008 +0000 [CIFS] fix trailing whitespace Jeff left trailing whitespace in previous patch Signed-off-by: Steve French commit 4e1e7fb9e879d48011a887715d7966484d9644ea Author: Jeff Layton Date: Sat Aug 2 07:26:12 2008 -0400 bundle up Unix SET_PATH_INFO args into a struct and change name We'd like to be able to use the unix SET_PATH_INFO_BASIC args to set file times as well, but that makes the argument list rather long. Bundle up the args for unix SET_PATH_INFO call into a struct. For now, we don't actually use the times fields anywhere. That will be done in a follow-on patch. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit e34a8ae79056e6cea4a1ac21119ee3c91f378f99 Author: Dan Williams Date: Tue Aug 5 10:22:05 2008 -0700 async_tx: fix missing braces in async_xor_zero_sum Found-by: Yuri Tikhonov Signed-off-by: Dan Williams commit 9e96af8525264973d8d1f800b0ddce0289fc0bdd Author: Suresh Jayaraman Date: Tue Aug 5 14:38:40 2008 +0530 Fix missing braces in cifs_revalidate() Fix missing braces introduced during commit cea218054ad277d6c126890213afde07b4eb1602. Though setting wbrc to 0 keeps this from causing real bug, this should have been there. Acked-by: Jeff Layton Signed-off-by: Suresh Jayaraman Signed-off-by: Steve French commit 3663b736a5083b3bce74520b637f630f01f66a7f Author: Haavard Skinnemoen Date: Tue Aug 5 13:57:38 2008 +0200 avr32: Use instead of Update all avr32-specific files to use the new platform-specific header locations. Drivers shared with ARM are left alone for now. Signed-off-by: Haavard Skinnemoen commit 964d219b6a8a79ea4c8d77b6dcdcbbcda403c392 Author: Haavard Skinnemoen Date: Tue Aug 5 13:49:09 2008 +0200 avr32: Introduce arch/avr32/mach-*/include/mach Add arch/avr32/mach-*/include to include search path and copy all the files from include/asm/arch there. The old files will be removed once ARM does the same change and all common drivers are converted. Signed-off-by: Haavard Skinnemoen commit 84db8d7cdb072866f5a6c6ac2c9a74c5c48dd22f Author: Haavard Skinnemoen Date: Tue Aug 5 13:35:07 2008 +0200 avr32: Move include/asm-avr32 to arch/avr32/include/asm Leaving include/asm/arch alone for now. Signed-off-by: Haavard Skinnemoen commit 5595cffc8248e4672c5803547445e85e4053c8fc Author: Pekka Enberg Date: Tue Aug 5 09:28:47 2008 +0300 SLUB: dynamic per-cache MIN_PARTIAL This patch changes the static MIN_PARTIAL to a dynamic per-cache ->min_partial value that is calculated from object size. The bigger the object size, the more pages we keep on the partial list. I tested SLAB, SLUB, and SLUB with this patch on Jens Axboe's 'netio' example script of the fio benchmarking tool. The script stresses the networking subsystem which should also give a fairly good beating of kmalloc() et al. To run the test yourself, first clone the fio repository: git clone git://git.kernel.dk/fio.git and then run the following command n times on your machine: time ./fio examples/netio The results on my 2-way 64-bit x86 machine are as follows: [ the minimum, maximum, and average are captured from 50 individual runs ] real time (seconds) min max avg sd SLAB 22.76 23.38 22.98 0.17 SLUB 22.80 25.78 23.46 0.72 SLUB (dynamic) 22.74 23.54 23.00 0.20 sys time (seconds) min max avg sd SLAB 6.90 8.28 7.70 0.28 SLUB 7.42 16.95 8.89 2.28 SLUB (dynamic) 7.17 8.64 7.73 0.29 user time (seconds) min max avg sd SLAB 36.89 38.11 37.50 0.29 SLUB 30.85 37.99 37.06 1.67 SLUB (dynamic) 36.75 38.07 37.59 0.32 As you can see from the above numbers, this patch brings SLUB to the same level as SLAB for this particular workload fixing a ~2% regression. I'd expect this change to help similar workloads that allocate a lot of objects that are close to the size of a page. Cc: Matthew Wilcox Cc: Andrew Morton Acked-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 929badad6296c9682d271c97f39b78cb7007128a Author: Sean MacLennan Date: Thu Jul 31 13:41:11 2008 +1000 powerpc/44x: Incorrect NOR offset in Warp DTS FPGA offset in NOR flash was converted incorrectly when switching from 64M to 4M flash. Signed-off-by: Sean MacLennan Signed-off-by: Josh Boyer commit 1d555cf168315ceb5422df9bff348466da2c549d Author: Sean MacLennan Date: Sat Jul 26 11:50:19 2008 +1000 powerpc/44x: Warp DTS changes for board updates Added support for the new at24 eeprom driver. Documented a new fpga section, the DMA scatter gather list. Removed index from i2c. No longer needed. Fixed the leds section. Signed-off-by: Sean MacLennan Signed-off-by: Josh Boyer commit 048040a36d46dced846b058bc083c212e0c75615 Author: Sean MacLennan Date: Sat Jul 26 11:45:10 2008 +1000 powerpc/4xx: Cleanup Warp for i2c driver changes. This patch removes the i2c code which is now obsolete due to the new ibm iic driver walking the device tree for child nodes. There are two other small cleanups that came indirectly from the ad7414 code review. Make sure Tlow is correct and handle the case where i2c_smbus_read_word_data fails. Signed-off-by: Sean MacLennan Signed-off-by: Josh Boyer commit 1c5402ba55e809f0b685f07728794ea27b197f33 Author: Valentine Barshak Date: Thu Jul 10 04:02:34 2008 +1000 powerpc/44x: Adjust warp-nand resource end address Adjust the NDFC resource end value (resource size = end - start + 1). Signed-off-by: Valentine Barshak Signed-off-by: Josh Boyer commit 214c6a7ed13e01cab2addeef56124067e4d20147 Author: Eric Miao Date: Tue Jul 29 14:39:34 2008 +0800 [ARM] sa1100_wdt: use reset_status to remember watchdog reset status Signed-off-by: Eric Miao commit 04fef228fb00dd79475a2313f4ba73b4fbfe2faa Author: Eric Miao Date: Tue Jul 29 14:26:00 2008 +0800 [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage Due to the problem of reset status bits being handled by different registers between pxa2xx and pxa3xx, introduce a global reset_status variable, initialized by SoC-specific code and later being used by other drivers. And also introduce clear_reset_status(), which is used to clear the corresponding status bits. Pass RESET_STATUS_ALL to clear all bits. Signed-off-by: Eric Miao commit ab277121426edca2ee0601fc6318c9467350771e Author: Eric Miao Date: Tue Jul 29 14:08:14 2008 +0800 [ARM] pxa: introduce reset.h for reset specific header information Signed-off-by: Eric Miao commit bcbd2b65868213c1426654304de3da330cde6b3a Author: Tony Luck Date: Mon Aug 4 15:47:25 2008 -0700 [IA64] Update generic config Changes to support a new platform in my lab. Signed-off-by: Tony Luck commit ee694d6b4106ca09dcf23f839b44efd152a1da82 Author: Tony Luck Date: Mon Aug 4 13:39:28 2008 -0700 [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU The SGI XP and GRU drivers only work on SMP systems ... the Kconfig file only disallowed them for non-SMP X86. Signed-off-by: Tony Luck commit 3351ab9b345ba5c2872acbf718cc631df72d3732 Author: Jack Steiner Date: Thu Jul 31 07:52:50 2008 -0500 [IA64] Eliminate trailing backquote in IA64_SGI_UV Eliminate trailing backquote in IA64_SGI_UV config. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit ceffacc1d6041392d1b47750b14bf6845c2372ab Author: Robin Holt Date: Sat Aug 2 13:35:27 2008 -0500 [IA64] update generic_defconfig to support sn2. This patch changes the generic_defconfig so it works on all sn2 platforms I have access to. There is only one support configuration which was not tested and that configuration is only a combination of two tested configurations. With this patchset applied, a generic kernel can be booted on either a RHEL 5.2, RHEL5.3, or SLES10 SP1 root and operate. All features needed by SGI's ProPack are also working. I have not tested all features of RHEL or SLES, but they do at least boot. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8 Author: Alexander Beregalov Date: Mon Aug 4 11:12:18 2008 -0700 IB/ipath: Fix printk format warnings ipath_driver.c:1260: warning: format '%Lx' expects type 'long long unsigned int', but argument 6 has type 'long unsigned int' ipath_driver.c:1459: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_intr.c:358: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:358: warning: format '%Lu' expects type 'long long unsigned int', but argument 6 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 5 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1123: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1130: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1032: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1045: warning: format '%llX' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_iba7220.c:2506: warning: format '%Lu' expects type 'long long unsigned int', but argument 4 has type 'u64' Signed-off-by: Alexander Beregalov Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Roland Dreier commit ac0af91ebcaedc1a9e1d2987ecbd22837924e6b9 Author: Robin Holt Date: Sat Aug 2 13:32:06 2008 -0500 [IA64] update generic_defconfig for 2.6.27-rc1 This patch updates the generic_defconfig for 2.6.27-rc1 by simply doing a make oldconfig and holding down the carriage return. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit d1339df1f46d10e0396c1470f371b0d1b23295ba Author: Robin Holt Date: Sat Aug 2 13:29:24 2008 -0500 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 ia64 has compiled with NR_CPUS=4096 for a couple releases, just forgot to update Kconfig to allow it. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit be43324d8b316fe83a7b4027334f2825f1121c2c Author: Steve Wise Date: Mon Aug 4 11:08:37 2008 -0700 RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device Running 'ifconfig up' on the cxgb3 interface with iw_cxgb3 loaded causes a deadlock. The rtnl lock is already held in this path. The function fw_supports_fastreg() was introduced in 2.6.27 to conditionally set the IB_DEVICE_MEM_MGT_EXTENSIONS bit iff the firmware was at 7.0 or greater, and this function also acquires the rtnl lock and which thus causes a deadlock. Further, if iw_cxgb3 is loaded _after_ the nic interface is brought up, then the deadlock does not occur and therefore fw_supports_fastreg() does need to grab the rtnl lock in that path. It turns out this code is all useless anyway. The low level driver will NOT allow the open if the firmware isn't 7.0, so iw_cxgb3 can always set the MEM_MGT_EXTENSIONS bit. Simplify... Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 94567ef16bf38e98a7de214694d327feb3ec42d4 Author: Robin Holt Date: Mon Aug 4 11:06:16 2008 -0700 [IA64] Cleanup generated file not ignored by .gitignore arch/ia64/kernel/vmlinux.lds is a generated file. Tell git to ignore it. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 1c355a6e80fd08e623416138631e240f431385f2 Author: Steve Wise Date: Mon Aug 4 11:05:43 2008 -0700 RDMA/cxgb3: Fix up MW access rights - MWs don't have local read/write permissions. - Set the MW_BIND enabled bit if a MR has MW_BIND access. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 5f0f66b022ba607db0a083bf5cc13e4a4336e366 Author: Steve Wise Date: Mon Aug 4 11:04:42 2008 -0700 RDMA/cxgb3: Fix QP capabilities - Set the stag0 and fastreg capability bits only for kernel qps. - QP_PRIV flag is no longer used, so don't set it. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 3f44675439b136d51179d31eb5a498383cb38624 Author: Roland Dreier Date: Mon Aug 4 11:02:14 2008 -0700 RDMA/cma: Remove padding arrays by using struct sockaddr_storage There are a few places where the RDMA CM code handles IPv6 by doing struct sockaddr addr; u8 pad[sizeof(struct sockaddr_in6) - sizeof(struct sockaddr)]; This is fragile and ugly; handle this in a better way with just struct sockaddr_storage addr; [ Also roll in patch from Aleksey Senin to switch to struct sockaddr_storage and get rid of padding arrays in struct rdma_addr. ] Signed-off-by: Roland Dreier commit 9b3cbf725fb98733976fd02e2e557f0ae3028df0 Author: Isaku Yamahata Date: Mon Aug 4 12:02:28 2008 +0900 [IA64] pv_ops: fix ivt.S paravirtualization Recent kernels are not booting on some HP systems (though it does boot on others). James and Willy reported the problem. James did the bisection to find the commit that caused the problem: 498c5170472ff0c03a29d22dbd33225a0be038f4. [IA64] pvops: paravirtualize ivt.S Two instructions were wrongly paravirtualized such that _FROM_ macro had been used where _TO_ was intended Cc: James Bottomley Cc: "Wilcox, Matthew R" Signed-off-by: Isaku Yamahata Signed-off-by: Tony Luck commit bf9c8c9ddef7ef761ae9747349175adad0ef16ce Author: Timur Tabi Date: Fri Aug 1 14:58:44 2008 -0500 ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers If an OSS application calls SNDCTL_DSP_SYNC, then ALSA will call the driver's _hw_params and _prepare functions again. On the Freescale MPC8610 DMA ASoC driver, this caused the DMA controller to be unneccessarily re-programmed, and apparently it doesn't like that. The DMA will then not operate when instructed. This patch relocates much of the DMA programming to fsl_dma_open(), which is called only once. Signed-off-by: Timur Tabi Signed-off-by: Takashi Iwai commit 93d0ec851820688ef5b21a84e7460d3cf405f5c5 Author: Jeff Layton Date: Sat Aug 2 08:00:48 2008 -0400 remove locking around tcpSesAllocCount atomic variable The global tcpSesAllocCount variable is an atomic already and doesn't really need the extra locking around it. Remove the locking and just use the atomic_inc_return and atomic_dec_return functions to make sure we access it correctly. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 8401d92ba46a1e859464cbd9c9ee304f6e361da3 Author: David Moore Date: Tue Jul 29 23:46:25 2008 -0700 firewire: Preserve response data alignment bug when it is harmless Recently, a bug having to do with the alignment of transaction response data was fixed. However, some apps such as libdc1394 relied on the presence of that bug in order to function correctly. In order to stay compatible with old versions of those apps, this patch preserves the bug in cases where it is harmless to normal operation (such as the single quadlet read) due to a simple duplication of data. This guarantees maximum compatability for those users who are using the old app with the fixed kernel. Signed-off-by: David Moore Signed-off-by: Stefan Richter commit 66b8bd3c405389213de1d6ba6c2565990f62004f Author: Jeff Layton Date: Fri Aug 1 17:54:32 2008 +0000 [CIFS] properly account for new user= field in SPNEGO upcall string allocation ...it doesn't look like it's being accounted for at the moment. Also try to reorganize the calculation to make it a little more evident what each piece means. This should probably go to the stable series as well... Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 5e710e37bde120bb069f691bee68e69ef4393173 Author: Peter Zijlstra Date: Wed Jul 30 13:26:57 2008 +0200 lockdep: change scheduler annotation While thinking about David's graph walk lockdep patch it _finally_ dawned on me that there is no reason we have a lock class per cpu ... Sorry for being dense :-/ The below changes the annotation from a lock class per cpu, to a single nested lock, as the scheduler never holds more that 2 rq locks at a time anyway. If there was code requiring holding all rq locks this would not work and the original annotation would be the only option, but that not being the case, this is a much lighter one. Compiles and boots on a 2-way x86_64. Signed-off-by: Peter Zijlstra Cc: David Miller Signed-off-by: Ingo Molnar commit e0fdace10e75dac67d906213b780ff1b1a4cc360 Author: David Miller Date: Fri Aug 1 01:11:22 2008 -0700 debug_locks: set oops_in_progress if we will log messages. Otherwise lock debugging messages on runqueue locks can deadlock the system due to the wakeups performed by printk(). Signed-off-by: David S. Miller Signed-off-by: Ingo Molnar commit e0d22d03c06c4e2c194d7010bc1e4a972199f156 Author: Krzysztof Helt Date: Thu Jul 31 23:43:44 2008 +0200 x86: fdiv bug detection fix The fdiv detection code writes s32 integer into the boot_cpu_data.fdiv_bug. However, the boot_cpu_data.fdiv_bug is only char (s8) field so the detection overwrites already set fields for other bugs, e.g. the f00f bug field. Use local s32 variable to receive result. This is a partial fix to Bugzilla #9928 - fixes wrong information about the f00f bug (tested) and probably for coma bug (I have no cpu to test this). Signed-off-by: Krzysztof Helt Cc: Andrew Morton Signed-off-by: Ingo Molnar commit 2f0e58ac3ad0bb2ec0924dc11f8e55d01f44ca90 Author: Jeff Layton Date: Thu Jul 31 21:30:11 2008 +0000 [CIFS] remove level of indentation from decode_negTokenInit Most of this function takes place inside of an unnecessary "else" clause. The other 2 cases both return 0, so we can remove some indentation here. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 3c4dc7115dfdb9e0450b7a3b0649948f5356d4af Author: Francois Romieu Date: Thu Jul 31 22:51:18 2008 +0200 via-velocity: velocity_init_{rd/tx}_ring use kcalloc(..., GFP_KERNEL). Allocate and free everyting outside of the locked section. Spotted-by: Arjan van de Ven Signed-off-by: Francois Romieu Fixed-by: Seguier Regis Signed-off-by: Andrew Morton commit 0fe9f15ee8bd652242a778ddfd30aa6d97a98e23 Author: Francois Romieu Date: Thu Jul 31 22:10:10 2008 +0200 via-velocity: separated struct allow wholesale copy during MTU changes. It should help people fix the bugs in my code :o) Signed-off-by: Francois Romieu Signed-off-by: Andrew Morton commit 419ca3f13532793b81aff09f80c60af3eacbb43d Author: David Miller Date: Tue Jul 29 21:45:03 2008 -0700 lockdep: fix combinatorial explosion in lock subgraph traversal When we traverse the graph, either forwards or backwards, we are interested in whether a certain property exists somewhere in a node reachable in the graph. Therefore it is never necessary to traverse through a node more than once to get a correct answer to the given query. Take advantage of this property using a global ID counter so that we need not clear all the markers in all the lock_class entries before doing a traversal. A new ID is choosen when we start to traverse, and we continue through a lock_class only if it's ID hasn't been marked with the new value yet. This short-circuiting is essential especially for high CPU count systems. The scheduler has a runqueue per cpu, and needs to take two runqueue locks at a time, which leads to long chains of backwards and forwards subgraphs from these runqueue lock nodes. Without the short-circuit implemented here, a graph traversal on a runqueue lock can take up to (1 << (N - 1)) checks on a system with N cpus. For anything more than 16 cpus or so, lockdep will eventually bring the machine to a complete standstill. Signed-off-by: David S. Miller Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 6679ce6e5f519096612b480d255d9ca97be0c2be Merge: 2c3d103... 6e86841... Author: Ingo Molnar Date: Thu Jul 31 18:34:22 2008 +0200 Merge branch 'linus' into sched/urgent commit 4a273f209cc95d148f79b4c96d3d03997b44ffda Author: Ingo Molnar Date: Wed Jul 30 10:22:07 2008 +0200 sched clock: couple local and remote clocks When taking the time of a remote CPU, use the opportunity to couple (sync) the clocks to each other. (in a monotonic way) Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Mike Galbraith commit 56b906126d33904d4d67615d0d5b95dbdf1f27ca Author: Ingo Molnar Date: Wed Jul 30 10:15:55 2008 +0200 sched clock: simplify __update_sched_clock() - return the current clock instead of letting callers fetch it from scd->clock Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Mike Galbraith commit 18e4e36c66d6edbdefc639692206cdf01e468713 Author: Ingo Molnar Date: Wed Jul 30 10:13:35 2008 +0200 sched: eliminate scd->prev_raw eliminate prev_raw and use tick_raw instead. It's enough to base the current time on the scheduler tick timestamp alone - the monotonicity and maximum checks will prevent any damage. Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Mike Galbraith commit 50526968e99afbca34924abcb04658b6dd5c5ea5 Author: Ingo Molnar Date: Wed Jul 30 09:39:48 2008 +0200 sched clock: clean up sched_clock_cpu() - simplify the remote clock rebasing Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Mike Galbraith commit e4e4e534faa3c2be4e165ce414f44b76ada7208c Author: Ingo Molnar Date: Mon Apr 14 08:50:02 2008 +0200 sched clock: revert various sched_clock() changes Found an interactivity problem on a quad core test-system - simple CPU loops would occasionally delay the system un an unacceptable way. After much debugging with Peter Zijlstra it turned out that the problem is caused by the string of sched_clock() changes - they caused the CPU clock to jump backwards a bit - which confuses the scheduler arithmetics. (which is unsigned for performance reasons) So revert: # c300ba2: sched_clock: and multiplier for TSC to gtod drift # c0c8773: sched_clock: only update deltas with local reads. # af52a90: sched_clock: stop maximum check on NO HZ # f7cce27: sched_clock: widen the max and min time This solves the interactivity problems. Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Mike Galbraith commit 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca Author: Julia Lawall Date: Fri Jul 25 22:08:09 2008 +0200 fs/nfsd/export.c: Adjust error handling code involving auth_domain_put Once clp is assigned, it never becomes NULL, so we can make a label for it in the error handling code. Because the call to path_lookup follows the call to auth_domain_find, its error handling code should jump to this new label. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r@ expression x,E; statement S; position p1,p2,p3; @@ ( if ((x = auth_domain_find@p1(...)) == NULL || ...) S | x = auth_domain_find@p1(...) ... when != x if (x == NULL || ...) S ) <... if@p3 (...) { ... when != auth_domain_put(x) when != if (x) { ... auth_domain_put(x); ...} return@p2 ...; } ...> ( return x; | return 0; | x = E | E = x | auth_domain_put(x) ) @exists@ position r.p1,r.p2,r.p3; expression x; int ret != 0; statement S; @@ * x = auth_domain_find@p1(...) <... * if@p3 (...) S ...> * return@p2 \(NULL\|ret\); // Signed-off-by: Julia Lawall Signed-off-by: J. Bruce Fields commit 52fd8ca6ad4124c15952ded35cfcf6adbd7ae8d4 Author: Vegard Nossum Date: Wed Jul 30 09:29:06 2008 -0700 IB/ipath: Use unsigned long for irq flags A few functions in the ipath driver incorrectly use unsigned int to hold irq flags for spin_lock_irqsave(). This patch was generated using the Coccinelle framework with the following semantic patch: The semantic patch I used was this: @@ expression lock; identifier flags; expression subclass; @@ - unsigned int flags; + unsigned long flags; ... <+... ( spin_lock_irqsave(lock, flags) | _spin_lock_irqsave(lock) | spin_unlock_irqrestore(lock, flags) | _spin_unlock_irqrestore(lock, flags) | read_lock_irqsave(lock, flags) | _read_lock_irqsave(lock) | read_unlock_irqrestore(lock, flags) | _read_unlock_irqrestore(lock, flags) | write_lock_irqsave(lock, flags) | _write_lock_irqsave(lock) | write_unlock_irqrestore(lock, flags) | _write_unlock_irqrestore(lock, flags) | spin_lock_irqsave_nested(lock, flags, subclass) | _spin_lock_irqsave_nested(lock, subclass) | spin_unlock_irqrestore(lock, flags) | _spin_unlock_irqrestore(lock, flags) | _raw_spin_lock_flags(lock, flags) | __raw_spin_lock_flags(lock, flags) ) ...+> Cc: Ralph Campbell Cc: Julia Lawall Cc: Alexey Dobriyan Signed-off-by: Vegard Nossum Signed-off-by: Roland Dreier commit e08198169ec5facb3d85bb455efa44a2f8327842 Author: Roland Dreier Date: Wed Jul 30 07:21:46 2008 -0700 IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr() wr->sg_list should be set to the sge pointer passed in, not priv->cm.rx_sge. Reported-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 39675e89fb472c1b9c8e740e00acb1df2bbc6be7 Merge: 6e86841... 2c3d103... Author: Ingo Molnar Date: Wed Jul 30 10:38:30 2008 +0200 Merge branch 'sched/urgent' into sched/clock commit 176803562b541ebf4744e44e6600fb60660255d5 Author: Shirish Pargaonkar Date: Tue Jul 29 21:26:13 2008 +0000 [CIFS] cifs send2 not retrying enough in some cases on full socket There are cases in which, on a full socket which requires retry on sending data by the app (cifs in this case), that we were not retrying since we did not reinitialize a counter. This fixes the retry logic to retry up to 15 seconds on stuck sockets. Signed-off-by: Shirish Pargaonkar Signed-off-by: Steve French commit 44051fed5763c4f55eb8a7eeae6ede52bc15f85f Author: Steve French Date: Tue Jul 29 21:20:14 2008 +0000 [CIFS] oid should also be checked against class in cifs asn The oid coming back from asn1_header_decode is a primitive object so class should be checked to be universal. Acked-by: Love Hörnquist Åstrand Signed-off-by: Steve French commit 231367fd9bccbb36309ab5bf5012e11a84231031 Author: Adrian Bunk Date: Tue Jul 22 20:21:16 2008 +0300 mm: unexport ksize This patch removes the obsolete and no longer used exports of ksize. Signed-off-by: Adrian Bunk Signed-off-by: Pekka Enberg commit 2c3d103ba90827cfb478bf10464d9b5b9cea369c Author: Hugh Dickins Date: Fri Jul 25 19:45:00 2008 +0100 sched: move sched_clock before first use Move sched_clock() up to stop warning: weak declaration of `sched_clock' after first use results in unspecified behavior (if -fno-unit-at-a-time). Signed-off-by: Hugh Dickins Cc: Mike Travis Cc: Ben Herrenschmidt Cc: Linuxppc-dev@ozlabs.org Signed-off-by: Ingo Molnar commit e26873bb10f722f10b1af9de05119a3d7cbc07b2 Author: roel kluin Date: Tue Jul 22 16:51:15 2008 -0400 sched: test runtime rather than period in global_rt_runtime() Test runtime rather than period Signed-off-by: Roel Kluin Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 94f565598827e2015dce97f4c1ac4871ab84407b Author: OGAWA Hirofumi Date: Sun Jul 27 20:27:06 2008 +0900 sched: fix SCHED_HRTICK dependency Currently, it seems SCHED_HRTICK allowed for !SMP. But, it seems to have no dependency of it. Fix it. Signed-off-by: OGAWA Hirofumi Signed-off-by: Ingo Molnar commit 157124c11f4217733691223ecf5ee47558ae9495 Author: Peter Zijlstra Date: Mon Jul 28 11:53:11 2008 +0200 sched: fix warning in hrtick_start_fair() Benjamin Herrenschmidt reported: > I get that on ppc64 ... > > In file included from kernel/sched.c:1595: > kernel/sched_fair.c: In function ‘hrtick_start_fair’: > kernel/sched_fair.c:902: warning: comparison of distinct pointer types lacks a cast > > Probably harmless but annoying. s64 delta = slice - ran; --> delta = max(10000LL, delta); Probably ppc64's s64 is long vs long long.. I think hpa was looking at sanitizing all these 64bit types across the architectures. Use max_t with an explicit type meanwhile. Reported-by: Benjamin Herrenschmid Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 2106b531eaa2edd0c2dfa735a0556c08c7ba3c86 Merge: e338125... ba66129... Author: Ingo Molnar Date: Sun Jul 27 23:15:26 2008 +0200 Merge branch 'timers/urgent' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into timers/urgent commit ba661292a2bc6ddd305a212b0526e5dc22195fe7 Author: Oleg Nesterov Date: Wed Jul 23 20:52:05 2008 +0400 posix-timers: fix posix_timer_event() vs dequeue_signal() race The bug was reported and analysed by Mark McLoughlin , the patch is based on his and Roland's suggestions. posix_timer_event() always rewrites the pre-allocated siginfo before sending the signal. Most of the written info is the same all the time, but memset(0) is very wrong. If ->sigq is queued we can race with collect_signal() which can fail to find this siginfo looking at .si_signo, or copy_siginfo() can copy the wrong .si_code/si_tid/etc. In short, sys_timer_settime() can in fact stop the active timer, or the user can receive the siginfo with the wrong .si_xxx values. Move "memset(->info, 0)" from posix_timer_event() to alloc_posix_timer(), change send_sigqueue() to set .si_overrun = 0 when ->sigq is not queued. It would be nice to move the whole sigq->info initialization from send to create path, but this is not easy to do without uglifying timer_create() further. As Roland rightly pointed out, we need more cleanups/fixes here, see the "FIXME" comment in the patch. Hopefully this patch makes sense anyway, and it can mask the most bad implications. Reported-by: Mark McLoughlin Signed-off-by: Oleg Nesterov Cc: Mark McLoughlin Cc: Oliver Pinter Cc: Roland McGrath Cc: stable@kernel.org Cc: Andrew Morton Signed-off-by: Thomas Gleixner kernel/posix-timers.c | 17 +++++++++++++---- kernel/signal.c | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) commit 54da1174922cddd4be83d5a364b2e0fdd693f513 Author: Oleg Nesterov Date: Wed Jul 23 20:52:05 2008 +0400 posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun do_schedule_next_timer() sets info->si_overrun = timr->it_overrun_last, this discards the already accumulated overruns. Signed-off-by: Oleg Nesterov Cc: Mark McLoughlin Cc: Oliver Pinter Cc: Roland McGrath Cc: stable@kernel.org Cc: Andrew Morton Signed-off-by: Thomas Gleixner commit 867240f7b2a37b1be4ba37d904a9064a96c82099 Author: Krzysztof Hałasa Date: Thu Jul 3 00:39:46 2008 +0200 WAN: Use u32 type instead of u_int32_t in LMC driver. Signed-off-by: Krzysztof Hałasa commit d507911c3a451986b3501417c78b568f3850b8ef Author: Krzysztof Hałasa Date: Wed Jul 2 20:55:58 2008 +0200 WAN: don't mention syncppp in z8530 DocBook. Signed-off-by: Krzysztof Hałasa commit 64bef7630ad5b0ccfdd73973e95cf7b7e39224d0 Author: Krzysztof Hałasa Date: Wed Jul 2 20:46:21 2008 +0200 WAN: Port LMC driver to generic HDLC Signed-off-by: Krzysztof Hałasa commit 52e8a6a2d8dc19002d1757870d16051157ce999c Author: Krzysztof Hałasa Date: Wed Jul 2 17:47:52 2008 +0200 WAN: Convert Zilog-based drivers to generic HDLC Signed-off-by: Krzysztof Hałasa commit aca257530f7d681b953961090ad729c32aa5ad62 Author: Krzysztof Hałasa Date: Tue Jul 1 23:40:29 2008 +0200 WAN: Port COSA driver to generic HDLC. Signed-off-by: Krzysztof Hałasa commit 0bee8db8f63b099412fdbce5b55b01d9f177951d Author: Krzysztof Hałasa Date: Tue Jul 1 22:04:01 2008 +0200 WAN: farsync driver no longer uses syncppp.c directly Signed-off-by: Krzysztof Hałasa commit b22267d3883ebc76093e9f36c4c738125e092402 Author: Krzysztof Hałasa Date: Tue Jul 1 21:43:39 2008 +0200 WAN: Convert PC300 driver to use normal u8/u16/u32 types Signed-off-by: Krzysztof Hałasa commit c36936ce4bc6d2a0d6520bd798e85abbb139c2aa Author: Krzysztof Hałasa Date: Tue Jul 1 21:24:14 2008 +0200 WAN: Remove dead code from PC300 driver, part #2 Signed-off-by: Krzysztof Hałasa commit ea966165a306ad4243b7bf62c848288c4286a8b7 Author: Krzysztof Hałasa Date: Tue Jul 1 21:14:43 2008 +0200 WAN: Remove dead code from PC300 driver, part #1 Signed-off-by: Krzysztof Hałasa commit c1a0f0cdf95569c06946eed81c2fc7e04b272db4 Author: Krzysztof Hałasa Date: Tue Jul 1 20:35:06 2008 +0200 WAN: Remove unneeded "#include " Signed-off-by: Krzysztof Hałasa commit a8817d2f6d59b0caeacf6071f56a83164b474a32 Author: Krzysztof Hałasa Date: Tue Jul 1 20:24:10 2008 +0200 wanmain.c doesn't need syncppp.h Signed-off-by: Krzysztof Hałasa commit a24e202e3ffdbd1da45ceab8e60824720c6ab7fd Author: Krzysztof Hałasa Date: Tue Jul 1 20:18:49 2008 +0200 Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't exist Signed-off-by: Krzysztof Hałasa commit efa415840d462caf30002d259db20338b546a94b Author: Krzysztof Hałasa Date: Tue Jul 1 15:28:10 2008 +0200 Remove bogus variables from syncppp.[ch] Signed-off-by: Krzysztof Hałasa commit 86f584f08767160a745a50ed675e12b8f8bfbf30 Author: Krzysztof Hałasa Date: Tue Jul 1 15:10:11 2008 +0200 Remove bogus dosyncppp variable from synclink drivers. Signed-off-by: Krzysztof Hałasa commit 4dfce4075aa4e2eee35e52a78dbabfe37d94c908 Author: Krzysztof Hałasa Date: Mon Jun 30 19:06:40 2008 +0200 WAN: cosmetic changes to generic HDLC Signed-off-by: Krzysztof Hałasa commit e8b43555a2a8c71e8501924e260f62b9545c598b Author: J. Bruce Fields Date: Wed Jul 23 08:49:50 2008 -0400 MAINTAINERS: mention lockd and sunrpc in nfs entries The actual division of labor is a little vague in some of the common code, but if the patches get to one of us then we can sort it out. Signed-off-by: J. Bruce Fields commit 317602f3e01a25320a712195b32fcf19c1297121 Author: Harvey Harrison Date: Sun Jul 20 23:41:24 2008 -0700 lockd: trivial sparse endian annotations fs/lockd/svcproc.c:115:11: warning: incorrect type in initializer (different base types) fs/lockd/svcproc.c:115:11: expected int [signed] rc fs/lockd/svcproc.c:115:11: got restricted __be32 [usertype] ... and so on... Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: J. Bruce Fields commit 7c4be5aa8dce9ba37fdd971d5560490d9e30c270 Author: Alan Cox Date: Mon May 19 14:10:02 2008 +0100 [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f2b79c6ede54cf07355ac8d8f3044d682cd0c5ca Author: Alan Cox Date: Mon May 19 14:09:57 2008 +0100 [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit d0e58eed05f9baf77c4f75e794ae245f6dae240a Author: Alan Cox Date: Mon May 19 14:09:51 2008 +0100 [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit dae67a2835149e6518a78c5cf37d6de715c214fc Author: Alan Cox Date: Mon May 19 14:09:45 2008 +0100 [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 694b16b2bd23bbd13163762c29f1e7885fe0da41 Author: Alan Cox Date: Mon May 19 14:09:40 2008 +0100 [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 84af401af831567967250dec9c15680bceede5e4 Author: Alan Cox Date: Mon May 19 14:09:34 2008 +0100 [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit c1cfd1a2ffc5ee58f744b1ceb0887285df187668 Author: Alan Cox Date: Mon May 19 14:09:29 2008 +0100 [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit c1c8dd39f53e56d6a92aa6a2db9940d912d7ee4c Author: Alan Cox Date: Mon May 19 14:09:23 2008 +0100 [WATCHDOG 50/57] w83697hf_wdt: cleanup, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 46a3949ddc422882cc27c88d078838cd31885d78 Author: Alan Cox Date: Mon May 19 14:09:18 2008 +0100 [WATCHDOG 49/57] w83627hf: coding style, clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 8dc244f7deac4c0e95ce0ffd26f494bb6e1534c0 Author: Alan Cox Date: Mon May 19 14:09:12 2008 +0100 [WATCHDOG 48/57] txx9: Fix locking, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f92d3749d70265468e28643652c0e32c5a56cd2b Author: Alan Cox Date: Mon May 19 14:09:06 2008 +0100 [WATCHDOG 47/57] softdog: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 598467938dd8bcdcd4d88e9102c609f4caa9d9ef Author: Alan Cox Date: Mon May 19 14:09:00 2008 +0100 [WATCHDOG 46/57] smsc37b787_wdt: coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 70b814ec1a484279a51bf9f7193551b996627247 Author: Alan Cox Date: Mon May 19 14:08:55 2008 +0100 [WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9b748ed03cabf533a815e5ffc50108a21c98e40c Author: Alan Cox Date: Mon May 19 14:08:49 2008 +0100 [WATCHDOG 44/57] scx200_wdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit ff94806057fba557abd6295f7313f5f9e972a48f Author: Alan Cox Date: Mon May 19 14:08:44 2008 +0100 [WATCHDOG 43/57] sc520_wdt: Clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit d14bccaadaa49b651fabcd1298b6ea07db3af552 Author: Alan Cox Date: Mon May 19 14:08:38 2008 +0100 [WATCHDOG 42/57] sc1200_wdt: clean up, fix locking and use unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit df3c9de3dee539c6b18a9c0797b37f6cb90c6ccb Author: Alan Cox Date: Mon May 19 14:08:33 2008 +0100 [WATCHDOG 41/57] sb_wdog: Clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f4f6f65a554d4a11e544070c39eea7c2ecc3ebfb Author: Alan Cox Date: Mon May 19 14:08:27 2008 +0100 [WATCHDOG 40/57] sbc_epx_c3_wdt: switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9f53c8de1aef08cad678dcda0f85fd8914ad7666 Author: Alan Cox Date: Mon May 19 14:08:22 2008 +0100 [WATCHDOG 39/57] sbc8360: clean up Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 619a8a2bb1d0c3f8270da4496a30f1e83e6eab5e Author: Alan Cox Date: Mon May 19 14:08:16 2008 +0100 [WATCHDOG 38/57] stg7240_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 1780de41406d783aa57459ba636a09aeda21d180 Author: Alan Cox Date: Mon May 19 14:08:11 2008 +0100 [WATCHDOG 37/57] sbc60xxwdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f19e031265dc6e05511308a6ecb9637e335b45b0 Author: Alan Cox Date: Mon May 19 14:08:05 2008 +0100 [WATCHDOG 36/57] sa1100_wdt: Switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit edef7a93f9414e1d4864150eabb49a618222c2bd Author: Alan Cox Date: Mon May 19 14:08:00 2008 +0100 [WATCHDOG 35/57] s3c2410: watchdog cleanup and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 72d5c0505bafae1a393f50e169e20b682d37f28e Author: Alan Cox Date: Mon May 19 14:07:54 2008 +0100 [WATCHDOG 34/57] rm9k_wdt: clean up Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 84ca995c258df70a8914866e8c996845003ff938 Author: Alan Cox Date: Mon May 19 14:07:48 2008 +0100 [WATCHDOG 33/57] pnx4008_wdt: unlocked_ioctl setup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 261dcc70aae926ba7b9218da7302f0ad2f665b79 Author: Alan Cox Date: Mon May 19 14:07:43 2008 +0100 [WATCHDOG 32/57] pcwd: clean up, unlocked_ioctl usage Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit aee334c23c9a559ce6334bd6ba74a5708b600ada Author: Alan Cox Date: Mon May 19 14:07:37 2008 +0100 [WATCHDOG 31/57] pc87413_wdt: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 12b9df7d21d0eedfaaee925f8f9c9aafb1cafa2f Author: Alan Cox Date: Mon May 19 14:07:32 2008 +0100 [WATCHDOG 30/57] omap_wdt: locking, unlocked_ioctl, tidy Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit a86b849868f40f83781f7a7e32e5e5ef939dc570 Author: Alan Cox Date: Mon May 19 14:07:26 2008 +0100 [WATCHDOG 29/57] mv64x60_wdt: clean up and locking checks Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit ed78c2da14924793310d96fa4b6a8c3a4172f72f Author: Alan Cox Date: Mon May 19 14:07:21 2008 +0100 [WATCHDOG 28/57] mtx-1_wdt: clean up, coding style, unlocked ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 83ab1a53f219c8139199633f60ab0ef88ef18c54 Author: Alan Cox Date: Mon May 19 14:07:15 2008 +0100 [WATCHDOG 27/57] mpcore watchdog: unlocked_ioctl and BKl work Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f26ef3dc69467e135e2b9555e44a088aee5c7d8f Author: Alan Cox Date: Mon May 19 14:07:09 2008 +0100 [WATCHDOG 26/57] mpc watchdog: clean up and locking Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 3930964532f8e454910cbe0d9909e98a02d9f552 Author: Alan Cox Date: Mon May 19 14:07:04 2008 +0100 [WATCHDOG 25/57] mixcomwd: coding style locking, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 325ea4d3a8a90b19d7a076714d0f8f238a5a6a69 Author: Alan Cox Date: Mon May 19 14:06:59 2008 +0100 [WATCHDOG 24/57] machzwd: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f4fabce15bb9b547f934e2b6f0e5e01044108e4d Author: Alan Cox Date: Mon May 19 14:06:53 2008 +0100 [WATCHDOG 23/57] ks8695_wdt: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d Author: Alan Cox Date: Mon May 19 14:06:48 2008 +0100 [WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 640b4f685784feafcd99c24582c5eb3ea36c3c60 Author: Alan Cox Date: Mon May 19 14:06:42 2008 +0100 [WATCHDOG 21/57] ixp2000_wdt: clean up and unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 00e9c2059aba0a0d67d144229bac82d403c2f42a Author: Alan Cox Date: Mon May 19 14:06:36 2008 +0100 [WATCHDOG 20/57] booke watchdog: clean up and unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9a5f50d34b0927d2f43549b6d172b8f458b6b620 Author: Alan Cox Date: Mon May 19 14:06:30 2008 +0100 [WATCHDOG 19/57] bfin: watchdog cleanup and unlocked_ioctl Scan, tidy and check for unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 0e6fa3fb38e2c89ba9abce9a8b74867f07d20d19 Author: Alan Cox Date: Mon May 19 14:06:25 2008 +0100 [WATCHDOG 18/57] iTCO: unlocked_ioctl, coding style and cleanup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 30abcec14573e3462f18d63f4a8f154a23689f1b Author: Alan Cox Date: Mon May 19 14:06:19 2008 +0100 [WATCHDOG 17/57] it8712f: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 02e3814e193ff798676793016851bc222366dc6a Author: Alan Cox Date: Mon May 19 14:06:14 2008 +0100 [WATCHDOG 16/57] iop: watchdog switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9b9dbcca3fa13acd64dbb9258bfe997809d6073b Author: Alan Cox Date: Mon May 19 14:06:08 2008 +0100 [WATCHDOG 15/57] indydog: Clean up and tidy Switch to unlocked_ioctl as well Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 02355c329a302c5ee81cacff0b7df7d306174981 Author: Alan Cox Date: Mon May 19 14:06:03 2008 +0100 [WATCHDOG 14/57] ibmasr: coding style, locking verify There is a new #if 0 section here which is a suggested fix for the horrible PCI hack in the existing code. Would be good if someone with a box that uses this device could test it. Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 0829291ea4a25c3c2ca4fba34aa38a1ee1e0b94b Author: Alan Cox Date: Mon May 19 14:05:57 2008 +0100 [WATCHDOG 13/57] i6300esb: Style, unlocked_ioctl, cleanup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 2e43ba73d4e2d34ddb9843e30480be3752514c16 Author: Alan Cox Date: Mon May 19 14:05:52 2008 +0100 [WATCHDOG 12/57] ib700wdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 6513e2a03887c6c9bd0b30593827a01ce3f7b542 Author: Alan Cox Date: Mon May 19 14:05:46 2008 +0100 [WATCHDOG 11/57] hpwdt: couple of include cleanups clean-up includes Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 89ea2429873e69201173f3606ab04d751f737cc4 Author: Alan Cox Date: Mon May 19 14:05:41 2008 +0100 [WATCHDOG 10/57] eurotechwdt: unlocked_ioctl, code lock check and tidy Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f339e2ac9d65656e6d18c92b1ddc4a7801373318 Author: Alan Cox Date: Mon May 19 14:05:35 2008 +0100 [WATCHDOG 09/57] ep93xx_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f78b0a8f27618b492dd2e1a8f5e4ce6f89b3c961 Author: Alan Cox Date: Mon May 19 14:05:30 2008 +0100 [WATCHDOG 08/57] davinci_wdt: unlocked_ioctl and check locking Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 6f932f18de7f0e22a1bdae5d0040eb5d8e4a6777 Author: Alan Cox Date: Mon May 19 14:05:24 2008 +0100 [WATCHDOG 07/57] cpu5_wdt: switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 2760600da2a13d5a2a335ba012d0f3ad5df4c098 Author: Alan Cox Date: Mon May 19 14:05:19 2008 +0100 [WATCHDOG 06/57] at91: watchdog to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit a6be8e5ff95e12190fd5e5158eb553255677292f Author: Alan Cox Date: Mon May 19 14:05:13 2008 +0100 [WATCHDOG 05/57] atp watchdog Switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit fbd4714907cd54ba74b8d35228813a060ae0176a Author: Alan Cox Date: Mon May 19 14:05:07 2008 +0100 [WATCHDOG 04/57] AR7 watchdog Fix locking Use unlocked_ioctl Remove semaphores Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 173d95bc2e68baf73eb89fb9ef1cc63a66f581a5 Author: Alan Cox Date: Mon May 19 14:04:57 2008 +0100 [WATCHDOG 03/57] ali: watchdog locking and style Clean up and check locking Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit b6b4d9b8d07e34f745871d3109c84894db29041b Author: Alan Cox Date: Mon May 19 14:04:51 2008 +0100 [WATCHDOG 02/57] clean up and check advantech watchdog Clean up the advantech watchdog code and inspect for BKL problems Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 94da1e2eff319994eefc7d04de7c911f64146e88 Author: Alan Cox Date: Mon May 19 14:04:46 2008 +0100 [WATCHDOG 01/57] Clean acquirewdt and check for BKL dependancies This brings the file into line with coding style. Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck