b0e0c9e7f6d5764633e93944dafd896dd6097318 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/30a2f3c60a84092c8084dfe788b710f8d0768cd4 30a2f3c60a84092c8084dfe788b710f8d0768cd4 2008-08-12T18:55:39-07:00 2008-08-12T18:55:39-07:00 Linux 2.6.27-rc3 dc9fa159ab9886d66ae3e81bb28cbef63cacdf30 Linus Torvalds torvalds@linux-foundation.org dae816835e8d1276c9e50d9c4dba75b7705fe66c 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/b0e0c9e7f6d5764633e93944dafd896dd6097318 b0e0c9e7f6d5764633e93944dafd896dd6097318 2008-08-12T16:39:22-07:00 2008-08-12T16:39:22-07:00 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 668d9adb29cb566f6240e7bc51faaf564d3241ca Linus Torvalds torvalds@linux-foundation.org ddc752a4068088bfc5558a3f72e4f7cca3fc1210 3a3eae0d66591572f771b9383e96ecacacee0abd Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/dae816835e8d1276c9e50d9c4dba75b7705fe66c dae816835e8d1276c9e50d9c4dba75b7705fe66c 2008-08-12T16:38:45-07:00 2008-08-12T16:38:45-07:00 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 0df2e2aeb3d2ac7ba8deb4352e83cf8d306a91aa Linus Torvalds torvalds@linux-foundation.org 31bad9246b5e17d547430697791acca5e9712333 430ac5ba9c74f236ddd695b1282a889630cb4f91 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/ddc752a4068088bfc5558a3f72e4f7cca3fc1210 ddc752a4068088bfc5558a3f72e4f7cca3fc1210 2008-08-12T16:07:48-07:00 2008-08-12T16:07:48-07:00 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 1effbc4fdae3c14cfe4f2bffa2f601ec6c1d7776 Linus Torvalds torvalds@linux-foundation.org bdd873540df9271634b0aae189f91c064f8b6147 Bernhard Walle bwalle@suse.de http://github.com/github/linux-2.6/commit/31bad9246b5e17d547430697791acca5e9712333 31bad9246b5e17d547430697791acca5e9712333 2008-08-12T16:07:31-07:00 2008-08-12T15:09:14-07:00 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 <bwalle@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2c79be72236d0087637bb231ddf04d4fe36cd2bd Linus Torvalds torvalds@linux-foundation.org 5f8c3c8edff426fd87098f057688463107fcd9ce Alexander Clouter alex@digriz.org.uk http://github.com/github/linux-2.6/commit/bdd873540df9271634b0aae189f91c064f8b6147 bdd873540df9271634b0aae189f91c064f8b6147 2008-08-12T16:07:31-07:00 2008-08-12T15:09:12-07:00 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 <alex@digriz.org.uk> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> bd9f8a33f41a5de015f15eb63896bcc3f450922a Linus Torvalds torvalds@linux-foundation.org 666593137185dc0ad1ee8966c8d7fef8f4bb84b2 Michael Abbott michael@araneidae.co.uk http://github.com/github/linux-2.6/commit/5f8c3c8edff426fd87098f057688463107fcd9ce 5f8c3c8edff426fd87098f057688463107fcd9ce 2008-08-12T16:07:31-07:00 2008-08-12T15:09:11-07:00 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 <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> f0c12022b9513796cc74a389bc47d4b9b013d0e9 Linus Torvalds torvalds@linux-foundation.org ffab10ec65f0a9b009241a9126680f72ac2fda5b Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/666593137185dc0ad1ee8966c8d7fef8f4bb84b2 666593137185dc0ad1ee8966c8d7fef8f4bb84b2 2008-08-12T16:07:31-07:00 2008-08-12T15:09:10-07:00 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 <randy.dunlap@oracle.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> f9eec6bc6b8de2229b32df8e5ff2f95a08fa3a1a Linus Torvalds torvalds@linux-foundation.org b3784a77f6f30a8ef5e37f3c7165930b1b66470b Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/ffab10ec65f0a9b009241a9126680f72ac2fda5b ffab10ec65f0a9b009241a9126680f72ac2fda5b 2008-08-12T16:07:31-07:00 2008-08-12T15:09:08-07:00 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 <randy.dunlap@oracle.com> Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6b6c9d6ab278518710692f0b243a39b689137130 Linus Torvalds torvalds@linux-foundation.org 5d39d9440dd6e590f78c295c5fdef195956da1c1 Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/b3784a77f6f30a8ef5e37f3c7165930b1b66470b b3784a77f6f30a8ef5e37f3c7165930b1b66470b 2008-08-12T16:07:31-07:00 2008-08-12T15:09:08-07:00 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 <sys/socket.h> 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). <end SUSv3> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 76d45b2c4cad36bc5fb8c0bbd41ce01b714aabb0 Linus Torvalds torvalds@linux-foundation.org 3794f3e812ef707a4f7931742274d1d0ca6597b4 Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/5d39d9440dd6e590f78c295c5fdef195956da1c1 5d39d9440dd6e590f78c295c5fdef195956da1c1 2008-08-12T16:07:30-07:00 2008-08-12T15:09:06-07:00 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 <randy.dunlap@oracle.com> Cc: <J.A.K.Mouw@its.tudelft.nl> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 7838e4969e795b9b4696d79db99d33e517f14316 Linus Torvalds torvalds@linux-foundation.org bc2aa80e18a1b43ea2b8066500006b729c4ba4a7 Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/3794f3e812ef707a4f7931742274d1d0ca6597b4 3794f3e812ef707a4f7931742274d1d0ca6597b4 2008-08-12T16:07:30-07:00 2008-08-12T15:09:06-07:00 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 <randy.dunlap@oracle.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 9a5373fa2bbcfc1626bb666d2c895e2620f7a3b3 Linus Torvalds torvalds@linux-foundation.org 40c9f22210f2d22f45d4fb430c94f472d19407d6 Harvey Harrison harvey.harrison@gmail.com http://github.com/github/linux-2.6/commit/bc2aa80e18a1b43ea2b8066500006b729c4ba4a7 bc2aa80e18a1b43ea2b8066500006b729c4ba4a7 2008-08-12T16:07:30-07:00 2008-08-12T15:09:05-07:00 byteorder: add include/linux/byteorder.h to define endian helpers Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ae1aaa86614f18f3bd3ff6981f0b23c01e4d37da Linus Torvalds torvalds@linux-foundation.org f18e439d1035d059534d261c414af33f89aee89a Harvey Harrison harvey.harrison@gmail.com http://github.com/github/linux-2.6/commit/40c9f22210f2d22f45d4fb430c94f472d19407d6 40c9f22210f2d22f45d4fb430c94f472d19407d6 2008-08-12T16:07:30-07:00 2008-08-12T15:09:04-07:00 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 <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> df633e4af23a8060aa3557d2910bdec16f717f06 Linus Torvalds torvalds@linux-foundation.org 50ac2d694f2dd1658341cf97bcf2ffb836d772cb Alexey Dobriyan adobriyan@gmail.com http://github.com/github/linux-2.6/commit/f18e439d1035d059534d261c414af33f89aee89a f18e439d1035d059534d261c414af33f89aee89a 2008-08-12T16:07:30-07:00 2008-08-12T15:09:03-07:00 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 <adobriyan@gmail.com> Cc: Paul Jackson <pj@sgi.com> Cc: Mike Travis <travis@sgi.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 3acd22b961fdcf2340eb0e9527fd9f6b810ee3b3 Linus Torvalds torvalds@linux-foundation.org dd763460eb628b57814251a15a39f8d75c044d76 Alexey Dobriyan adobriyan@gmail.com http://github.com/github/linux-2.6/commit/50ac2d694f2dd1658341cf97bcf2ffb836d772cb 50ac2d694f2dd1658341cf97bcf2ffb836d772cb 2008-08-12T16:07:30-07:00 2008-08-12T15:09:02-07:00 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 <adobriyan@gmail.com> Reviewed-by: Paul Jackson <pj@sgi.com> Cc: Mike Travis <travis@sgi.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> c4466ecb7c5211ee9423380783f00027411d5d5a Linus Torvalds torvalds@linux-foundation.org 523723bb5032f291272f9732713713b9b82ccfe0 Huang Weiyi weiyi.huang@gmail.com http://github.com/github/linux-2.6/commit/dd763460eb628b57814251a15a39f8d75c044d76 dd763460eb628b57814251a15a39f8d75c044d76 2008-08-12T16:07:30-07:00 2008-08-12T15:09:01-07:00 reiserfs: removed duplicated #include Removed duplicated #include <linux/quotaops.h> in fs/reiserfs/super.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6963023bebaf2b788f71d5f6246abdc6107d55dc Linus Torvalds torvalds@linux-foundation.org 98b0da43079740ecd07197dacd9720d54bb4dce0 Andrew Morton akpm@linux-foundation.org http://github.com/github/linux-2.6/commit/523723bb5032f291272f9732713713b9b82ccfe0 523723bb5032f291272f9732713713b9b82ccfe0 2008-08-12T16:07:30-07:00 2008-08-12T15:09:01-07:00 fs/eventpoll.c: fix sys_epoll_create1() comment The `size' argument was removed. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ulrich Drepper <drepper@redhat.com> Cc: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 115afcf1a051bbfb24fba3f416efbd20065198fc Linus Torvalds torvalds@linux-foundation.org fc1efbdb7a1175759b099d74b67921396e5e8e3d Huang Weiyi weiyi.huang@gmail.com http://github.com/github/linux-2.6/commit/98b0da43079740ecd07197dacd9720d54bb4dce0 98b0da43079740ecd07197dacd9720d54bb4dce0 2008-08-12T16:07:30-07:00 2008-08-12T15:09:00-07:00 drivers/char/rtc.c: removed duplicated include Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 3af6770b38420810dcfab6aed8f355a79f0f1d8d Linus Torvalds torvalds@linux-foundation.org 070cb06593006e7d565d4763380f3edd8dbdc134 Huang Weiyi weiyi.huang@gmail.com http://github.com/github/linux-2.6/commit/fc1efbdb7a1175759b099d74b67921396e5e8e3d fc1efbdb7a1175759b099d74b67921396e5e8e3d 2008-08-12T16:07:30-07:00 2008-08-12T15:09:00-07:00 mm/sparse.c: removed duplicated include Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> e0079c228cad186a1d5ef1dfcdb4bbe2d4a31188 Linus Torvalds torvalds@linux-foundation.org 29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a Uwe Kleine-König Uwe.Kleine-Koenig@digi.com http://github.com/github/linux-2.6/commit/070cb06593006e7d565d4763380f3edd8dbdc134 070cb06593006e7d565d4763380f3edd8dbdc134 2008-08-12T16:07:29-07:00 2008-08-12T15:08:59-07:00 move kernel-doc comment for might_sleep directly before its defining block Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 70a71b6616bf4794a0da7398c8f282237977d618 Linus Torvalds torvalds@linux-foundation.org afa9b649aa699297258dbb67aaae651c9ad4245f Yi Yang yi.y.yang@intel.com http://github.com/github/linux-2.6/commit/29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a 29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a 2008-08-12T16:07:29-07:00 2008-08-12T15:08:58-07:00 lib/vsprintf.c: wrong conversion function used Fix wrong conversion function used by strict_strtou* Signed-off-by: Yi Yang <yi.y.yang@intel.com> Reported-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 099db96f315e95e28755e88a2914c1abbc3dcb70 Linus Torvalds torvalds@linux-foundation.org ea757acad5a5183c65a3e1b28b49a5978fe6a052 Krzysztof Helt krzysztof.h1@wp.pl http://github.com/github/linux-2.6/commit/afa9b649aa699297258dbb67aaae651c9ad4245f afa9b649aa699297258dbb67aaae651c9ad4245f 2008-08-12T16:07:29-07:00 2008-08-12T15:08:57-07:00 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 <krzysztof.h1@wp.pl> Reported-by: Peter Hanzel <hanzelpeter@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6e5215a417bce365dd2d799e17f39d39d99a8075 Linus Torvalds torvalds@linux-foundation.org e730d8b0a5882b66c169e1bed09774d5d365e2e0 Haavard Skinnemoen haavard.skinnemoen@atmel.com http://github.com/github/linux-2.6/commit/ea757acad5a5183c65a3e1b28b49a5978fe6a052 ea757acad5a5183c65a3e1b28b49a5978fe6a052 2008-08-12T16:07:29-07:00 2008-08-12T15:08:57-07:00 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 <stf_xl@wp.pl> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6cefcbb3770fa13719792e03158b9d8f3b0d36ac Linus Torvalds torvalds@linux-foundation.org 10546355323e4826d13e62f85ac6198385a817a9 Haavard Skinnemoen haavard.skinnemoen@atmel.com http://github.com/github/linux-2.6/commit/e730d8b0a5882b66c169e1bed09774d5d365e2e0 e730d8b0a5882b66c169e1bed09774d5d365e2e0 2008-08-12T16:07:29-07:00 2008-08-12T15:08:56-07:00 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 <hskinnemoen@atmel.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ba927bd464dadbd5de9a9f7088d6b042d37a0a98 Linus Torvalds torvalds@linux-foundation.org 73b7d92f6106e2f55206b8672e5ccf6206689899 Jean Delvare khali@linux-fr.org http://github.com/github/linux-2.6/commit/10546355323e4826d13e62f85ac6198385a817a9 10546355323e4826d13e62f85ac6198385a817a9 2008-08-12T16:07:29-07:00 2008-08-12T15:08:55-07:00 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 <khali@linux-fr.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 7e51dcb04003d253cee8718a01f5c36f88d19351 Linus Torvalds torvalds@linux-foundation.org 5ede40f87957c6ededf9284c8339722a97b9dfb6 Jean Delvare khali@linux-fr.org http://github.com/github/linux-2.6/commit/73b7d92f6106e2f55206b8672e5ccf6206689899 73b7d92f6106e2f55206b8672e5ccf6206689899 2008-08-12T16:07:29-07:00 2008-08-12T15:08:54-07:00 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 <khali@linux-fr.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 1be6485d2bc67b4a9b9088022fe32d73d5d8335e Linus Torvalds torvalds@linux-foundation.org d6bf73e4340f52159c1d9f13836b62e20fcd12d3 Jean Delvare khali@linux-fr.org http://github.com/github/linux-2.6/commit/5ede40f87957c6ededf9284c8339722a97b9dfb6 5ede40f87957c6ededf9284c8339722a97b9dfb6 2008-08-12T16:07:29-07:00 2008-08-12T15:08:53-07:00 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 <khali@linux-fr.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz> Cc: <stable@kernel.org> [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 7bfadd8db09bda249aa06c387315267e34ee17f7 Linus Torvalds torvalds@linux-foundation.org 6a4ad39b3de60ad0e75a78098be0f0eb1722b753 MinChan Kim minchan.kim@gmail.com http://github.com/github/linux-2.6/commit/d6bf73e4340f52159c1d9f13836b62e20fcd12d3 d6bf73e4340f52159c1d9f13836b62e20fcd12d3 2008-08-12T16:07:29-07:00 2008-08-12T15:08:52-07:00 do_migrate_pages(): remove unused variable Signed-off-by: MinChan Kim <minchan.kim@gmail.com> Acked-by: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 18e3b9e4f126958d7d55758d9a70375a847b5760 Linus Torvalds torvalds@linux-foundation.org 969830b2fedf8336c41d6195f49d250b1e166ff8 Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/6a4ad39b3de60ad0e75a78098be0f0eb1722b753 6a4ad39b3de60ad0e75a78098be0f0eb1722b753 2008-08-12T16:07:29-07:00 2008-08-12T15:08:51-07:00 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 <randy.dunlap@oracle.com> Cc: Jack Steiner <steiner@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> b4aff052ce77c4c5761c1278a690c4ab22976dda Linus Torvalds torvalds@linux-foundation.org