commit 5393f780277165f282a37ed82dd878159ec9dad5 Merge: bca2685... ea0105e... Author: Linus Torvalds Date: Wed Jan 14 20:00:28 2009 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits) powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/ powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots powerpc/e500mc: Doorbells need to be taken w/exceptions disabled powerpc: Enable PS3 options and QPACE in ppc64_defconfig powerpc/powermac: Fix occasional SMP boot failure powerpc/cacheinfo: Rename cache_dir per-cpu variable hvc_console: Use kzalloc() instead of kmalloc() + memset() hvc_console: Do not set low_latency when using interrupts hvc_console: Call free_irq() only if request_irq() was successful hvc_console: Change an mb() to smp_mb() and add some comments powerpc: Cleanup from l64 to ll64 change: drivers/net powerpc: Cleanup from l64 to ll64 change: drivers/char powerpc: Cleanup from l64 to ll64 change: arch code powerpc: Change u64/s64 to a long long integer type powerpc/kexec: Check crash_base for relocatable kernel powerpc: Make dummy section a valid note header Xilinx: SPI: updated driver for device tree drivers/of: Add the of_find_i2c_device_by_node function. powerpc/xsysace: add compatible string for non-ipcore instance powerpc/mpc52xx: remove dead code from GPIO driver ... commit bca268565fd18f0b36ab8fff6e1623d8dffae2b1 Merge: 74d96f0... 2668945... Author: Linus Torvalds Date: Wed Jan 14 19:58:40 2009 -0800 Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits) [CVE-2009-0029] s390 specific system call wrappers [CVE-2009-0029] System call wrappers part 33 [CVE-2009-0029] System call wrappers part 32 [CVE-2009-0029] System call wrappers part 31 [CVE-2009-0029] System call wrappers part 30 [CVE-2009-0029] System call wrappers part 29 [CVE-2009-0029] System call wrappers part 28 [CVE-2009-0029] System call wrappers part 27 [CVE-2009-0029] System call wrappers part 26 [CVE-2009-0029] System call wrappers part 25 [CVE-2009-0029] System call wrappers part 24 [CVE-2009-0029] System call wrappers part 23 [CVE-2009-0029] System call wrappers part 22 [CVE-2009-0029] System call wrappers part 21 [CVE-2009-0029] System call wrappers part 20 [CVE-2009-0029] System call wrappers part 19 [CVE-2009-0029] System call wrappers part 18 [CVE-2009-0029] System call wrappers part 17 [CVE-2009-0029] System call wrappers part 16 [CVE-2009-0029] System call wrappers part 15 ... commit 74d96f018673759d04d032c137d132f6447bfb1e Author: Harvey Harrison Date: Tue Jan 13 19:27:09 2009 -0800 byteorder: make swab.h include asm/swab.h like a regular header Add swab.h to kbuild.asm and remove the individual entries from each arch, mark as unifdef as some arches have some kernel-only bits inside. Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit aa0effbd1c0269ce7dd13be8dbf13e6b04f30ebd Author: Harvey Harrison Date: Tue Jan 13 19:31:29 2009 -0800 cris: introduce asm/swab.h Adjust the arch overrides to the new names as well. Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit 5bf431fa32c52e7027c4af85c7afc82326fa6d43 Merge: c2919f2... cb7a97d... Author: Linus Torvalds Date: Wed Jan 14 19:55:25 2009 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: [XFS] Update maintainers [XFS] use scalable vmap API [XFS] remove old vmap cache [XFS] make xfs_ino_t an unsigned long long [XFS] truncate readdir offsets to signed 32 bit values [XFS] fix compile of xfs_btree_readahead_lblock on m68k [XFS] Remove macro-to-function indirections in the mask code [XFS] Remove macro-to-function indirections in attr code [XFS] Remove several unused typedefs. [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations commit c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb Merge: 9316fca... e720b9e... Author: Linus Torvalds Date: Wed Jan 14 19:51:26 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: IDE: fix sparse signed-ness errors with host->host_busy ide: fix suspend regression tx4938ide: Fix build error due to read_sff_dma_status moving ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ sl82c105: remove dead code via82cxxx: fix cable warning message ide: can't use SSD/non-rotational queue flag for all CFA devices it821x.c: use dev->revision instead of pci_read_config_byte it821x: Add ultra_mask quirk for Vortex86SX ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal commit e720b9e498b6bbb1b4f3b3d2f8e9a78578aafef7 Author: Ben Dooks Date: Wed Jan 14 19:19:04 2009 +0100 IDE: fix sparse signed-ness errors with host->host_busy The host_busy field in struct ide_host defaults to a signed-long, where most arch's test_and_set_bit_* macros use an unsigned long. Change to using an unsigned long, which on ARM removes the following sparse errors: drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:681:8: expected unsigned long volatile *p drivers/ide/ide-io.c:681:8: got long volatile * drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:681:8: expected unsigned long volatile *p drivers/ide/ide-io.c:681:8: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness) drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p drivers/ide/ide-io.c:695:3: got long volatile * Signed-off-by: Ben Dooks Signed-off-by: Bartlomiej Zolnierkiewicz commit 2ea5521022ac8f4f528dcbae02668e02a3501a5a Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:04 2009 +0100 ide: fix suspend regression On Monday 12 January 2009, Simon Holm Thøgersen wrote: > commit 295f000 ("ide: don't execute the next queued command from the > hard-IRQ context (v2)") breaks suspend to disk for me. On > 'echo disk > /sys/power/state' the systems hangs, letting me switch > virtual consoles, but not responding to Alt+SysRq Restart the request queue early for REQ_TYPE_PM_RESUME requests (though there is only one resume request for the whole resume sequence it stays in the queue until is fully completed and now depends on kblockd for processing consequential resume states). Reported-and-bisected-by: Simon Holm Thøgersen Tested-by: Simon Holm Thøgersen Signed-off-by: Bartlomiej Zolnierkiewicz commit a294d97742568f429590cf2022d92e4b0c5f6ba0 Author: Atsushi Nemoto Date: Wed Jan 14 19:19:04 2009 +0100 tx4938ide: Fix build error due to read_sff_dma_status moving Signed-off-by: Atsushi Nemoto Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit e86c1451d3138b4cd0378282b30397d171fa4252 Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:03 2009 +0100 ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit cadb300a4254b1f28bce84e280b7d46c525f73c6 Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:03 2009 +0100 sl82c105: remove dead code CONFIG_LOPEC and CONFIG_SANDPOINT config options are gone. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4180e8334cf8301cf37131bc5d69c0cd724682cb Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:03 2009 +0100 via82cxxx: fix cable warning message Remove reference to the removed old-style kernel parameter. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 655772cc79c94ebf282e1df4d3c3375f05a565ae Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:03 2009 +0100 ide: can't use SSD/non-rotational queue flag for all CFA devices Some rotating disks also present themselves as CFA devices. Reported-by: Alan Cox Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4a2462693b37da1438f53f3fbfc75e081659e975 Author: Brandon Philips Date: Wed Jan 14 19:19:03 2009 +0100 it821x.c: use dev->revision instead of pci_read_config_byte Minor cleanup. Signed-off-by: Brandon Philips Cc: Alan Cox Cc: Shawn Lin Signed-off-by: Bartlomiej Zolnierkiewicz commit b94b898f3107046b5c97c556e23529283ea5eadd Author: Brandon Philips Date: Wed Jan 14 19:19:02 2009 +0100 it821x: Add ultra_mask quirk for Vortex86SX On Vortex86SX with IDE controller revision 0x11 ultra DMA must be disabled. This patch was tested by DMP and seems to work. It is a cleaned up version of their older Kernel patch: http://www.dmp.com.tw/tech/vortex86sx/patch-2.6.24-DMP.gz Tested-by: Shawn Lin Signed-off-by: Brandon Philips Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 9b896033aa2781d36b2d3f756fe70325fc8487e2 Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 14 19:19:02 2009 +0100 ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal commit 54cc1428cfa619e16d75baae8cb041a2eff015f0 ("ide: remove local_irq_set() macro") accidentally replaced local_save_flags() by local_irq_set() in ide_probe_port() and __ide_wait_stat() which resulted in LOCKDEP breakage. Reported-by: Larry Finger Tested-by: Larry Finger Signed-off-by: Bartlomiej Zolnierkiewicz commit 9316fcacb89c59fe556c48587ac02cd7f5d38045 Author: Andrew Morton Date: Wed Jan 14 09:35:44 2009 -0800 kernel/up.c: omit it if SMP=y, USE_GENERIC_SMP_HELPERS=n Fix the sparc build - we were including `up.o' on SMP builds, when CONFIG_USE_GENERIC_SMP_HELPERS=n. Tested-by: Robert Reif Fixed-by: Robert Reif Cc: David Miller Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18e6959c385f3edf3991fa6662a53dac4eb10d5b Author: Nick Piggin Date: Wed Jan 14 07:28:16 2009 +0100 mm: fix assertion This assertion is incorrect for lockless pagecache. By definition if we have an unpinned page that we are trying to take a speculative reference to, it may become the tail of a compound page at any time (if it is freed, then reallocated as a compound page). It was still a valid assertion for the vmscan.c LRU isolation case, but it doesn't seem incredibly helpful... if somebody wants it, they can put it back directly where it applies in the vmscan code. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 26689452f5ca201add63b1b1ff0dbcf82d6885e7 Author: Heiko Carstens Date: Wed Jan 14 14:14:36 2009 +0100 [CVE-2009-0029] s390 specific system call wrappers Signed-off-by: Heiko Carstens commit 2b66421995d2e93c9d1a0111acf2581f8529c6e5 Author: Heiko Carstens Date: Wed Jan 14 14:14:35 2009 +0100 [CVE-2009-0029] System call wrappers part 33 Signed-off-by: Heiko Carstens commit d4e82042c4cfa87a7d51710b71f568fe80132551 Author: Heiko Carstens Date: Wed Jan 14 14:14:34 2009 +0100 [CVE-2009-0029] System call wrappers part 32 Signed-off-by: Heiko Carstens commit 836f92adf121f806e9beb5b6b88bd5c9c4ea3f24 Author: Heiko Carstens Date: Wed Jan 14 14:14:33 2009 +0100 [CVE-2009-0029] System call wrappers part 31 Signed-off-by: Heiko Carstens commit 6559eed8ca7db0531a207cd80be5e28cd6f213c5 Author: Heiko Carstens Date: Wed Jan 14 14:14:32 2009 +0100 [CVE-2009-0029] System call wrappers part 30 Signed-off-by: Heiko Carstens commit 2e4d0924eb0c403ce4014fa139d1d61bf2c44fee Author: Heiko Carstens Date: Wed Jan 14 14:14:31 2009 +0100 [CVE-2009-0029] System call wrappers part 29 Signed-off-by: Heiko Carstens commit 938bb9f5e840eddbf54e4f62f6c5ba9b3ae12c9d Author: Heiko Carstens Date: Wed Jan 14 14:14:30 2009 +0100 [CVE-2009-0029] System call wrappers part 28 Signed-off-by: Heiko Carstens commit 1e7bfb2134dfec37ce04fb3a4ca89299e892d10c Author: Heiko Carstens Date: Wed Jan 14 14:14:29 2009 +0100 [CVE-2009-0029] System call wrappers part 27 Signed-off-by: Heiko Carstens commit c4ea37c26a691ad0b7e86aa5884aab27830e95c9 Author: Heiko Carstens Date: Wed Jan 14 14:14:28 2009 +0100 [CVE-2009-0029] System call wrappers part 26 Signed-off-by: Heiko Carstens commit d5460c9974a321a194aded4a8c4daaac68ea8171 Author: Heiko Carstens Date: Wed Jan 14 14:14:27 2009 +0100 [CVE-2009-0029] System call wrappers part 25 Signed-off-by: Heiko Carstens commit e48fbb699f82ef1e80bd7126046394d2dc9ca7e6 Author: Heiko Carstens Date: Wed Jan 14 14:14:26 2009 +0100 [CVE-2009-0029] System call wrappers part 24 Signed-off-by: Heiko Carstens commit 5a8a82b1d306a325d899b67715618413657efda4 Author: Heiko Carstens Date: Wed Jan 14 14:14:25 2009 +0100 [CVE-2009-0029] System call wrappers part 23 Signed-off-by: Heiko Carstens commit 3e0fa65f8ba4fd24b3dcfaf14d5b15eaab0fdc61 Author: Heiko Carstens Date: Wed Jan 14 14:14:24 2009 +0100 [CVE-2009-0029] System call wrappers part 22 Signed-off-by: Heiko Carstens commit 20f37034fb966a1c35894f9fe529fda0b6440101 Author: Heiko Carstens Date: Wed Jan 14 14:14:23 2009 +0100 [CVE-2009-0029] System call wrappers part 21 Signed-off-by: Heiko Carstens commit 3cdad42884bbd95d5aa01297e8236ea1bad70053 Author: Heiko Carstens Date: Wed Jan 14 14:14:22 2009 +0100 [CVE-2009-0029] System call wrappers part 20 Signed-off-by: Heiko Carstens commit 003d7ab479168132a2b2c6700fe682b08f08ab0c Author: Heiko Carstens Date: Wed Jan 14 14:14:21 2009 +0100 [CVE-2009-0029] System call wrappers part 19 Signed-off-by: Heiko Carstens commit a6b42e83f249aad723589b2bdf6d1dfb2b0997c8 Author: Heiko Carstens Date: Wed Jan 14 14:14:20 2009 +0100 [CVE-2009-0029] System call wrappers part 18 Signed-off-by: Heiko Carstens commit ca013e945b1ba5828b151ee646946f1297b67a4c Author: Heiko Carstens Date: Wed Jan 14 14:14:19 2009 +0100 [CVE-2009-0029] System call wrappers part 17 Signed-off-by: Heiko Carstens commit 002c8976ee537724b20a5e179d9b349309438836 Author: Heiko Carstens Date: Wed Jan 14 14:14:18 2009 +0100 [CVE-2009-0029] System call wrappers part 16 Signed-off-by: Heiko Carstens commit a26eab2400f0477bfac0255600552394855016f7 Author: Heiko Carstens Date: Wed Jan 14 14:14:17 2009 +0100 [CVE-2009-0029] System call wrappers part 15 Signed-off-by: Heiko Carstens commit 3480b25743cb7404928d57efeaa3d085708b04c2 Author: Heiko Carstens Date: Wed Jan 14 14:14:16 2009 +0100 [CVE-2009-0029] System call wrappers part 14 Signed-off-by: Heiko Carstens commit 6a6160a7b5c27b3c38651baef92a14fa7072b3c1 Author: Heiko Carstens Date: Wed Jan 14 14:14:15 2009 +0100 [CVE-2009-0029] System call wrappers part 13 Signed-off-by: Heiko Carstens commit 64fd1de3d821659ac0a3004fd5ee1de59e64af30 Author: Heiko Carstens Date: Wed Jan 14 14:14:14 2009 +0100 [CVE-2009-0029] System call wrappers part 12 Signed-off-by: Heiko Carstens commit 257ac264d69017270fbc3cf5536953525db4076c Author: Heiko Carstens Date: Wed Jan 14 14:14:13 2009 +0100 [CVE-2009-0029] System call wrappers part 11 Signed-off-by: Heiko Carstens commit bdc480e3bef6eb0e7071770834cbdda7e30a5436 Author: Heiko Carstens Date: Wed Jan 14 14:14:12 2009 +0100 [CVE-2009-0029] System call wrappers part 10 Signed-off-by: Heiko Carstens commit a5f8fa9e9ba5ef3305e147f41ad6e1e84ac1f0bd Author: Heiko Carstens Date: Wed Jan 14 14:14:11 2009 +0100 [CVE-2009-0029] System call wrappers part 09 Signed-off-by: Heiko Carstens commit 17da2bd90abf428523de0fb98f7075e00e3ed42e Author: Heiko Carstens Date: Wed Jan 14 14:14:10 2009 +0100 [CVE-2009-0029] System call wrappers part 08 Signed-off-by: Heiko Carstens commit 754fe8d297bfae7b77f7ce866e2fb0c5fb186506 Author: Heiko Carstens Date: Wed Jan 14 14:14:09 2009 +0100 [CVE-2009-0029] System call wrappers part 07 Signed-off-by: Heiko Carstens commit 5add95d4f7cf08f6f62510f19576992912387501 Author: Heiko Carstens Date: Wed Jan 14 14:14:08 2009 +0100 [CVE-2009-0029] System call wrappers part 06 Signed-off-by: Heiko Carstens commit 362e9c07c7220c0a78c88826fc0d2bf7e4a4bb68 Author: Heiko Carstens Date: Wed Jan 14 14:14:07 2009 +0100 [CVE-2009-0029] System call wrappers part 05 Signed-off-by: Heiko Carstens commit b290ebe2c46d01b742b948ce03f09e8a3efb9a92 Author: Heiko Carstens Date: Wed Jan 14 14:14:06 2009 +0100 [CVE-2009-0029] System call wrappers part 04 Signed-off-by: Heiko Carstens commit ae1251ab785f6da87219df8352ffdac68bba23e4 Author: Heiko Carstens Date: Wed Jan 14 14:14:05 2009 +0100 [CVE-2009-0029] System call wrappers part 03 Signed-off-by: Heiko Carstens commit dbf040d9d1cbf1ef6250bdb095c5c118950bcde8 Author: Heiko Carstens Date: Wed Jan 14 14:14:04 2009 +0100 [CVE-2009-0029] System call wrappers part 02 Signed-off-by: Heiko Carstens commit 58fd3aa288939d3097fa04505b25c2f5e6e144d1 Author: Heiko Carstens Date: Wed Jan 14 14:14:03 2009 +0100 [CVE-2009-0029] System call wrappers part 01 Signed-off-by: Heiko Carstens commit 6673e0c3fbeaed2cd08e2fd4a4aa97382d6fedb0 Author: Heiko Carstens Date: Wed Jan 14 14:14:02 2009 +0100 [CVE-2009-0029] System call wrapper special cases System calls with an unsigned long long argument can't be converted with the standard wrappers since that would include a cast to long, which in turn means that we would lose the upper 32 bit on 32 bit architectures. Also semctl can't use the standard wrapper since it has a 'union' parameter. So we handle them as special case and add some extra wrappers instead. Signed-off-by: Heiko Carstens commit ed6bb6194350dc6ae97a65dbf2d621a3dbe6bbe9 Author: Heiko Carstens Date: Wed Jan 14 14:14:01 2009 +0100 [CVE-2009-0029] s390: enable system call wrappers Signed-off-by: Heiko Carstens commit ee6a093222549ac0c72cfd296c69fa5e7d6daa34 Author: Benjamin Herrenschmidt Date: Wed Jan 14 14:14:00 2009 +0100 [CVE-2009-0029] powerpc: Enable syscall wrappers for 64-bit This enables the use of syscall wrappers to do proper sign extension for 64-bit programs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Heiko Carstens commit 1a94bc34768e463a93cb3751819709ab0ea80a01 Author: Heiko Carstens Date: Wed Jan 14 14:13:59 2009 +0100 [CVE-2009-0029] System call wrapper infrastructure From: Martin Schwidefsky By selecting HAVE_SYSCALL_WRAPPERS architectures can activate system call wrappers in order to sign extend system call arguments. All architectures where the ABI defines that the caller of a function has to perform sign extension probably need this. Reported-by: Christian Borntraeger Acked-by: Ralf Baechle Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens commit f627a741d24f12955fa2d9f8831c3b12860635bd Author: Heiko Carstens Date: Wed Jan 14 14:13:58 2009 +0100 [CVE-2009-0029] Make sys_syslog a conditional system call Remove the -ENOSYS implementation for !CONFIG_PRINTK and use the cond_syscall infrastructure instead. Acked-by: Kyle McMartin Signed-off-by: Heiko Carstens commit c9da9f2129d6a421c32e334a83770a9e67f7feac Author: Heiko Carstens Date: Wed Jan 14 14:13:57 2009 +0100 [CVE-2009-0029] Make sys_pselect7 static Not a single architecture has wired up sys_pselect7 plus it is the only system call with seven parameters. Just make it static and rename it to do_pselect which will do the work for sys_pselect6. Signed-off-by: Heiko Carstens commit 1134723e96f6e2abcf8bfd7a2d1c96fcc323ef35 Author: Heiko Carstens Date: Wed Jan 14 14:13:56 2009 +0100 [CVE-2009-0029] Remove __attribute__((weak)) from sys_pipe/sys_pipe2 Remove __attribute__((weak)) from common code sys_pipe implemantation. IA64, ALPHA, SUPERH (32bit) and SPARC (32bit) have own implemantations with the same name. Just rename them. For sys_pipe2 there is no architecture specific implementation. Cc: Richard Henderson Cc: David S. Miller Cc: Paul Mundt Cc: Tony Luck Signed-off-by: Heiko Carstens commit e55380edf68796d75bf41391a781c68ee678587d Author: Heiko Carstens Date: Wed Jan 14 14:13:55 2009 +0100 [CVE-2009-0029] Rename old_readdir to sys_old_readdir This way it matches the generic system call name convention. Signed-off-by: Heiko Carstens commit 2ed7c03ec17779afb4fcfa3b8c61df61bd4879ba Author: Heiko Carstens Date: Wed Jan 14 14:13:54 2009 +0100 [CVE-2009-0029] Convert all system calls to return a long Convert all system calls to return a long. This should be a NOP since all converted types should have the same size anyway. With the exception of sys_exit_group which returned void. But that doesn't matter since the system call doesn't return. Signed-off-by: Heiko Carstens commit 4c696ba7982501d43dea11dbbaabd2aa8a19cc42 Author: Heiko Carstens Date: Wed Jan 14 14:13:53 2009 +0100 [CVE-2009-0029] Move compat system call declarations to compat header file Move declarations to correct header file. Signed-off-by: Heiko Carstens commit cb7a97d01521797cad9f63e8478403c3e51fea49 Merge: 0335cb7... a652504... Author: Lachlan McIlroy Date: Wed Jan 14 16:29:51 2009 +1100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit ea0105ea3881b409e362451690184af494bce6e3 Author: Anton Vorontsov Date: Sun Jan 11 19:55:39 2009 +0300 powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/ This patch is used to help Jean Delvare to get rid of drivers/i2c/chips/ directory. The new location suggested by Kumar Gala: as the driver is 83xx specific it's placed into arch/powerpc/platforms/83xx/. Signed-off-by: Anton Vorontsov Acked-by: Jean Delvare Signed-off-by: Kumar Gala commit 6c9789de2a02755101f757789ffcb17312f3fa9b Author: Anton Vorontsov Date: Sun Jan 11 18:30:13 2009 +0300 powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots FSL U-Boots use /soc8315@e0000000 node to search and fixup serial nodes' clock-frequency properties. Though in upstream kernels we use new naming convention -- for IMMR address space dts files specify /immr@e0000000 nodes. This makes FSL U-Boots fail to fixup the clock frequencies, and that leads to serial ports misbehaviour. We can workaround the issue by filling the clock frequency values manually. p.s. For the same reason FSL U-Boots fail to fixup MAC addresses for ethernet nodes, so users should either change the .dts file locally or set MAC address via `ifconfig hw ether' command. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 5597b25c300eeaf43392f399990d3f3027a9b779 Author: Kumar Gala Date: Thu Jan 8 18:11:56 2009 -0600 powerpc/e500mc: Doorbells need to be taken w/exceptions disabled We use Doorbell interrupts for IPIs and thus we need to make sure we aren't interrupted in the process of processing the IPI. Signed-off-by: Kumar Gala Acked-by: Dave Liu commit a6525042bfdfcab128bd91fad264de10fd24a55e Merge: b9a0d06... 58dab91... Author: Linus Torvalds Date: Tue Jan 13 14:53:16 2009 -0800 Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 PAT: remove CPA WARN_ON for zero pte x86 PAT: return compatible mapping to remap_pfn_range callers x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param x86 PAT: consolidate old memtype new memtype check into a function x86 PAT: remove PFNMAP type on track_pfn_vma_new() error commit b9a0d06a35c382c02f471a0815e2e27cdfe1c7f9 Merge: 6256851... e6b50c8... Author: Linus Torvalds Date: Tue Jan 13 14:52:35 2009 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: TWL4030: fix clk API usage [ARM] 5364/1: allow flush_ioremap_region() to be used from modules [ARM] w90x900: fix build errors and warnings [ARM] i.MX add missing include [ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e [ARM] i.MX: remove LCDC controller register definitions from imx-regs.h commit 62568510b8e2679cbc331d7de10ea9ba81ae8b3d Author: Bernd Schmidt Date: Tue Jan 13 22:14:48 2009 +0100 Fix timeouts in sys_pselect7 Since we (Analog Devices) updated our Blackfin kernel to 2.6.28, we've seen occasional 5-second hangs from telnet. telnetd calls select with a NULL timeout, but with the new kernel, the system call occasionally returns 0, which causes telnet to call sleep (5). This did not happen with earlier kernels. The code in sys_pselect7 looks a bit strange, in particular the variable "to" is initialized to NULL, then changed if a non-null timeout was passed in, but not used further. It needs to be passed to core_sys_select instead of &end_time. This bug was introduced by 8ff3e8e85fa6c312051134b3953e397feb639f51 ("select: switch select() and poll() over to hrtimers"). Signed-off-by: Bernd Schmidt Reviewed-by: Ulrich Drepper Tested-by: Robin Getz Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 125c97d8a59888c5678734c2b70cbd08c847bd99 Author: Helge Deller Date: Tue Jan 13 22:51:07 2009 +0100 fix early_serial_setup() regression Commit b430428a188e8a434325e251d0704af4b88b4711 ("8250: Don't clobber spinlocks.") introduced a regression on the parisc architecture, which broke the handover to the serial port at boottime. early_serial_setup() was changed to only copy a subset of the uart_port fields, and sadly the "type" and "line" fields were forgotten and thus the serial port was not initialized and could not be used for a handover. This patch fixes this by copying the missing fields. As this change to early_serial_setup() doesn't need an initialized spinlock in the uart_port struct any longer, we can drop the spinlock initialization in the superio driver. Cc: David Daney Cc: Tomaso Paoletti Cc: Andrew Morton Cc: Alan Cox Acked-by: Kyle McMartin Cc: linux-parisc@vger.kernel.org Signed-off-by: Helge Deller Signed-off-by: Linus Torvalds commit e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab Author: Russell King Date: Sat Jan 10 10:40:42 2009 +0000 TWL4030: fix clk API usage Always pass a struct device if one is available; and there's really no reason for the processor specific stuff in this file if only people would follow the API usage properly by using the struct device. Signed-off-by: Russell King commit 58dab916dfb57328d50deb0aa9b3fc92efa248ff Author: venkatesh.pallipadi@intel.com Date: Fri Jan 9 16:13:14 2009 -0800 x86 PAT: remove CPA WARN_ON for zero pte Impact: reduce scope of debug check - avoid warnings The logic to find whether identity map exists or not using high_memory or max_low_pfn_mapped/max_pfn_mapped are not complete as the memory withing the range may not be mapped if there is a unusable hole in e820. Specifically, on my test system I started seeing these warnings with tools like hwinfo, acpidump trying to map ACPI region. [ 27.400018] ------------[ cut here ]------------ [ 27.400344] WARNING: at /home/venkip/src/linus/linux-2.6/arch/x86/mm/pageattr.c:560 __change_page_attr_set_clr+0xf3/0x8b8() [ 27.400821] Hardware name: X7DB8 [ 27.401070] CPA: called for zero pte. vaddr = ffff8800cff6a000 cpa->vaddr = ffff8800cff6a000 [ 27.401569] Modules linked in: [ 27.401882] Pid: 4913, comm: dmidecode Not tainted 2.6.28-05716-gfe0bdec #586 [ 27.402141] Call Trace: [ 27.402488] [] warn_slowpath+0xd3/0x10f [ 27.402749] [] ? find_get_page+0xb3/0xc9 [ 27.403028] [] ? find_get_page+0x0/0xc9 [ 27.403333] [] __change_page_attr_set_clr+0xf3/0x8b8 [ 27.403628] [] ? __purge_vmap_area_lazy+0x192/0x1a1 [ 27.403883] [] ? __purge_vmap_area_lazy+0x4b/0x1a1 [ 27.404172] [] ? vm_unmap_aliases+0x1ab/0x1bb [ 27.404512] [] ? vm_unmap_aliases+0x48/0x1bb [ 27.404766] [] change_page_attr_set_clr+0x13e/0x2e6 [ 27.405026] [] ? _spin_unlock+0x26/0x2a [ 27.405292] [] ? reserve_memtype+0x19b/0x4e3 [ 27.405590] [] _set_memory_wb+0x22/0x24 [ 27.405844] [] ioremap_change_attr+0x26/0x28 [ 27.406097] [] reserve_pfn_range+0x1a3/0x235 [ 27.406427] [] track_pfn_vma_new+0x49/0xb3 [ 27.406686] [] remap_pfn_range+0x94/0x32c [ 27.406940] [] ? phys_mem_access_prot_allowed+0xb5/0x1a8 [ 27.407209] [] mmap_mem+0x75/0x9d [ 27.407523] [] mmap_region+0x2cf/0x53e [ 27.407776] [] do_mmap_pgoff+0x2a9/0x30d [ 27.408034] [] sys_mmap+0x92/0xce [ 27.408339] [] system_call_fastpath+0x16/0x1b [ 27.408614] ---[ end trace 4b16ad70c09a602d ]--- [ 27.408871] dmidecode:4913 reserve_pfn_range ioremap_change_attr failed write-back for cff6a000-cff6b000 This is wih track_pfn_vma_new trying to keep identity map in sync. The address cff6a000 is the ACPI region according to e820. [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] BIOS-e820: 0000000000000000 - 000000000009c000 (usable) [ 0.000000] BIOS-e820: 000000000009c000 - 00000000000a0000 (reserved) [ 0.000000] BIOS-e820: 00000000000cc000 - 00000000000d0000 (reserved) [ 0.000000] BIOS-e820: 00000000000e4000 - 0000000000100000 (reserved) [ 0.000000] BIOS-e820: 0000000000100000 - 00000000cff60000 (usable) [ 0.000000] BIOS-e820: 00000000cff60000 - 00000000cff69000 (ACPI data) [ 0.000000] BIOS-e820: 00000000cff69000 - 00000000cff80000 (ACPI NVS) [ 0.000000] BIOS-e820: 00000000cff80000 - 00000000d0000000 (reserved) [ 0.000000] BIOS-e820: 00000000e0000000 - 00000000f0000000 (reserved) [ 0.000000] BIOS-e820: 00000000fec00000 - 00000000fec10000 (reserved) [ 0.000000] BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved) [ 0.000000] BIOS-e820: 00000000ff000000 - 0000000100000000 (reserved) [ 0.000000] BIOS-e820: 0000000100000000 - 0000000230000000 (usable) And is not mapped as per init_memory_mapping. [ 0.000000] init_memory_mapping: 0000000000000000-00000000cff60000 [ 0.000000] init_memory_mapping: 0000000100000000-0000000230000000 We can add logic to check for this. But, there can also be other holes in identity map when we have 1GB of aligned reserved space in e820. This patch handles it by removing the WARN_ON and returning a specific error value (EFAULT) to indicate that the address does not have any identity mapping. The code that tries to keep identity map in sync can ignore this error, with other callers of cpa still getting error here. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit cdecff6864a1cd352a41d44a65e7451b8ef5cee2 Author: venkatesh.pallipadi@intel.com Date: Fri Jan 9 16:13:12 2009 -0800 x86 PAT: return compatible mapping to remap_pfn_range callers Impact: avoid warning message, potentially solve 3D performance regression Change x86 PAT code to return compatible memtype if the exact memtype that was requested in remap_pfn_rage and friends is not available due to some conflict. This is done by returning the compatible type in pgprot parameter of track_pfn_vma_new(), and the caller uses that memtype for page table. Note that track_pfn_vma_copy() which is basically called during fork gets the prot from existing page table and should not have any conflict. Hence we use strict memtype check there and do not allow compatible memtypes. This patch fixes the bug reported here: http://marc.info/?l=linux-kernel&m=123108883716357&w=2 Specifically the error message: X:5010 map pfn expected mapping type write-back for d0000000-d0101000, got write-combining Should go away. Reported-and-bisected-by: Kevin Winchester Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit e4b866ed197cef9989348e0479fed8d864ea465b Author: venkatesh.pallipadi@intel.com Date: Fri Jan 9 16:13:11 2009 -0800 x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param Impact: cleanup Change the protection parameter for track_pfn_vma_new() into a pgprot_t pointer. Subsequent patch changes the x86 PAT handling to return a compatible memtype in pgprot_t, if what was requested cannot be allowed due to conflicts. No fuctionality change in this patch. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit afc7d20c8429f32f19d47367fdc36eeed2334ec3 Author: venkatesh.pallipadi@intel.com Date: Fri Jan 9 16:13:10 2009 -0800 x86 PAT: consolidate old memtype new memtype check into a function Impact: cleanup Move the new memtype old memtype allowed check to header so that is can be shared by other users. Subsequent patch uses this in pat.c in remap_pfn_range() code path. No functionality change in this patch. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit a36706131182f5507d1e2cfbf391b0fa8d72203c Author: venkatesh.pallipadi@intel.com Date: Fri Jan 9 16:13:09 2009 -0800 x86 PAT: remove PFNMAP type on track_pfn_vma_new() error Impact: fix (harmless) double-free of memtype entries and avoid warning On track_pfn_vma_new() failure, reset the vm_flags so that there will be no second cleanup happening when upper level routines call unmap_vmas(). This patch fixes part of the bug reported here: http://marc.info/?l=linux-kernel&m=123108883716357&w=2 Specifically the error message: X:5010 freeing invalid memtype d0000000-d0101000 Is due to multiple frees on error path, will not happen with the patch below. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit e0b325d310a6b11f1538413fd557d2eb98f2fae5 Merge: 2883985... e8cea89... Author: Linus Torvalds Date: Tue Jan 13 09:03:02 2009 -0800 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: Revert "i386: add TRACE_IRQS_OFF for the nmi" commit 28839855bf623f2d7eee72377d4896770a45494f Merge: ccbf04f... 6e96281... Author: Linus Torvalds Date: Tue Jan 13 09:02:21 2009 -0800 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: smp_call_function_single(): be slightly less stupid, fix #2 lockdep, mm: fix might_fault() annotation commit ccbf04f24c55ead791dac5df8ddeb1a640fbaad8 Merge: 51eb9ab... 8c9ea7f... Author: Linus Torvalds Date: Tue Jan 13 08:19:42 2009 -0800 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/iser: Add dependency on INFINIBAND_ADDR_TRANS IPoIB: Do not join broadcast group if interface is brought down RDMA/nes: Fix for NIPQUAD removal IPoIB: Fix loss of connectivity after bonding failover on both sides IB/mlx4: Don't register IB device for adapters with no IB ports mlx4_core: Fix warning from min() IB/ehca: spin_lock_irqsave() takes an unsigned long commit 51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5 Merge: 288e487... 4a99d95... Author: Linus Torvalds Date: Tue Jan 13 08:17:41 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_it821x: Update RDC UDMA handling ata: fix wrong WARN_ON_ONCE commit 288e4877f94a3b144aadc206e7796921d02432c1 Author: Dirk Hohndel Date: Sun Jan 11 15:33:51 2009 +0000 Prevent oops at boot with VT-d With some broken BIOSs when VT-d is enabled, the data structures are filled incorrectly. This can cause a NULL pointer dereference in very early boot. Signed-off-by: Dirk Hohndel Acked-by: Yu Zhao Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit 4a99d95fa836e254d17910e52663ba2be7b880e7 Author: Alan Cox Date: Sun Jan 11 19:51:08 2009 +0000 pata_it821x: Update RDC UDMA handling The UDMA affliction is apparently specific to revision 0x11. Keeps us in sync with drivers/ide current. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a0f79f7ad3e52b908786462cf5446ebe20fe14fa Author: Christian Borntraeger Date: Tue Jan 13 10:38:36 2009 +0100 ata: fix wrong WARN_ON_ONCE This patch fixes a wrong WARN_ON that was triggered by 32bit PIO support: WARNING: at drivers/ata/libata-sff.c:1017 ata_sff_hsm_move+0x45e/0x750() __atapi_pio_bytes simply doesnt know enough to decide if there is a bug. Signed-off-by: Christian Borntraeger Signed-off-by: Jeff Garzik commit 061b908cf888c1bfd3dd1b91ce6f676e3bc42633 Author: Michael Ellerman Date: Mon Jan 12 16:30:00 2009 +0000 powerpc: Enable PS3 options and QPACE in ppc64_defconfig To increase the amount of code that's built for a defconfig build. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit c478b58135e6c9b49c8b80bff8ef910f2ba9b313 Author: Benjamin Herrenschmidt Date: Sun Jan 11 19:03:45 2009 +0000 powerpc/powermac: Fix occasional SMP boot failure The PowerMac kernel occasionally fails to bring up the secondary CPUs on SMP, the trigger factor seem to be fairly random and related to location of code and data. This appears to be due to the initial loading of the TOC value by the secondary processor which now happens before we clear HID4:RM_CI (Real Mode Cache Invalidate). This bit should really be cleared before we do any load or store other than fetching code. This fix works based on the assumption that all SMP 64-bit PowerMacs use variants of the 970, which fortunately is true, by explicitely clearing that bit, adding an slbia for good measure as RM_CI mode is known to create bogus ERAT entries. I also removed some spurrious debug output that was left enabled by mistake while at it. Signed-off-by: Benjamin Herrenschmidt commit fc7a9feb9c9df50ed6d115514b48c49e8511a4de Author: Nathan Lynch Date: Fri Jan 9 13:12:44 2009 +0000 powerpc/cacheinfo: Rename cache_dir per-cpu variable The per_cpu__ prefix on DECLARE_PER_CPU'd variables is going away; rename cache_dir to cache_dir_pcpu. Signed-off-by: Nathan Lynch Signed-off-by: Benjamin Herrenschmidt commit 2da7582f7cf5ef5e6adcf42537b6b8be06312152 Author: Milton Miller Date: Thu Jan 8 02:14:28 2009 +0000 hvc_console: Use kzalloc() instead of kmalloc() + memset() Replace kmalloc() + memset() with kzalloc(). Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit da9dc13289fa58dced12f2baff51dfb87c339ba3 Author: Milton Miller Date: Thu Jan 8 02:14:24 2009 +0000 hvc_console: Do not set low_latency when using interrupts hvc_console is setting low_latency unconditionally, but some clients are interrupt driven and will call hvc_poll from irq context. This will cause tty_flip_buffer_push to be called from irq context, and it very clearly states it must not be called from IRQ when low_latency is specified. Looking back through history: v2.6.16-rc1 via 33f0f88f1c51ae5c2d593d26960c760ea154c2e2 [PATCH] TTY layer buffering revamp added this new api. v2.6.16-rc3 via 8977d929e49021d9a6e031310aab01fa72f849c2 [PATCH] tty buffering stall fix claims to fix a stall discovered with hvc_console v2.6.16-rc5 via fb5c594c2acc441f0d2d8f457484a0e0e9285db3 [PATCH] Fix race condition in hvc console. said set this flag to avoid a stall problem, and was merged through the powerpc arch tree. Without searching for email discussions, it would appear to be an overlapping "fix", but one that did not consider all users. Signed-off-by: Benjamin Herrenschmidt commit c21f7a527f7757a0e246cea521a5dd3b8e1224d5 Author: Milton Miller Date: Thu Jan 8 02:14:21 2009 +0000 hvc_console: Call free_irq() only if request_irq() was successful Only call free_irq if we marked the request_irq has having succeeded instead of whenever the the sub-driver identified the interrupt to use. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 9fef3d2d15ae8ca24e4a145f2e189eea145d18c2 Author: Milton Miller Date: Thu Jan 8 02:14:18 2009 +0000 hvc_console: Change an mb() to smp_mb() and add some comments I remember some history on this barrier. There was a race between open via /dev/console and the tty being fully setup. Its also why there is a temporary variable and the global is assigned at the end of the function. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit a1c5a8932bbb75b550deb156d890027827fc9d6e Author: Stephen Rothwell Date: Tue Jan 6 14:40:06 2009 +0000 powerpc: Cleanup from l64 to ll64 change: drivers/net These are powerpc specific drivers. Signed-off-by: Stephen Rothwell Acked-by: David S. Miller Signed-off-by: Benjamin Herrenschmidt commit 1901515c79f13d9a1913d246b6c0711318dadb4c Author: Stephen Rothwell Date: Tue Jan 6 14:28:48 2009 +0000 powerpc: Cleanup from l64 to ll64 change: drivers/char This is a powerpc specific driver. Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 9477e455b4b3ded3e7add8c96d8293105947eaac Author: Stephen Rothwell Date: Tue Jan 6 14:27:38 2009 +0000 powerpc: Cleanup from l64 to ll64 change: arch code Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit fe333321e2a71f706b794d55b6a3dcb5ab240f65 Author: Ingo Molnar Date: Tue Jan 6 14:26:03 2009 +0000 powerpc: Change u64/s64 to a long long integer type Convert arch/powerpc/ over to long long based u64: -#ifdef __powerpc64__ -# include -#else -# include -#endif +#include This will avoid reoccuring spurious warnings in core kernel code that comes when people test on their own hardware. (i.e. x86 in ~98% of the cases) This is what x86 uses and it generally helps keep 64-bit code 32-bit clean too. [Adjusted to not impact user mode (from paulus) - sfr] Signed-off-by: Ingo Molnar Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 66c721e184e594d5761c5db804ade08fab81930d Author: Milton Miller Date: Fri Jan 2 10:46:15 2009 +0000 powerpc/kexec: Check crash_base for relocatable kernel Enforce that the crash kernel region never overlaps the current kernel, as it will be written directly on kexec load. Also, default to the previous KDUMP_KERNELBASE if the start is 0. Other architectures (x86, ia64) state that specifying the start address 0 (or omitting it) will result in the kernel allocating it. Before the relocatable patch in 2.6.28, powerpc would adjust any other start value to the hardcoded KDUMP_KERNELBASE of 32M. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit e16459c6b7e9c1390020a3e2a033b5383d1c4f3b Author: Milton Miller Date: Fri Jan 2 10:46:04 2009 +0000 powerpc: Make dummy section a valid note header We are declaring the dummy section (used to work around a binutils bug) as PT_NOTE, but we don't have enough bytes for it to be a valid note header, and kexec userspace complains: Warning: Elf Note name is not null terminated Warning: append= option is not passed. Using the first kernel root partition Warning: Elf Note name is not null terminated Instead of using the arbitray value 0xf177 (aka "fill"), declare a no-name no-description note of type 0. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 8c9ea7fe96afb30660673da77853114827fac0ca Merge: 7ddccb2... 50df48f... f5eb3b7... 22e7ef9... 03080e5... Author: Roland Dreier Date: Mon Jan 12 19:37:31 2009 -0800 Merge branches 'ehca', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next commit f5eb3b76003cc36f3f66514eef05779e7559c6a3 Author: Randy Dunlap Date: Mon Jan 12 19:30:41 2009 -0800 IB/iser: Add dependency on INFINIBAND_ADDR_TRANS Fix ib_iser build to depend on INFINIBAND_ADDR_TRANS; if INET=y but IPV6=n, then the RDMA CM is not built but INFINIBAND_ISER can be enabled, leading to: ERROR: "rdma_destroy_id" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_connect" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_destroy_qp" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_create_id" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_create_qp" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_resolve_route" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_disconnect" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! ERROR: "rdma_resolve_addr" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined! Signed-off-by: Randy Dunlap commit 50df48f59d656d58a1734df5cfe00cdc9a74e8b5 Author: Yossi Etigin Date: Mon Jan 12 19:28:42 2009 -0800 IPoIB: Do not join broadcast group if interface is brought down Because the ipoib_workqueue is not flushed when ipoib interface is brought down, ipoib_mcast_join() may trigger a join to the broadcast group after priv->broadcast was set to NULL (during cleanup). This will cause the system to be a member of the broadcast group when interface is down. As a side effect, this breaks the optimization of setting the Q_key only when joining the broadcast group. Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit bd1f7936ab5138d7e5e4f61bb4371e2994b2b2c5 Merge: 30aae73... ff82c58... Author: Benjamin Herrenschmidt Date: Tue Jan 13 13:59:11 2009 +1100 Merge commit 'gcl/gcl-next' into next commit 30aae739a9eb6db31ad7b08dac44bd302f41c709 Merge: 37a76bd... 6fd8be4... Author: Benjamin Herrenschmidt Date: Tue Jan 13 13:59:03 2009 +1100 Merge commit 'kumar/kumar-next' into next commit 37a76bd4f1b716949fc38a6842e89f0ccb8384d0 Author: Arjan van de Ven Date: Sun Jan 11 15:35:01 2009 +0000 async: fix __lowest_in_progress() At 37000 feet somewhere near Greenland I woke up from a half-sleep with the realisation that __lowest_in_progress() is buggy. After landing I checked and there were indeed 2 problems with it; this patch fixes both: * The order of the list checks was wrong * The locking was not correct. Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit d32ad102c6d748b510fd89f1af4232eac1be8732 Author: Arjan van de Ven Date: Sun Jan 11 15:03:23 2009 +0000 script: improve markup_oops.pl to also decode oopses in modules There has been some light flamewar on lkml about decoding oopses in modules (as part of the crashdump flamewar). Now this isn't rocket science, just the markup_oops.pl script cheaped out and didn't handle modules. But really; a flamewar all about that?? What happened to C++ in the kernel or reading files from inside the kernel? This patch adds module support to markup_oops.pl; it's not the most pretty perl but it works for my testcases... Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 7df52316601bfe308e427e0882f3e801682d800b Author: Chris Adams Date: Sun Jan 11 19:49:11 2009 +0000 ti_usb_3410_5052: add Multi-Tech firmware Add the Multi-Tech cellular modem firmware to the TI USB serial driver. This firmware was extracted from: ftp://ftp.multitech.com/wireless/wireless_linux.zip Firmware licence: "all firmware components are redistributable in binary form" per support@multitech.com Copyright (C) 2005 Multi-Tech Systems, Inc. Signed-off-by: Chris Adams Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit cb7a7c6a2cae5696b8aa636e86e9befd3dd00318 Author: Chris Adams Date: Sun Jan 11 19:49:00 2009 +0000 ti_usb_3410_5052: add Multi-Tech modem support Add Multi-Tech cellular modem support to the ti_usb_3410_5052 driver. Signed-off-by: Chris Adams Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 05a3d9050ad7bb791b9ba306165ea98e6d9e9da2 Author: Chris Adams Date: Sun Jan 11 19:48:53 2009 +0000 ti_usb_3410_5052: support alternate firmware The TI USB serial driver supports specifying alternate vendor and product IDs (since the chips can and are used in devices under other vendor/product IDs). However, the alternate IDs were not loaded in the combined product table. This patch also adds support for loading alternate firmware for alternate vendor/product IDs. Signed-off-by: Chris Adams Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit bf0672db79c18ce38d1783be982051a718a0bc22 Author: Alan Cox Date: Sun Jan 11 19:48:41 2009 +0000 usb-serial: remove NULL check Julia Lawell found a case where a NULL check was misplaced in the usb-serial code. However as the object in question cannot be NULL the check can simply be removed. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 21b56ec4e96f2bd8c584db41bd9a42c6cb71fdac Author: Alan Cox Date: Sun Jan 11 19:48:34 2009 +0000 neo: Remove a bogus NULL check Julia Lawall found an un-needed check in the neo driver. Her patch moves the check to cover the code dereferencing it, however it cannot be NULL anyway so remove the NULL check instead. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c774bda2fdc5412124a854a791d9f6f52936ff81 Author: Alan Cox Date: Sun Jan 11 19:46:49 2009 +0000 pty: Fix documentation The pty changes and updates for window sizing forgot to correct the kerneldoc Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 12847095e9c96cdf1ca6dd980ca733c38f8e9a98 Merge: 1181a24... fd2ab30... Author: Linus Torvalds Date: Mon Jan 12 16:29:00 2009 -0800 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: kernel/sched.c: add missing forward declaration for 'double_rq_lock' sched: partly revert "sched debug: remove NULL checking in print_cfs_rt_rq()" cpumask: fix CONFIG_NUMA=y sched.c commit 1181a2449969c59f0ab6b95374fe6983cc07286d Merge: b743791... 9d07933... Author: Linus Torvalds Date: Mon Jan 12 16:28:26 2009 -0800 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: sparc64: Fix cpumask related build failure smp_call_function_single(): be slightly less stupid, fix smp_call_function_single(): be slightly less stupid rcu: fix bug in rcutorture system-shutdown code commit b743791639d8142277df1c2814c282e3ad752f06 Merge: 9219a3b... b29c06a... Author: Linus Torvalds Date: Mon Jan 12 16:27:24 2009 -0800 Merge branch 'for-next' of git://git.o-hand.com/linux-mfd * 'for-next' of git://git.o-hand.com/linux-mfd: mfd: Fix twl4030-core build mfd: Ensure sm501 GPIO pin mode is GPIO when configured mfd: dm355 evm MMC/SD card detection regulator: PCF50633 pmic driver input: PCF50633 input driver power_supply: PCF50633 battery charger driver rtc: PCF50633 rtc driver mfd: PCF50633 gpio support mfd: PCF50633 adc driver mfd: PCF50633 core driver commit 9219a3b9889dbc7dae68e472f239672ff48860b0 Merge: 23ead72... cde15b5... Author: Linus Torvalds Date: Mon Jan 12 16:25:35 2009 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (37 commits) MIPS: Only write c0_framemask on CPUs which have this register. MIPS: Alchemy: new userspace suspend interface for development boards. MIPS: Alchemy: dbdma suspend/resume support. MIPS: Alchemy: Fix up PM code on Au1550/Au1200 MIPS: Alchemy: move calc_clock function. MIPS: Alchemy: RTC counter clocksource / clockevent support. MIPS: make cp0 counter clocksource/event usable as fallback. MIPS: Alchemy: remove cpu_table. MIPS: Alchemy: remove get/set_au1x00_lcd_clock(). MIPS: Print irq handler description MIPS: Alchemy: pb1200: update CPLD cascade irq handler. MIPS: Alchemy: update core interrupt code. MIPS: Alchemy: move commandline mangling out of common code MIPS: Alchemy: devboards: consolidate files MIPS: Alchemy: Move development board code to common subdirectory MIPS: Add Cavium OCTEON to arch/mips/Kconfig MIPS: Add defconfig for Cavium OCTEON. MIPS: Adjust the dma-common.c platform hooks. MIPS: Add Cavium OCTEON slot into proper tlb category. MIPS: Compute branch returns for Cavium OCTEON specific branch instructions. ... commit 23ead7291269db3be71b442324381c8d63e5d0b3 Merge: 54c2668... 3bc5342... Author: Linus Torvalds Date: Mon Jan 12 16:22:31 2009 -0800 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: (37 commits) ucc_geth: use correct UCCE macros net_dma: acquire/release dma channels on ifup/ifdown cxgb3: Keep LRO off if disabled when interface is down sfc: SFT9001: Fix condition for LNPGA power-off dccp ccid-3: Fix RFC reference smsc911x: register irq with device name, not driver name smsc911x: fix smsc911x_reg_read compiler warning forcedeth: napi schedule lock fix net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c forcedeth: remove mgmt unit for mcp79 chipset qlge: Remove dynamic alloc of rx ring control blocks. qlge: Fix schedule while atomic issue. qlge: Remove support for device ID 8000. qlge: Get rid of split addresses in hardware control blocks. qlge: Get rid of volatile usage for shadow register. forcedeth: version bump and copyright forcedeth: xmit lock fix netdev: missing validate_address hooks netdev: add missing set_mac_address hook netdev: gianfar: add MII ioctl handler ... commit 54c266870c0d75b919b07d5a6bfcdc18a57deb01 Merge: ddb4a9d... fc4dbea... Author: Linus Torvalds Date: Mon Jan 12 16:22:12 2009 -0800 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: sparc: Fix asm/signal.h for 32-bit. sparc: Eliminate PROMLIB_INTERNAL as it does nothing sparc: Kill exports of prom internal functions sparc64: move EXPORT_SYMBOL to the symbols definition sparc: move EXPORT_SYMBOL to the symbols definition sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file. sparc: Most unaligned_64.c tweaks for branch tracer warnings. sparc: Fix sun4d_irq.c build. sparc: Update 32-bit defconfig. sparc64: fix warnings in psycho_common after ull conversion commit ddb4a9dd6af72cc2c57a82d54d104d53c86384c2 Merge: 87aa08b... 24dafdf... Author: Linus Torvalds Date: Mon Jan 12 15:57:34 2009 -0800 Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6 * 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6: Fix small typo misdn: indentation and braces disagree - add braces misdn: one handmade ARRAY_SIZE converted drivers/isdn/hardware/mISDN: move a dereference below a NULL test indentation & braces disagree - add braces Make parameter debug writable BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered commit 87aa08b7fee79dac908c80f7593007243448ef89 Merge: 3b1b719... 618efba... Author: Linus Torvalds Date: Mon Jan 12 15:56:33 2009 -0800 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] Pika Warp appliance watchdog timer [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610 [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer [WATCHDOG] wm8350: Fix section annotations commit 3b1b71950b81c4a20ae63c2322383ab4932cdabd Merge: c69e883... 877d524... Author: Linus Torvalds Date: Mon Jan 12 15:55:19 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits) m68k: Fix --build-id breakage for sun3 m68k: Wire up sys_restart_syscall fbdev: Kill Atari vblank cursor blinking m68k: zorro - Use %pR to print resources m68k: dio - Kill resource_size_t format warnings m68k: dmasound - Kill warn_unused_result warnings m68k: zorro - Kill warn_unused_result warnings m68k: dio - Kill warn_unused_result warnings m68k: atafb - Kill warn_unused_result warnings m68k: amiserial - Kill warn_unused_result warnings m68k: ser_a2232 - Kill warn_unused_result warnings m68k: vme_scc - Kill warn_unused_result warnings m68k: sun3 core - Kill warn_unused_result warnings m68k: mvme147 core - Kill warn_unused_result warnings m68k: mac core - Kill warn_unused_result warnings m68k: hp300 core - Kill warn_unused_result warnings m68k: atari core - Kill warn_unused_result warnings m68k: apollo core - Kill warn_unused_result warnings m68k: amiga core - Kill warn_unused_result warnings m68k: Kill several external declarations in source files ... commit c69e8839c230c60d3c5f62c8f88bd23d8d6519ee Merge: 3e55f1a... c7be761... Author: Linus Torvalds Date: Mon Jan 12 15:54:27 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: change rsbtbl rwlock to spinlock dlm: fix seq_file usage in debugfs lock dump commit 3e55f1a292583b11ff85952eec77d65a459da2dd Merge: 9b0c474... 50c668d... Author: Linus Torvalds Date: Mon Jan 12 15:53:58 2009 -0800 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: Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write" x86: fix apic.c build error on latest git x86: fix mpparse.c build error on latest git x86: avoid theoretical vmalloc fault loop x86, mtrr: fix types used in userspace exported header commit 9b0c474f0a2366d6a9c4e7a0f348875017a841a5 Merge: ae04d14... 05f9341... Author: Linus Torvalds Date: Mon Jan 12 15:53:02 2009 -0800 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 - Use own workqueue ALSA: hda - add support for Intel DX58SO board ASoC: TWL4030: Module unloading fix ALSA: hda - create hda_codec.control_mutex for kcontrol->private_value ALSA: caiaq - Version 1.3.10 ALSA: hda - Add quirk for Dell Inspiron Mini9 ALSA: caiaq - Fix Oops with MIDI ASoC: TWL4030: Change the soc_value_enum back to soc_enum ASoC: Merge the soc_value_enum to soc_enum struct ALSA: hda - Add quirks for Acer Aspire 5930G and 6930G ALSA: hda - Add codec ID for MCP73 HDMI ALSA: hda - Fix typos for AD1882 codecs ALSA: hda - Add quirk for HP 2230s commit 618efba999d0e7f4bcde93231dcb9a748223c6e3 Author: Sean MacLennan Date: Tue Sep 23 20:26:26 2008 -0400 [WATCHDOG] Pika Warp appliance watchdog timer The FPGA based watchdog timer used by the Pika Warp appliance. Signed-off-by: Sean MacLennan Signed-off-by: Wim Van Sebroeck commit 6ec9eae67a82a38865af20580e5e0ccd012aca4b Author: Martyn Welch Date: Mon Nov 10 12:31:33 2008 +0000 [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610 Support for the FPGA based watchdog timer on GE Fanuc's SBC610. This patch enables one of the watchdog timers found on the SBC610. There are two identical watchdog timers at different offsets in the above mentioned boards, however the current driver is only capable of supporting one of them. The watchdog timers are also capable of generating interrupts at a user-configurable threshold, though support for this operation is currently not supported by the driver. Signed-off-by: Martyn Welch Signed-off-by: Wim Van Sebroeck commit 3268b5618f387c6b78b8f8b1190d43380c8170ac Author: Martyn Welch Date: Mon Nov 10 12:31:26 2008 +0000 [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer GE Fanuc SBC610 Support for the FPGA based watchdog timer as found on GE Fanuc's SBC310, SBC610 and PPC9A Single Board Computers. This patch adds support for the watchdog timer found in one of the devices FPGAs. There are two identical watchdog timers at different offsets in the above mentioned boards, this driver is capable of supporting one of them. The watchdog timers are also capable of generating interrupts at a user-configurable threshold, though support for this operation is currently not supported by the driver. Signed-off-by: Martyn Welch Signed-off-by: Wim Van Sebroeck commit b1cf3e99dbca10cc3ed62ce354f6541e76ac8ea8 Author: Mark Brown Date: Thu Jan 8 12:04:27 2009 +0000 [WATCHDOG] wm8350: Fix section annotations The probe and remove functions were incorrectly annotated, with the misannotation of the remove function causing build failures when built in. Signed-off-by: Mark Brown Signed-off-by: Wim Van Sebroeck commit 877d52431f4d3cda4adea077ffbe88f3fd1755d3 Author: Al Viro Date: Mon Jan 5 17:28:10 2009 +0000 m68k: Fix --build-id breakage for sun3 Counterpart of commit 08a3db94f2a36c28278922732bc281c1722ceb18 ("m68k: Add NOTES to init data so its discarded at boot") for sun3 build. Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit c162564ebf001e79448e8aa7a6e0ffee00b55f74 Author: Andreas Schwab Date: Mon Dec 29 19:34:57 2008 +0100 m68k: Wire up sys_restart_syscall Make restart blocks working, required for proper syscall restarting. Signed-off-by: Andreas Schwab Signed-off-by: Geert Uytterhoeven commit 1fa0b29f3a43f9dd8080d24cd16790b15ef963f5 Author: Geert Uytterhoeven Date: Tue Dec 30 14:11:23 2008 +0100 fbdev: Kill Atari vblank cursor blinking Kill the last remaining vblank cursor blinking user Signed-off-by: Geert Uytterhoeven commit b01e3b07ec29e98464a4f580ae000291cf0d2f87 Author: Geert Uytterhoeven Date: Tue Dec 30 14:23:35 2008 +0100 m68k: zorro - Use %pR to print resources Signed-off-by: Geert Uytterhoeven commit fae3306ac0c74be0e1ab32e1c77120e792ab2a33 Author: Geert Uytterhoeven Date: Tue Dec 30 14:22:01 2008 +0100 m68k: dio - Kill resource_size_t format warnings warning: format '%08lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' Signed-off-by: Geert Uytterhoeven commit 89bde7b86e21291ef091dc6ad3e63412f7c6ddd9 Author: Geert Uytterhoeven Date: Tue Dec 30 14:25:31 2008 +0100 m68k: dmasound - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 11a8b2c5cde1377c716087df0866d7dc5a6d5d10 Author: Geert Uytterhoeven Date: Tue Dec 30 14:21:19 2008 +0100 m68k: zorro - Kill warn_unused_result warnings warning: ignoring return value of 'device_register', declared with attribute warn_unused_result warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 2e4c77bea3d8b17d94f8ee382411f359b708560f Author: Geert Uytterhoeven Date: Tue Dec 30 14:16:41 2008 +0100 m68k: dio - Kill warn_unused_result warnings warning: ignoring return value of 'device_register', declared with attribute warn_unused_result warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 639274d8106e25c2f91bf92270f46aaa3d104040 Author: Geert Uytterhoeven Date: Tue Dec 30 14:10:11 2008 +0100 m68k: atafb - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 5edc304f49f3b1a246a3cc4ecc248e8fe7174840 Author: Geert Uytterhoeven Date: Tue Dec 30 14:13:41 2008 +0100 m68k: amiserial - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result and clean up the error path handling. Signed-off-by: Geert Uytterhoeven Acked-by: Alan Cox commit 67c53c34660c535083c4c8753e547a9338802ec6 Author: Geert Uytterhoeven Date: Tue Dec 30 14:08:21 2008 +0100 m68k: ser_a2232 - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven Acked-by: Alan Cox commit c36a4e40389a17bb439e2f38b1ae9632ba8af7ae Author: Geert Uytterhoeven Date: Tue Dec 30 14:07:07 2008 +0100 m68k: vme_scc - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven Acked-by: Alan Cox commit 07e449b5b43b4b82c54e3026fc26bd4d8c81b080 Author: Geert Uytterhoeven Date: Tue Dec 30 14:05:24 2008 +0100 m68k: sun3 core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 41904f8fe160202b8bfcc5da91dd927be40775b3 Author: Geert Uytterhoeven Date: Tue Dec 30 14:03:28 2008 +0100 m68k: mvme147 core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 92c3dd15cd0589adf66c13c7b6114790c207e5a2 Author: Geert Uytterhoeven Date: Tue Dec 30 14:02:27 2008 +0100 m68k: mac core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 8bd3968bd1653b4499e843bf86a167ead7c86b74 Author: Geert Uytterhoeven Date: Tue Dec 30 14:02:06 2008 +0100 m68k: hp300 core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 5b8b4c3d1b0ed4ccac3b1985acd0a973dfa00801 Author: Geert Uytterhoeven Date: Tue Dec 30 14:01:32 2008 +0100 m68k: atari core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 844306538920b3aaf6806e238f0c0309a1e2bb5f Author: Geert Uytterhoeven Date: Tue Dec 30 14:01:07 2008 +0100 m68k: apollo core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit 66acd2581259d80935fc5216b4b1268d639d9143 Author: Geert Uytterhoeven Date: Tue Dec 30 14:00:34 2008 +0100 m68k: amiga core - Kill warn_unused_result warnings warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven commit c85627fbf5f47045b25bf66f1b4a7001b5b157af Author: Geert Uytterhoeven Date: Sun Dec 21 12:03:37 2008 +0100 m68k: Kill several external declarations in source files - Replace external declarations by proper includes where availiable. The accesses to some symbols had to be modified, as before they were declared using e.g. "extern int _end", while asm-generic/sections.h uses e.g. "extern char _end[]" - Remove unused or superfluous external declarations Signed-off-by: Geert Uytterhoeven commit 6d0be946e150ac17da7381b27fd40603ca40b58f Author: Andreas Bombe Date: Wed Dec 10 02:02:19 2008 +0100 m68k: amiflop - Get rid of sleep_on calls Apart from sleep_on() calls that could be easily converted to wait_event() and completion calls amiflop also used a flag in ms_delay() and ms_isr() as a custom mutex for ms_delay() without a need for explicit unlocking. I converted that to a standard mutex. The replacement for the unconditional sleep_on() in fd_motor_on() is a complete_all() together with a INIT_COMPLETION() before the mod_timer() call. It appears to me that fd_motor_on() might be called concurrently and fd_select() does not guarantee mutual exclusivity in the case the same drive gets selected again. Signed-off-by: Andreas Bombe Acked-by: Jörg Dorchain Signed-off-by: Geert Uytterhoeven commit dc8ee69c760317be0bb4eac2bd2fd81eb663627a Author: Kars de Jong Date: Fri Nov 21 13:18:12 2008 +0100 m68k: zorro - Add devlist.h and gen-devlist to .gitignore drivers/zorro/.gitignore: Added devlist.h and gen-devlist to .gitignore file because they shouldn't be tracked. Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven commit 2455e3c60583961c6f3ddb33201a422404564d8f Author: Kars de Jong Date: Thu Nov 20 14:28:30 2008 +0100 m68k: Add vmlinux.lds to .gitignore arch/m68k/kernel/.gitignore: Added vmlinux.lds to .gitignore file because it shouldn't be tracked. Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven commit 2eab7ff843d2cb8c9b2ace869774bd85b2316090 Author: Geert Uytterhoeven Date: Sun Dec 21 15:48:13 2008 +0100 fbdev: c2p - Rename c2p to c2p_planar Signed-off-by: Geert Uytterhoeven commit 96f47d6105203ab06c2004e26979dea153bce073 Author: Geert Uytterhoeven Date: Sun Dec 21 15:48:12 2008 +0100 fbdev: c2p/atafb - Add support for Atari interleaved bitplanes The c2p() for normal bitplanes is not suitable for interleaved bitplanes with 2 bytes of interleave, causing a garbled penguin logo. Add c2p_iplan2(). Signed-off-by: Geert Uytterhoeven commit 2cd1de0a0ff1d3da08ff1f1437cf4a44deae6a00 Author: Geert Uytterhoeven Date: Sun Jan 4 11:58:20 2009 +0100 fbdev: c2p - Extract common c2p core to c2p_core.h Signed-off-by: Geert Uytterhoeven commit 1f034456c140a8677d0ff3a9bdb3c4b620aae2cb Author: Geert Uytterhoeven Date: Sun Jan 4 11:43:00 2009 +0100 fbdev: c2p - Cleanups - Improve comments and naming - Convert macros to static inline functions - Remove superfluous `break' after `return' - Make sure we get a build-time error (undefined reference to 'c2p_unsupported') in case of future misuse - Replace `unsigned long' by `u32' in comp(), as that's what all callers use - Use {get,put}_unaligned_be32() in store_planar{,_masked}() - Use void * for arbitrary pointers - Use a union to represent pixels/words, to avoid casts Signed-off-by: Geert Uytterhoeven commit 8280eb8a33d60be4f5fa76d5144f66656c71a680 Author: Geert Uytterhoeven Date: Sun Jan 4 11:42:16 2009 +0100 fbdev: c2p - Correct indentation Signed-off-by: Geert Uytterhoeven commit 74511413dd0b8f6c9f5a47bf045eba434f4fdd2b Author: Geert Uytterhoeven Date: Tue Nov 18 21:13:01 2008 +0100 fbdev: atafb - Fix 16 bpp console - 16 bpp must use the cfb_*() ops - 16 bpp needs to set up info->pseudo_palette[] (was fbcon_cfb16_cmap[] in 2.4.x) - Kill commented out 2.4.x fbcon remnants Signed-off-by: Geert Uytterhoeven commit 02603930da19fa447648952873e967fb9663ec18 Author: Geert Uytterhoeven Date: Tue Nov 18 21:13:01 2008 +0100 fbdev: atafb - Fix line length handling - Make sure par->next_line is always set (this was done for Falcon only), as all the text console drawing operations need a valid par->next_line, - Make sure fix->line_length is always set, as some userspace applications need it because they don't have fallback code for the case where it's zero. Signed-off-by: Geert Uytterhoeven commit e8cea892dff8e3ebed42954c46730309b617196f Author: Ingo Molnar Date: Mon Jan 12 19:36:59 2009 +0100 Revert "i386: add TRACE_IRQS_OFF for the nmi" This reverts commit e0c7317557c8fc8eacf611e30c2a80f4e24e47a3. This patch was wrong, as lockdep (and thus the irq state tracer) aren't nmi safe. People are already seeing lockdep warnings due to this. Signed-off-by: Ingo Molnar commit 50c668d678fd01284799a6e4f1b91829d83cb9ed Author: Ingo Molnar Date: Mon Jan 12 10:49:53 2009 +0100 Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write" This reverts commit 7503bfbae89eba07b46441a5d1594647f6b8ab7d. Dieter Ries reported bootup soft-hangs and bisected it back to this commit, and reverting this commit gave him a working system. The commit introduces work_on_cpu() use into the cpufreq code, but that is subtly problematic from a lock hierarchy POV: the hotplug-cpu lock is an highlevel lock that is taken before lowlevel locks, and in this codepath we are called with the policy lock taken. Dieter did not have lockdep enabled so we dont have a nice stack trace proof for this, but using work_on_cpu() in such a lowlevel place certainly looks wrong, so we revert the patch. work_on_cpu() needs to be reworked to be more generally usable. Reported-by: Dieter Ries Tested-by: Dieter Ries Signed-off-by: Ingo Molnar commit 2bc1379712e74c5b99adaa6db433c14d8841ab4f Author: Jaswinder Singh Rajput Date: Sun Jan 11 20:34:47 2009 +0530 x86: fix apic.c build error on latest git Fix this by reintroducing asm/smp.h include in apic.c - later on I will fix this by removing non-smp data from smp.h Also fix the __inquire_remote_apic() prototype/inline. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Ingo Molnar commit 4884d8e6a05026ec906355436cea9dc1acb1d09e Author: Jaswinder Singh Rajput Date: Sun Jan 11 18:38:55 2009 +0530 x86: fix mpparse.c build error on latest git Fix this by reintroducing asm/smp.h include in mpparse.c - later on I will fix this by removing non-smp data from smp.h. Reported-by: Petr Titera Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Ingo Molnar commit f313e12308f7c5ea645f18e759d104d088b18615 Author: Andi Kleen Date: Fri Jan 9 12:17:43 2009 -0800 x86: avoid theoretical vmalloc fault loop Ajith Kumar noticed: I was going through the vmalloc fault handling for x86_64 and am unclear about the following lines in the vmalloc_fault() function. pgd = pgd_offset(current->mm ?: &init_mm, address); pgd_ref = pgd_offset_k(address); Here the intention is to get the pgd corresponding to the current process and sync it up with the pgd in init_mm(obtained from pgd_offset_k). However, for kernel threads current->mm is NULL and hence pgd = pgd_offset(init_mm, address) = pgd_ref which means the fault handler returns without setting the pgd entry in the MM structure in the context of which the kernel thread has faulted. This could lead to never-ending faults and busy looping of kernel threads like pdflush. So, shouldn't the pgd = pgd_offset(current->mm ?: &init_mm, address); be pgd = pgd_offset(current->active_mm ?: &init_mm, address); We can use active_mm unconditionally because it should be always set. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 6e96281412f2f757abe623e08a9577e2bbd3402f Author: Ingo Molnar Date: Mon Jan 12 16:04:37 2009 +0100 smp_call_function_single(): be slightly less stupid, fix #2 fix m68k build failure: tip/kernel/up.c: In function 'smp_call_function_single': tip/kernel/up.c:16: error: dereferencing pointer to incomplete type make[2]: *** [kernel/up.o] Error 1 Signed-off-by: Ingo Molnar commit a04b9f845164a745e8773d916d45b0ea1a67726d Merge: 98007c2... da17490... Author: Russell King Date: Mon Jan 12 13:51:40 2009 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 commit 98007c230eb1e85ff5d49b4a697835680483dafd Author: Nicolas Pitre Date: Fri Jan 9 15:28:55 2009 +0100 [ARM] 5364/1: allow flush_ioremap_region() to be used from modules Without this, the pxa2xx-flash driver cannot be used as a module. Reported-by: Chris Lawrence Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d672d2fc13242f9284345cb7e4c5a32cd5edefa3 Author: Russell King Date: Sat Jan 10 11:34:39 2009 +0000 [ARM] w90x900: fix build errors and warnings Fix: arch/arm/mach-w90x900/mach-w90p910evb.c:65: error: 'W90X900_PA_UART' undeclared here (not in a function) and silence warnings caused by inappropriate inclusion of mach/system.h. Signed-off-by: Russell King commit 05f93414fad0f22e7c6f766adef8d5e72a1d3c67 Merge: a24ba44... 16b2857... Author: Takashi Iwai Date: Mon Jan 12 14:06:01 2009 +0100 Merge branch 'topic/usb-caiaq' into for-linus commit a24ba44cf2adf166bbb1028d57ca0f4b636a1ef7 Merge: 9229f43... 6acaed3... Author: Takashi Iwai Date: Mon Jan 12 14:05:55 2009 +0100 Merge branch 'topic/hda' into for-linus commit 9229f43f48d1b454a4e8b83985d0195b1760a550 Merge: c597650... c6d1662... Author: Takashi Iwai Date: Mon Jan 12 14:05:50 2009 +0100 Merge branch 'topic/asoc' into for-linus commit 24dafdf00b630cb827875c187f2a493280cab078 Merge: fae3e7f... ae04d14... Author: Karsten Keil Date: Mon Jan 12 13:16:17 2009 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for_2.6.29 commit 95156f0051cba60ec674bbaa5cf7dc74a74c5612 Author: Peter Zijlstra Date: Mon Jan 12 13:02:11 2009 +0100 lockdep, mm: fix might_fault() annotation Some code (nfs/sunrpc) uses socket ops on kernel memory while holding the mmap_sem, this is safe because kernel memory doesn't get paged out, therefore we'll never actually fault, and the might_fault() annotations will generate false positives. Reported-by: "J. Bruce Fields" Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit da17490c0d4f9fd38761e6a7e95ac0bbd9f45ad9 Author: Sascha Hauer Date: Mon Jan 12 12:14:40 2009 +0100 [ARM] i.MX add missing include Signed-off-by: Sascha Hauer commit 96cb767239d12ce98e66892ccc82787fbc63505f Author: Sascha Hauer Date: Mon Jan 12 12:09:59 2009 +0100 [ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e Fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e: i.MX Framebuffer: rename imxfb_mach_info to imx_fb_platform_data Forgot to rename the parts in arch/arm/mach-imx/generic.c Signed-off-by: Sascha Hauer commit 68b5e4891c2a7a86d8fe65c29c025d7a7f2b0e35 Author: Sascha Hauer Date: Mon Jan 12 12:07:32 2009 +0100 [ARM] i.MX: remove LCDC controller register definitions from imx-regs.h The LCDC controller register definitions are now part of the driver itself, so remove them from imx-regs.h to avoid redefitions. Signed-off-by: Sascha Hauer commit 6acaed38a32e8571e92cfc832b971f9e4450c207 Author: Takashi Iwai Date: Mon Jan 12 10:09:24 2009 +0100 ALSA: hda - Use own workqueue snd-hda-intel driver used schedule_work() fot the delayed DMA pointer updates, but this has several potential problems: - it may block other eventsd works longer - it may deadlock when probing fails and flush_scheduled_work() is called during probe callback (as probe callback itself could be invoked from eventd) This patch adds an own workq for each driver instance to solve these problems. Signed-off-by: Takashi Iwai commit 4b558991049c12689e5fd645222864b8a80730f1 Author: Wu Fengguang Date: Mon Jan 12 09:18:58 2009 +0800 ALSA: hda - add support for Intel DX58SO board The Intel DX58SO board works fine with model ALC883_3ST_6ch_INTEL. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit ae04d1401577bb63151480a053057de58b8e10bb Author: Benjamin Herrenschmidt Date: Mon Jan 12 11:22:01 2009 +1100 powerpc: Fix cpufreq drivers after cpufreq core changes This updates the cpufreq drivers in arch/powerpc so they build again after the core cpufreq changes that broke them in commit in835481d9bcd65720b473db6b38746a74a3964218. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit fae3e7fba4c664b3a15f2cf15ac439e8d754afc2 Author: Karsten Keil Date: Sun Jan 11 18:36:30 2009 +0100 Fix small typo Remove additional ; Signed-off-by: Karsten Keil commit 21c150a6d2c39fe6975e91437095a2c31efdb550 Author: Ilpo Järvinen Date: Fri Jan 9 12:22:52 2009 -0800 misdn: indentation and braces disagree - add braces This is not buggy due to plain luck as there is only one entry currently in the element_attributes. Signed-off-by: Ilpo Järvinen Signed-off-by: Andrew Morton Signed-off-by: Karsten Keil commit 1916ebb2ddad78ae6405b1291acb9f9de212ec49 Author: Ilpo Järvinen Date: Fri Jan 9 12:22:51 2009 -0800 misdn: one handmade ARRAY_SIZE converted Defined as: static struct device_attribute element_attributes[] = { Signed-off-by: Ilpo Järvinen Signed-off-by: Andrew Morton Signed-off-by: Karsten Keil commit 20b788045b73e81ace2498eae42220e64547d6d2 Author: Julia Lawall Date: Fri Jan 9 12:22:53 2009 -0800 drivers/isdn/hardware/mISDN: move a dereference below a NULL test In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: Karsten Keil commit f27b8c356c4fab9ad222b45bc1cd1c750e64d97b Author: Ilpo Järvinen Date: Fri Jan 9 12:22:50 2009 -0800 indentation & braces disagree - add braces Nothing is broken because of this - currently. Signed-off-by: Ilpo Järvinen Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton commit 9785a8f8db3df0605fa680f44185957aff9d8776 Author: Karsten Keil Date: Sun Jan 11 17:58:13 2009 +0100 Make parameter debug writable Overseen in the last patch series. Signed-off-by: Karsten Keil commit 57de16e612d63138bd2c618449af9d8312466e25 Author: Martin Bachem Date: Sun Oct 26 13:30:09 2008 +0100 BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered daxtar example # modprobe hfcsusb daxtar example # modprobe mISDN_l1loop daxtar example # ./misdnportinfo Found 3 devices id: 0 Dprotocols: 00000006 Bprotocols: 0000000e protocol: 0 nrbchan: 2 name: HFC-S_USB.1 id: 1 Dprotocols: 00000006 Bprotocols: 0000000e protocol: 0 nrbchan: 2 name: mISDN_l1loop.1 id: 2 Dprotocols: 00000006 Bprotocols: 0000000e protocol: 0 nrbchan: 2 name: mISDN_l1loop.2 daxtar example # rmmod hfcsusb daxtar example # ./misdnportinfo Found 2 devices *Segmentation* *fault* dmesg: [ 9914.939718] BUG: unable to handle kernel NULL pointer dereference at 000000d4 [ 9914.939721] IP: [] :mISDN_core:get_mdevice+0x19/0x22 [ 9914.939729] *pde = 00000000 [ 9914.939732] Oops: 0000 [#14] PREEMPT SMP [ 9914.939734] Modules linked in: mISDN_l1loop mISDN_core vmnet vmblock vmci vmmon coretemp w83627ehf hwmon_vid rfcomm l2cap blue tooth usbhid snd_usb_audio snd_usb_lib snd_rawmidi snd_hwdep fuse nvidia(P) uhci_hcd i2c_i801 ehci_hcd snd_hda_intel atl1 usbcore i2c_core parport_seria l [last unloaded: hfcsusb] [ 9914.939751] Pid: 29618, comm: misdnportinfo Tainted: P D (2.6.27.3 #5) [ 9914.939753] EIP: 0060:[] EFLAGS: 00210246 CPU: 0 [ 9914.939758] EIP is at get_mdevice+0x19/0x22 [mISDN_core] [ 9914.939760] EAX: 00000000 EBX: f8fa791c ECX: f6afaa58 EDX: f7960cf4 [ 9914.939762] ESI: 80044944 EDI: bfc2e62c EBP: bfc2e62c ESP: f5adbef4 [ 9914.939763] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 9914.939765] Process misdnportinfo (pid: 29618, ti=f5ada000 task=f6bec430 task.ti=f5ada000) [ 9914.939767] Stack: f8f9f4e0 00000000 f8f9f867 bfc2e62c 0000000a c02461e8 00200246 c042dde8 [ 9914.939771] 00000003 c042dde4 00000000 00000001 00200082 c0114775 00000000 00000000 [ 9914.939775] 00000003 f7088010 00200282 f8fa791c 80044944 bfc2e62c bfc2e62c c02f6615 [ 9914.939780] Call Trace: [ 9914.939782] [] _get_mdevice+0x0/0x18 [mISDN_core] [ 9914.939789] [] base_sock_ioctl+0x7a/0x129 [mISDN_core] [ 9914.939789] [] opost+0x171/0x182 [ 9914.939789] [] __wake_up+0x29/0x39 [ 9914.939789] [] sock_ioctl+0x1b5/0x1d9 [ 9914.939789] [] sock_ioctl+0x0/0x1d9 [ 9914.939789] [] vfs_ioctl+0x1c/0x5d [ 9914.939789] [] do_vfs_ioctl+0x23e/0x24e [ 9914.939789] [] sys_ioctl+0x2c/0x45 [ 9914.939789] [] sysenter_do_call+0x12/0x21 [ 9914.939789] [] pci_fixup_i450gx+0x4e/0x56 [ 9914.939789] ======================= [ 9914.939789] Code: 00 68 02 f0 f9 f8 e8 ae b4 2c c7 8b 44 24 04 5a 59 c3 83 ec 04 31 d2 89 04 24 89 e1 b8 ac df fa f8 68 e0 f4 f9 f8 e8 4a b5 2c c7 <8b> 80 d4 00 00 00 5a 59 c3 53 89 cb 8d 90 9c 00 00 00 89 c8 e8 [ 9914.939789] EIP: [] get_mdevice+0x19/0x22 [mISDN_core] SS:ESP 0068:f5adbef4 [ 9914.939858] ---[ end trace 50e18a715b019424 ]--- Signed-off-by: Martin Bachem Signed-off-by: Karsten Keil commit 9d0793370987b98708d2f75ee3bba7c1008d8512 Author: David Miller Date: Sun Jan 11 04:06:40 2009 -0800 sparc64: Fix cpumask related build failure cpumask_of_pcibus() was missing - this triggers on NUMA builds. Signed-off-by: David S. Miller Signed-off-by: Ingo Molnar commit fd2ab30b65e961b974ae0bc71e0d47d6b35e0968 Author: Steven Noonan Date: Sun Jan 11 01:04:22 2009 -0800 kernel/sched.c: add missing forward declaration for 'double_rq_lock' Impact: build fix on certain configs Added 'double_rq_lock' forward declaration, allowing double_rq_lock to be used in _double_lock_balance(). Signed-off-by: Steven Noonan Signed-off-by: Ingo Molnar commit df051434f1dfc93ec2e1c1d186bb87cb3db9dcdf Merge: 805194c... c597650... Author: Ingo Molnar Date: Sun Jan 11 13:03:08 2009 +0100 Merge commit 'v2.6.29-rc1' into sched/urgent commit cde15b5927fea3e1b4de0b277008cf273d8b000b Author: Ralf Baechle Date: Tue Jan 6 23:07:20 2009 +0000 MIPS: Only write c0_framemask on CPUs which have this register. Signed-off-by: Ralf Baechle commit 61f9c58da57a80b0df1ced18a28cbbaebd4d417a Author: Manuel Lauss Date: Sun Dec 21 09:26:27 2008 +0100 MIPS: Alchemy: new userspace suspend interface for development boards. Replace the current sysctl-based suspend interface with a new sysfs- based one which also uses the Linux-2.6 suspend model. To configure wakeup sources, a subtree for the demoboards is created under /sys/power/db1x: sys/ `-- power `-- db1x |-- gpio0 |-- gpio1 |-- gpio2 |-- gpio3 |-- gpio4 |-- gpio5 |-- gpio6 |-- gpio7 |-- timer |-- timer_timeout |-- wakemsk `-- wakesrc The nodes 'gpio[0-7]' and 'timer' configure the GPIO0..7 and M2 bits of the SYS_WAKEMSK (wakeup source enable) register. Writing '1' enables a wakesource, 0 disables it. The 'timer_timeout' node holds the timeout in seconds after which the TOYMATCH2 event should wake the system. The 'wakesrc' node holds the SYS_WAKESRC register after wakeup (in hex), the 'wakemsk' node can be used to get/set the wakeup mask directly. For example, to have the timer wake the system after 10 seconds of sleep, the following must be done in userspace: echo 10 > /sys/power/db1x/timer_timeout echo 1 > /sys/power/db1x/timer echo mem > /sys/power/sleep This patch also removes the homebrew CPU frequency switching code. I don't understand how it could have ever worked reliably; it does not communicate the clock changes to peripheral devices other than uarts. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle create mode 100644 arch/mips/alchemy/devboards/pm.c commit ac15dad061d351281b0bafbae1ecdd84e601435a Author: Manuel Lauss Date: Sun Dec 21 09:26:26 2008 +0100 MIPS: Alchemy: dbdma suspend/resume support. Implement suspend/resume for DBDMA controller and its channels. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 564365b0fc3395ed55501ef25705664888cebdbc Author: Manuel Lauss Date: Sun Dec 21 09:26:25 2008 +0100 MIPS: Alchemy: Fix up PM code on Au1550/Au1200 Au1550/Au1200 have a different memory controller which requires additi- onal code to properly put memory to sleep (code taken from AMD/RMI's Linux-2.6.11 source package). Also fix up the remaining pm-related paths to compile on Au1200/Au1550 platforms. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 2699cdfb765c3b7d77d28ea3bc7d84e486697177 Author: Manuel Lauss Date: Sun Dec 21 09:26:24 2008 +0100 MIPS: Alchemy: move calc_clock function. Now that nothing in time.c depends on calc_clock, it can be moved to clocks.c where it belongs. While at it, give it a better non-generic name and call it as soon as possible in plat_mem_init. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 0c694de12b54fa96b9555e07603f567906ce21c8 Author: Manuel Lauss Date: Sun Dec 21 09:26:23 2008 +0100 MIPS: Alchemy: RTC counter clocksource / clockevent support. Add support for the 32 kHz counter1 (RTC) as clocksource / clockevent device. As a nice side effect, this also enables use of the 'wait' instruction for runtime idle power savings. If the counters aren't enabled/working properly, fall back on the cp0 counter clock code. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 779e7d41ad004946603da139da99ba775f74cb1c Author: Manuel Lauss Date: Sun Dec 21 09:26:22 2008 +0100 MIPS: make cp0 counter clocksource/event usable as fallback. The current mips clock build infrastructure lets a system only use either the MIPS cp0 counter or a SoC specific timer as a clocksource / clockevent device. This patch renames the core cp0 counter clocksource / clockevent functions from mips_* to r4k_* and updates the wrappers in asm-mips/time.h to call these renamed functions instead. Chips which can detect whether it is safe to use a chip-specific timer can now fall back on the cp0 counter if necessary and possible (e.g. Alchemy with a follow-on patch). Existing behaviour is not changed in any way. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 074cf656700ddd1d2bd7f815f78e785418beb898 Author: Manuel Lauss Date: Sun Dec 21 09:26:21 2008 +0100 MIPS: Alchemy: remove cpu_table. Remove the cpu_table: - move detection of whether c0_config[OD] is read-only and should be set to fix various chip errata to au1000 headers. - move detection of write-only sys_cpupll to au1000 headers. - remove the BCLK switching code: Activation of this features should be left to the boards using the chips since it also affects external devices tied to BCLK, and only the board designers know whether it is safe to enable. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle delete mode 100644 arch/mips/alchemy/common/cputable.c commit 1820ec1d2b993f3ec00169e881504aa4541a9bf7 Author: Manuel Lauss Date: Sun Dec 21 09:26:20 2008 +0100 MIPS: Alchemy: remove get/set_au1x00_lcd_clock(). There are no in-tree users, so remove them. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 558d1de8ba9ebb1cc3f3062f1371b9330772164f Author: Manuel Lauss Date: Sun Dec 21 09:26:19 2008 +0100 MIPS: Print irq handler description Add the name set by set_irq_chip_and_handler_name() to the output of /proc/interrupts, like so: db1200 ~ # cat /proc/interrupts CPU0 8: 52 Alchemy-IC0-hilevel serial 10: 171 Alchemy-IC0-hilevel au1xxx-mmc 11: 47 Alchemy-IC0-hilevel Au1xxx dbdma 18: 1 Alchemy-IC0-hilevel au1550-spi 29: 1250997 Alchemy-IC0-riseedge timer 37: 211 Alchemy-IC0-hilevel ehci_hcd:usb1, ohci_hcd:usb2 38: 0 Alchemy-IC0-hilevel lcd 72: 2623 DB1200 CPLD-level ide0 73: 257 DB1200 CPLD-level eth0 84: 1 DB1200 CPLD-level sd_insert 85: 0 DB1200 CPLD-level sd_eject ERR: 0 Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 197b0d31eb3e82f598bf13da6ee777d906c611f3 Author: Manuel Lauss Date: Sun Dec 21 09:26:18 2008 +0100 MIPS: Alchemy: pb1200: update CPLD cascade irq handler. Tested on Db1200. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 785e3268e2951d4c0c21417c8e5d8004b2ab2480 Author: Manuel Lauss Date: Sun Dec 21 09:26:17 2008 +0100 MIPS: Alchemy: update core interrupt code. This patch attempts to modernize core Alchemy interrupt handling code. - add irq_chips for irq controllers instead of irq type, - add a set_type() hook to change irq trigger type during runtime, - add a set_wake() hook to control GPIO0..7 based wakeup, - use linux' IRQF_TRIGGER_ constants instead of homebrew ones, - enable GENERIC_HARDIRQS_NO__DO_IRQ. - simplify plat_irq_dispatch - merge au1xxx_irqmap into irq.c file, the only place where its contents are referenced. - board_init_irq() is now mandatory for every board; use it to register the remaining (gpio-based) interrupt sources; update all boards accordingly. Run-tested on Db1200 and other Au1200 based platforms. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle delete mode 100644 arch/mips/alchemy/common/au1xxx_irqmap.c commit 7179380ee9bdeb5fa2ff07581f512fe0f5382e5b Author: Manuel Lauss Date: Sun Dec 21 09:26:16 2008 +0100 MIPS: Alchemy: move commandline mangling out of common code Not every alchemy-based board might want these options forced on it, and most of this stuff seems to be intended for devboard code anyway. Remove commandline mangling code out of common chip code and instead add relevant sections to all in-tree boards to not change existing behaviour. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 23ba25d56606eec6fabc37c1efcbd48837dc9adc Author: Manuel Lauss Date: Sun Dec 21 09:26:15 2008 +0100 MIPS: Alchemy: devboards: consolidate files Share some code and merge small files: - Extract the prom init code from all devboard files (they only differ in memory configuration). - Merge the irq configuration into board setup code. - Merge smaller files into board setup code. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle delete mode 100644 arch/mips/alchemy/devboards/db1x00/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1000/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1000/irqmap.c delete mode 100644 arch/mips/alchemy/devboards/pb1100/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1100/irqmap.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1500/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1500/irqmap.c delete mode 100644 arch/mips/alchemy/devboards/pb1550/init.c delete mode 100644 arch/mips/alchemy/devboards/pb1550/irqmap.c create mode 100644 arch/mips/alchemy/devboards/prom.c commit 58e75e86cf9af1130b3c628d924e6df0bc72832f Author: Manuel Lauss Date: Sun Dec 21 09:26:14 2008 +0100 MIPS: Alchemy: Move development board code to common subdirectory This should ease sharing of common devboard code. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit a86c7f72454c4e855d5d6c80ed9f7f2ac55b001a Author: David Daney Date: Thu Dec 11 15:33:38 2008 -0800 MIPS: Add Cavium OCTEON to arch/mips/Kconfig Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 551d9304de60229080b5bf97230728c1c1bc8260 Author: David Daney Date: Thu Dec 11 15:33:37 2008 -0800 MIPS: Add defconfig for Cavium OCTEON. Signed-off-by: David Daney Signed-off-by: Tomaso Paoletti Signed-off-by: Ralf Baechle commit 843aef4930b9953c9ca624a990b201440304b56f Author: David Daney Date: Thu Dec 11 15:33:36 2008 -0800 MIPS: Adjust the dma-common.c platform hooks. We add a dev parameter to plat_unmap_dma_mem(), and hooks for plat_dma_supported() and plat_extra_sync_for_device() which should be nop changes for all existing targets. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit ec454d8c4fee3b2feb87e594d806c0987c5dd538 Author: David Daney Date: Thu Dec 11 15:33:35 2008 -0800 MIPS: Add Cavium OCTEON slot into proper tlb category. Expand the case statement for build_tlb_write_entry so that it does the right thing on Cavium CPU variants. Signed-off-by: Tomaso Paoletti Signed-off-by: Paul Gortmaker Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 126336f065e5d80bd2f4c3199df8a573eb0abcf7 Author: David Daney Date: Thu Dec 11 15:33:34 2008 -0800 MIPS: Compute branch returns for Cavium OCTEON specific branch instructions. For Cavium OCTEON, compute the return epc value for OCTEON specific branch instructions. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 2a219b0eaa7bb9f1a7dae4e8ac5b1bf68adab289 Author: David Daney Date: Thu Dec 11 15:33:33 2008 -0800 MIPS: Cavium OCTEON multiplier state preservation. For OCTEON, implement a save and restore of the multiplier state across context switches. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit ddcdb1b4a46915b70dce3af3a78582b3ca79cf76 Author: David Daney Date: Thu Dec 11 15:33:32 2008 -0800 MIPS: Add SMP_ICACHE_FLUSH for the Cavium CPU family. Signed-off-by: Tomaso Paoletti Signed-off-by: Paul Gortmaker Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit babed555695fad25820fb5fb0b5068c56e375900 Author: David Daney Date: Thu Dec 11 15:33:31 2008 -0800 MIPS: Add Cavium OCTEON specific registers to ptrace.h and asm-offsets.c Signed-off-by: David Daney Signed-off-by: Tomaso Paoletti Signed-off-by: Ralf Baechle commit b5e00af81f298f4ba2e41325042a7ce1ec022b1d Author: David Daney Date: Thu Dec 11 15:33:30 2008 -0800 MIPS: Add Cavium OCTEON cop2/cvmseg state entries to processor.h. Add in the cop2 and cvmseg state info to the known proc reg data for Cavium so that it can be tracked, saved, restored. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 8faca49a6731299c32b333fd6535db8d21557ce3 Author: David Daney Date: Thu Dec 11 15:33:29 2008 -0800 MIPS: Modify core io.h macros to account for the Octeon Errata Core-301. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 7e69deb83c9fffe75e8ea17fb40a63375e56ac9f Author: David Daney Date: Thu Dec 11 15:33:28 2008 -0800 MIPS: Hook up Cavium OCTEON in arch/mips. Take all the OCTEON specific files that were added, and hook them into the build system for the arch/mips. For versions of GCC that lack OCTEON support, override gas target architecture. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 47d979eca33f8df49bfead2d5efa23a70b413882 Author: David Daney Date: Thu Dec 11 15:33:27 2008 -0800 MIPS: Hook Cavium OCTEON cache init into cache.c Follow precedent of other boards, and hook-up the CPU specific cache init. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 0dd4781bca56871434507ed35d5bb8ef92077907 Author: David Daney Date: Thu Dec 11 15:33:26 2008 -0800 MIPS: Add Cavium OCTEON processor constants and CPU probe. Add OCTEON constants to asm/cpu.h and asm/module.h. Add probe function for Cavium OCTEON CPUs and hook it up. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 25c3000300163e2ebf68d94425088de35ead3d76 Author: David Daney Date: Thu Dec 11 15:33:25 2008 -0800 MIPS: Override assembler target architecture for octeon. Gas from binutils 2.19 fails to compile some cop1 instructions with -march=octeon. Since the cop1 instructions are present in mips1, use that arch instead. This will be fixed in binutils 2.20. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit ed918c2daf9ef4c3b52f75736c3a652e5160c8ad Author: David Daney Date: Thu Dec 11 15:33:24 2008 -0800 MIPS: Add Cavium OCTEON specific register definitions to mipsregs.h Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit f9bb4cf37ad3f7dec63abc5db688dd1e9df0056c Author: David Daney Date: Thu Dec 11 15:33:23 2008 -0800 MIPS: For Cavium OCTEON set hwrena and lazily restore CP2 state. If on Cavium, be aware of cop2 and hwrena during do_cpu(). Signed-off-by: Tomaso Paoletti Signed-off-by: Paul Gortmaker Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit bd6d85c21a5adf24567fdb235aa8e7c8c95d5847 Author: David Daney Date: Thu Dec 11 15:33:22 2008 -0800 MIPS: For Cavium OCTEON handle hazards as per the R10000 handling. For Cavium CPU, we treat the same as R10000, in that all hazards are dealt with in hardware. Signed-off-by: Tomaso Paoletti Signed-off-by: Paul Gortmaker Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 5b3b16880f404ca54126210ca86141cceeafc0cf Author: David Daney Date: Thu Jan 8 16:46:40 2009 -0800 MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon. These are the rest of the new files needed to add OCTEON processor support to the Linux kernel. Other than Makefile and Kconfig which should be obvious, we have: csrc-octeon.c -- Clock source driver for OCTEON. dma-octeon.c -- Helper functions for mapping DMA memory. flash_setup.c -- Register on-board flash with the MTD subsystem. octeon-irq.c -- OCTEON interrupt controller managment. octeon-memcpy.S -- Optimized memcpy() implementation. serial.c -- Register 8250 platform driver and early console. setup.c -- Early architecture initialization. smp.c -- OCTEON SMP support. octeon_switch.S -- Scheduler context switch for OCTEON. c-octeon.c -- OCTEON cache controller support. cex-oct.S -- OCTEON cache exception handler. asm/mach-cavium-octeon/*.h -- Architecture include files. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle create mode 100644 arch/mips/cavium-octeon/Kconfig create mode 100644 arch/mips/cavium-octeon/Makefile create mode 100644 arch/mips/cavium-octeon/csrc-octeon.c create mode 100644 arch/mips/cavium-octeon/dma-octeon.c create mode 100644 arch/mips/cavium-octeon/flash_setup.c create mode 100644 arch/mips/cavium-octeon/octeon-irq.c create mode 100644 arch/mips/cavium-octeon/octeon-memcpy.S create mode 100644 arch/mips/cavium-octeon/serial.c create mode 100644 arch/mips/cavium-octeon/setup.c create mode 100644 arch/mips/cavium-octeon/smp.c create mode 100644 arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/irq.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h create mode 100644 arch/mips/include/asm/mach-cavium-octeon/war.h create mode 100644 arch/mips/include/asm/octeon/octeon.h create mode 100644 arch/mips/kernel/octeon_switch.S create mode 100644 arch/mips/mm/c-octeon.c create mode 100644 arch/mips/mm/cex-oct.S commit 58f07778ce9d32c22cecb1d8ef348001f0e705c9 Author: David Daney Date: Tue Dec 23 15:22:14 2008 -0800 MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon/executive and asm/octeon. These files are used to coordinate resource sharing between all of the programs running on the OCTEON SOC. The OCTEON processor has many CPU cores (current parts have up to 16, but more are possible). It also has a variety of on-chip hardware blocks for things like network acceleration, encryption and RAID. One typical configuration is to run Linux on several of the CPU cores, and other dedicated applications on the other cores. Resource allocation between the various programs running on the system (Linux kernel and other dedicated applications) needs to be coordinated. The code we use to do this we call the 'executive'. All of this resource allocation and sharing code is gathered together in the executive directory. Included in the patch set are the following files: cvmx-bootmem.c and cvmx-sysinfo.c -- Coordinate memory allocation. All memory used by the Linux kernel is obtained here at boot time. cvmx-l2c.c -- Coordinates operations on the shared level 2 cache. octeon-model.c -- Probes chip capabilities and version. The corresponding headers are in asm/octeon. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle create mode 100644 arch/mips/cavium-octeon/executive/Makefile create mode 100644 arch/mips/cavium-octeon/executive/cvmx-bootmem.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-l2c.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-sysinfo.c create mode 100644 arch/mips/cavium-octeon/executive/octeon-model.c create mode 100644 arch/mips/include/asm/octeon/cvmx-asm.h create mode 100644 arch/mips/include/asm/octeon/cvmx-bootinfo.h create mode 100644 arch/mips/include/asm/octeon/cvmx-bootmem.h create mode 100644 arch/mips/include/asm/octeon/cvmx-l2c.h create mode 100644 arch/mips/include/asm/octeon/cvmx-packet.h create mode 100644 arch/mips/include/asm/octeon/cvmx-spinlock.h create mode 100644 arch/mips/include/asm/octeon/cvmx-sysinfo.h create mode 100644 arch/mips/include/asm/octeon/cvmx.h create mode 100644 arch/mips/include/asm/octeon/octeon-feature.h create mode 100644 arch/mips/include/asm/octeon/octeon-model.h commit 54293ec3074a5fe61abd297502f68b2529a3dab3 Author: David Daney Date: Thu Dec 11 15:33:19 2008 -0800 MIPS: Add Cavium OCTEON processor CSR definitions Here we define the addresses and bit-fields of the Configuration and Status Registers (CSRs) for some of the hardware functional units on the OCTEON SOC. Definitions are needed for: CIU -- Central Interrupt Unit. GPIO -- General Purpose Input Output. IOB -- Input / Output {Busing,Bridge}. IPD -- Input Packet Data unit. L2C -- Level-2 Cache controller. L2D -- Level-2 Data cache. L2T -- Level-2 cache Tag. LED -- Light Emitting Diode controller. MIO -- Miscellaneous Input / Output. POW -- Packet Order / Work unit. Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 2bd2dd059ca7406a030bace8dccdb25f635578c1 Author: Julia Lawall Date: Tue Nov 25 14:12:32 2008 +0100 MIPS: Alchemy: Change strict_strtol to strict_strtoul Since memsize is unsigned, it would seem better to use strict_strtoul that strict_strtol. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @s2@ long e; position p; @@ strict_strtol@p(...,&e) @@ position p != s2.p; type T; T e; @@ - strict_strtol@p + strict_strtoul (...,&e) // Signed-off-by: Julia Lawall Signed-off-by: Ralf Baechle commit 797c3f322454f5994e88b0e0bfc34cd4ad521d38 Author: Anirban Sinha Date: Thu Nov 13 11:50:12 2008 -0800 MIPS: 64-bit: Use generic 32-bit ptrace compat code. Signed-off-by: Anirban Sinha Signed-off-by: Ralf Baechle commit 3bc53427e4f323d4f33f70477fc32c1c2ae7fb5d Author: Timur Tabi Date: Sun Jan 11 00:25:21 2009 -0800 ucc_geth: use correct UCCE macros The UCC Event Register (UCCE) already has unambigous macro definitions in qe.h, so we should not be defining our own in the UCC Ethernet driver. Removed unused local variable 'dev' from ucc_geth_poll(), which fixes a warning caused by commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused netdev arg from some NAPI interfaces."). Replaced in_be/out_be pairs with setbits32 or clrbits32, where applicable. Signed-off-by: Timur Tabi Signed-off-by: David S. Miller commit 649274d993212e7c23c0cb734572c2311c200872 Author: Dan Williams Date: Sun Jan 11 00:20:39 2009 -0800 net_dma: acquire/release dma channels on ifup/ifdown The recent dmaengine rework removed the capability to remove dma device driver modules while net_dma is active. Rather than notify dmaengine-clients that channels are trying to be removed, we now rely on clients to notify dmaengine when they no longer have a need for channels. Teach net_dma to release channels by taking dmaengine references at netdevice open and dropping references at netdevice close. Acked-by: Maciej Sosnowski Signed-off-by: Dan Williams Signed-off-by: David S. Miller commit 47fd23fe8efeea3af4593a8424419df48724eb25 Author: Roland Dreier Date: Sun Jan 11 00:19:36 2009 -0800 cxgb3: Keep LRO off if disabled when interface is down I have a system with a Chelsio adapter (driven by cxgb3) whose ports are part of a Linux bridge. Recently I updated the kernel and discovered that things stopped working because cxgb3 was doing LRO on packets that were passed into the bridge code for forwarding. (Incidentally, this problem manifested itself in a strange way that made debugging a bit interesting -- for some reason, the skb_warn_if_lro() check in bridge didn't trigger and these LROed packets were forwarded out a forcedeth interface, and caused the forcedeth transmit path to get stuck) This is because cxgb3 has no way of keeping state for the LRO flag until the interface is brought up, so if the bridging code disables LRO while the interface is down, then cxgb3_up() will just reenable LRO, and on my Debian system at least, the init scripts add interfaces to a bridge before bringing the interfaces up. Fix this by keeping track of each interface's LRO state in cxgb3 so that when bridge disables LRO, it stays disabled in cxgb3_up() when the interface is brought up. I did this by changing the rx_csum_offload flag into a pair of bit flags; the effect of this on the rx_eth() fast path is miniscule enough that it should be fine (eg on x86, a cmpb instruction becomes a testb instruction). Signed-off-by: Roland Dreier Signed-off-by: David S. Miller commit 2a7e637de51ded7b0b56b927f45915eadb6734bb Author: Ben Hutchings Date: Sun Jan 11 00:18:13 2009 -0800 sfc: SFT9001: Fix condition for LNPGA power-off Only the SFX7101 requires software power control. This was incorrectly being applied to the SFT9001 rev A as well. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4dbc242ed3c94ff1cc10640d2119279ba0be943e Author: Gerrit Renker Date: Sun Jan 11 00:17:22 2009 -0800 dccp ccid-3: Fix RFC reference Thanks to Wei and Arnaldo for pointing out the correct new reference for CCID-3. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 08168f7164fed494852361ab900358cd7a6b95d6 Author: Steve Glendinning Date: Sun Jan 11 00:14:52 2009 -0800 smsc911x: register irq with device name, not driver name This change lets "cat /proc/interrupts" show the name of the ethernet device (e.g. eth0) rather than the driver name (smsc911x). Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 702403af28ef647b090b49bb61abebb45150ce7f Author: Steve Glendinning Date: Sun Jan 11 00:14:27 2009 -0800 smsc911x: fix smsc911x_reg_read compiler warning if this code path is ever hit, the platform_data struct isn't properly configured with a bus width flag so the device won't work (hence the BUG()). This patch adds a dummy return statement to eliminate this compiler warning: drivers/net/smsc911x.c: In function 'smsc911x_reg_read': drivers/net/smsc911x.c:148: warning: control reaches end of non-void function Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit eb10a781824ca63c4e484c4642a19b3370980792 Author: Ayaz Abdulla Date: Sun Jan 11 00:09:04 2009 -0800 forcedeth: napi schedule lock fix This patch fixes a potential race condition between scheduling napi and completing napi poll. The call to netif_rx_schedule should be under protection of the lock (as is the completion), otherwise, interrupts could be masked off. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 1b6725dea766b7437d885661140b6e0340d47613 Author: Leonardo Potenza Date: Fri Jan 9 23:06:28 2009 -0800 net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c Removed the __exit annotation of tfrc_lib_exit(), in order to suppress the following section mismatch messages: WARNING: net/dccp/dccp.o(.text+0xd9): Section mismatch in reference from the function ccid_cleanup_builtins() to the function .exit.text:tfrc_lib_exit() The function ccid_cleanup_builtins() references a function in an exit section. Often the function tfrc_lib_exit() has valid usage outside the exit section and the fix is to remove the __exit annotation of tfrc_lib_exit. WARNING: net/dccp/dccp.o(.init.text+0x48): Section mismatch in reference from the function ccid_initialize_builtins() to the function .exit.text:tfrc_lib_exit() The function __init ccid_initialize_builtins() references a function __exit tfrc_lib_exit(). This is often seen when error handling in the init function uses functionality in the exit path. The fix is often to remove the __exit annotation of tfrc_lib_exit() so it may be used outside an exit section. Signed-off-by: Leonardo Potenza Acked-by: Arnaldo Carvalho de Melo Acked-by: Gerrit Renker Signed-off-by: David S. Miller commit a7ee2f73f3ce90d73736de1cf432339c35a3faf2 Author: Ayaz Abdulla Date: Fri Jan 9 22:40:06 2009 -0800 forcedeth: remove mgmt unit for mcp79 chipset This patch removes the feature flag for mgmt unit as it is not used for this chipset. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 683d46a9798c382220ef282b37f8210b5276cb3a Author: Ron Mercer Date: Fri Jan 9 11:31:53 2009 +0000 qlge: Remove dynamic alloc of rx ring control blocks. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 0857e9d73feea0125280dcd431cee84f6cb3b4e2 Author: Ron Mercer Date: Fri Jan 9 11:31:52 2009 +0000 qlge: Fix schedule while atomic issue. There is no need to sleep while waiting for the hardware semaphore to become available. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 697cdc46801d1106a25d27a8225cb925f0a7f5aa Author: Ron Mercer Date: Fri Jan 9 11:31:51 2009 +0000 qlge: Remove support for device ID 8000. Support for dev id 8000 is pushed out until 2.6.30. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 97345524392dcbe0157ce2a9d9a589e2022b1c15 Author: Ron Mercer Date: Fri Jan 9 11:31:50 2009 +0000 qlge: Get rid of split addresses in hardware control blocks. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit ba7cd3ba97f81564be3e4a4ee8ee17726aa853d7 Author: Ron Mercer Date: Fri Jan 9 11:31:49 2009 +0000 qlge: Get rid of volatile usage for shadow register. Putting back ql_read_sh_reg() function and using rmb() instead of volatile. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit f1405d32e392f2f5f80f4687fe186305de300bf6 Author: Ayaz Abdulla Date: Fri Jan 9 11:03:54 2009 +0000 forcedeth: version bump and copyright This patch bumps up the version number and adds current year to copyright. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 001eb84bbf7205f8cc541a75364a6a0892b5d0a2 Author: Ayaz Abdulla Date: Fri Jan 9 11:03:44 2009 +0000 forcedeth: xmit lock fix This patch fixes a potential race condition between xmit thread and xmit completion thread. The calculation of empty tx descriptors is not performed under the lock. This could cause it to set the stop flag while the completion thread finishes all tx's. This will result in the tx queue in stopped state and no one to wake it up. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 52255bbe3551e481b7af423406ca229a13990b1c Author: Stephen Hemminger Date: Fri Jan 9 10:45:37 2009 +0000 netdev: missing validate_address hooks Some devices were converted incorrectly and are missing the validate address hooks. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe96aaa14f553f0eb7af0e3502563a5400c65257 Author: Stephen Hemminger Date: Fri Jan 9 11:13:14 2009 +0000 netdev: add missing set_mac_address hook Many drivers lost the ability to set ethernet address accidently during the net_device_ops conversion. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0faac9f75fa4260d67fed5a67bb2f16dbe2e93c8 Author: Clifford Wolf Date: Fri Jan 9 10:23:11 2009 +0000 netdev: gianfar: add MII ioctl handler This is the same kind of wrapper that can also be found in many other network device drivers. Tested with a freescale MPC8349E host CPU: Toggled the interface LEDs on a DP83865 PHY. Signed-off-by: Clifford Wolf Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 43baa5bb26298e8e268056c58900098ce8454548 Author: Julia Lawall Date: Fri Jan 9 10:23:10 2009 +0000 drivers/net/wireless/libertas: move a dereference below a NULL test In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. I have also taken advantage of the availability of the value of priv->dev in the subsequent calls to netif_stop_queue and netif_carrier_off. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Acked-by: Dan Williams Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0397a2648434a65d73564216c4f96945c192ad4a Author: Julia Lawall Date: Fri Jan 9 10:23:09 2009 +0000 drivers/net/hamradio/6pack.c: move a dereference below a NULL test In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit debc251b602fa4795c00c0aa82caa28cebc619ee Author: Julia Lawall Date: Fri Jan 9 10:22:53 2009 +0000 drivers/isdn/hardware/mISDN: move a dereference below a NULL test In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f3d8b2e467da7a9237a45248ff03b56b6a7c3df7 Author: Julia Lawall Date: Fri Jan 9 10:22:22 2009 +0000 net/bridge/netfilter: move a dereference below a NULL test In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6c614a50206ee56c21b34cc02d0bd40e756db87e Author: Julia Lawall Date: Fri Jan 9 10:22:21 2009 +0000 net/tipc/bcast.h: use ARRAY_SIZE ARRAY_SIZE is more concise to use when the size of an array is divided by the size of its type or the size of its first element. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @i@ @@ #include @depends on i using "paren.iso"@ type T; T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2a4d71d69f97cef48da969ab917b55e0193ed9ec Author: Inaky Perez-Gonzalez Date: Fri Jan 9 07:34:00 2009 +0000 wimax: fix typo in kernel-doc for debugfs_dentry in struct wimax_dev The kernel-doc was referring to member @debufs_dentry instead of @debugfs_dentry. Reported by Randy Dunlap http://marc.info/?l=linux-netdev&m=123147942302885&w=2 As well, escape the colon in the field's text description, as it is causing the generated text to be erraticly broken up (with paragraphs moved down). Could not find a reason why it is happening so, even when other field descriptions use colons and work as expected. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit c17931c52ec6b1af710185986e10c344039edeb7 Author: Steffen Klassert Date: Fri Jan 9 03:53:17 2009 +0000 3c59x: Use device_set_wakeup_enable Since dev->power.should_wakeup bit is used by the PCI core to decide whether the device should wake up the system from sleep states, set this bit by calling device_set_wakeup_enable(). This restores proper WOL for the 3c59x driver. Reported-and-tested-by: Graeme Wilford Reported-by: Gunnar Degnbol Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit 3d58cefd823e47209ffcac9cada0a618771da1a4 Author: Frank Blaschka Date: Fri Jan 9 03:44:00 2009 +0000 qeth: fix usage of netdev_ops Have separate netdev_ops for OSA and HiperSocket/TR. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit c224969e636ea027e7ce474b48e84922e62ca1d6 Author: Jesper Dangaard Brouer Date: Fri Jan 9 03:14:47 2009 +0000 qlge: Naming interrupt vectors Name interrupt vectors according to the new naming standard, by Robert Olsson and DaveM. The qlge driver were very close to the new standard, thus the change is kind of trivial. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 4ca857958c129781b46870ec1d2d13c50aafb8c5 Author: Felix Fietkau Date: Fri Jan 9 02:39:57 2009 +0000 b44: fix misalignment and wasted space in rx handling Broadcom 4400 puts a header of configurable size (apparently needs to be at least 28 bytes) in front of received packets. When handling this, the previous code accidentally added the offset 30 *twice* for the software and once for the hardware, thereby cancelling out the IP alignment effect of the 30 byte padding and wasting an additional 30 bytes of memory per packet. This patch fixes this problem and improves routing throughput by about 30% on MIPS, where unaligned access is expensive. Signed-off-by: Felix Fietkau Signed-off-by: David S. Miller commit 9498c05820580afbf03a317b0b5bdb0ca0e27e40 Author: Herbert Xu Date: Thu Jan 8 21:27:06 2009 +0000 ipcomp: Remove spurious truesize increase When I made ipcomp use frags, I forgot to take out the original truesize update that was added for pskb_expand_head. As we no longer expand the head of skb, that update should have been removed. This bug is not related to the truesize warnings since we only made it bigger than what it should've been. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit eefacf3b4f8a688aeaddd2f7c46ac5ffceb92472 Author: David Graham Date: Thu Jan 8 16:03:29 2009 +0000 e1000e: Add process name to WARN message when detecting Mutex contention Adds process name of the current mutex holder to the WARN message output when the e1000e driver attempts to acquire the nvm_mutex and finds that it is already being held. With this patch the WARN message indicates both the process name of the current mutex holder and the process name of the attempted acquisition, which together will help to identify the contending codepaths. Signed-off-by: David Graham Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e56e356b21c285663712dc39aa9e4303072cbaba Author: Florian Fainelli Date: Thu Jan 8 15:04:57 2009 +0000 r6040: bump release to 0.21 Bump version to 0.21 and release date to 09Jan2009. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 68334115eecc2502426657a1449dd04b3572ae0d Author: Florian Fainelli Date: Thu Jan 8 15:04:50 2009 +0000 r6040: no longer mark r6040 as being experimental We do not depend on EXPERIMENTAL and the driver is not experimental, so remove this warning. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 9f1136182f732f6e847fc43bd88b579739d5c211 Author: Florian Fainelli Date: Thu Jan 8 15:04:45 2009 +0000 r6040: generate random ethernet MAC address when not initialized This patch makes the ethernet driver assign a random ethernet MAC address when the bootloader does not set it. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 58854c6b411e9e9f46b39bd7092022f639c41904 Author: Florian Fainelli Date: Fri Jan 9 23:19:26 2009 -0800 r6040: fix ifconfig down and freeing of tx/rx descriptors This patch fixes warnings and such traces that appear when doing an ifconfig down on the interface: WARNING: at arch/x86/kernel/pci-dma.c:376 dma_free_coherent+0x40/0x7d() Modules linked in: Signed-off-by: Joe Chou Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 216c32d4407ea6951d6832773fdb3de058e12c62 Author: Alexander Beregalov Date: Thu Jan 8 16:42:08 2009 -0800 irda: fix incomplete conversation to internal stats Fix for commit af0490810c (irda: convert to internal stats) Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit fc4dbea733119b37d36d0006b8be778db2601946 Author: David S. Miller Date: Sat Jan 10 23:44:45 2009 -0800 sparc: Fix asm/signal.h for 32-bit. Fix a 32-bit sparc regression reported by Robert Reif. _NSIG_BPW needs to be 32 for 32-bit and 64 for 64-bit Tested-by: Robert Reif Signed-off-by: David S. Miller commit 03080e5cbe0222744173d3e726f6ba5d13b7f04e Author: Harvey Harrison Date: Sat Jan 10 21:45:42 2009 -0800 RDMA/nes: Fix for NIPQUAD removal Commit 63779436 ("drivers: replace NIPQUAD()") accidentally replaced some HIPQUAD()s, causing IP addresses to be printed in reverse order. Add temporary local vars until the byteswapping can be pushed further up the stack. Signed-off-by: Harvey Harrison Signed-off-by: Roland Dreier commit 93423b8665f43a0c7a006a1d5be048b99db56d32 Author: Ingo Molnar Date: Sun Jan 11 05:15:21 2009 +0100 smp_call_function_single(): be slightly less stupid, fix Impact: build fix on Alpha kernel/up.c: In function 'smp_call_function_single': kernel/up.c:12: error: 'cpuid' undeclared (first use in this function) kernel/up.c:12: error: (Each undeclared identifier is reported only once kernel/up.c:12: error: for each function it appears in.) The typo didnt show up on x86 because 'cpuid' happens to be a function address as well ... Signed-off-by: Ingo Molnar commit 53ce3d9564908794ae7dd32969089b57df5fc098 Author: Andrew Morton Date: Fri Jan 9 12:27:08 2009 -0800 smp_call_function_single(): be slightly less stupid If you do smp_call_function_single(expression-with-side-effects, ...) then expression-with-side-effects never gets evaluated on UP builds. As always, implementing it in C is the correct thing to do. While we're there, uninline it for size and possible header dependency reasons. And create a new kernel/up.c, as a place in which to put uniprocessor-specific code and storage. It should mirror kernel/smp.c. Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit abede81c4fb2e3b85d8760f25e3da39d2c69a134 Merge: c9d557c... c597650... Author: Ingo Molnar Date: Sun Jan 11 03:41:39 2009 +0100 Merge commit 'v2.6.29-rc1' into core/urgent commit f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 Merge: 79f3b3c... c597650... Author: Ingo Molnar Date: Sun Jan 11 03:03:30 2009 +0100 Merge commit 'v2.6.29-rc1' into x86/urgent commit 805194c35b91999b139e4d6b6145f4f84fd4c814 Author: Li Zefan Date: Sat Jan 10 15:43:15 2009 +0800 sched: partly revert "sched debug: remove NULL checking in print_cfs_rt_rq()" Impact: avoid accessing NULL tg.css->cgroup In commit 0a0db8f5c9d4bbb9bbfcc2b6cb6bce2d0ef4d73d, I removed checking NULL tg.css->cgroup, but I realized I was wrong when I found reading /proc/sched_debug can race with cgroup_create(). Signed-off-by: Li Zefan Signed-off-by: Ingo Molnar commit b29c06ae96acc47e866f29d19075707f91df69c8 Author: Samuel Ortiz Date: Sun Jan 11 01:21:48 2009 +0100 mfd: Fix twl4030-core build Fixes: drivers/mfd/twl4030-core.c:657: error: implicit declaration of function 'cpu_is_omap2430' Not the nicest fix, but this should be improved by a better OMAP clock API implementation. Signed-off-by: Samuel Ortiz commit 98325f8f8e950818c306cbc224897a1dda471945 Author: Ben Dooks Date: Sat Jan 10 16:59:53 2009 +0100 mfd: Ensure sm501 GPIO pin mode is GPIO when configured When setting an GPIO to either input or output, we should ensure that the pin configuration elsewhere in the chip is set to GPIO in-case the initial setup has not been done correctly. Signed-off-by: Ben Dooks Signed-off-by: Samuel Ortiz commit d1fdb4f6fbb155af88363bc949a35daa11872d9f Author: David Brownell Date: Fri Jan 9 02:02:42 2009 +0100 mfd: dm355 evm MMC/SD card detection Support card detect and writeprotect switches on DM355 EVM. Signed-off-by: David Brownell Signed-off-by: Kevin Hilman Signed-off-by: Samuel Ortiz commit 5ec271e745350c7df6a6ebca24b43cb7a10bfa4a Author: Balaji Rao Date: Fri Jan 9 01:51:01 2009 +0100 regulator: PCF50633 pmic driver Changes from V1: - Removed support for suspend_enable & suspend_disable functions. Signed-off-by: Balaji Rao Cc: Andy Green Cc: Liam Girdwood Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 1851b06ac40c57fe4efe7ddefc3c04dab4f99e67 Author: Balaji Rao Date: Fri Jan 9 01:50:58 2009 +0100 input: PCF50633 input driver Signed-off-by: Balaji Rao Cc: Andy Green Cc: Dmitry Torokhov Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit f5714dc97d63cc0dd1219bd0eb2e1f8df1e4347a Author: Balaji Rao Date: Fri Jan 9 01:50:55 2009 +0100 power_supply: PCF50633 battery charger driver Signed-off-by: Balaji Rao Cc: Andy Green Cc: David Woodhouse Acked-by: Anton Vorontsov Signed-off-by: Samuel Ortiz commit eae854b22d25a6d08524c0783a2c772e67121840 Author: Balaji Rao Date: Fri Jan 9 01:50:51 2009 +0100 rtc: PCF50633 rtc driver Signed-off-by: Balaji Rao Cc: Andy Green Acked-by: Alessandro Zummo Cc: Paul Gortmaker Cc: rtc-linux@googlegroups.com Signed-off-by: Samuel Ortiz commit 6a3d119b4ce29cf32bfe91eb61d46e9dbd8ce38a Author: Balaji Rao Date: Fri Jan 9 01:49:37 2009 +0100 mfd: PCF50633 gpio support What the PCF05633 calls as a 'GPIO' is much more than the GPIO in the linux sense and there are only 4 of them - which means, the gpiolib is not used here. Signed-off-by: Balaji Rao Cc: Andy Green Signed-off-by: Samuel Ortiz commit 08c3e06a5eb27d43b712adef18379f8464425e71 Author: Balaji Rao Date: Fri Jan 9 01:49:26 2009 +0100 mfd: PCF50633 adc driver This patch adds basic support for the PCF50633 ADC. The subtractive mode is not supported yet. Since we don't have adc subsystem, it currently lives in drivers/mfd. Signed-off-by: Balaji Rao Cc: Andy Green Acked-by: Jonathan Cameron Signed-off-by: Samuel Ortiz commit f52046b14b1e1a8a02ae48d0c69d39c5e204644f Author: Balaji Rao Date: Fri Jan 9 01:49:01 2009 +0100 mfd: PCF50633 core driver This patch implements the core of the PCF50633 driver. This core driver has generic register read/write functions and does interrupt management for its sub devices. Signed-off-by: Balaji Rao Cc: Andy Green Signed-off-by: Samuel Ortiz commit 62ea9ceb17a74bc7544211bfeecf4170c554ac4f Author: Rusty Russell Date: Sun Jan 11 01:04:16 2009 +0100 cpumask: fix CONFIG_NUMA=y sched.c Impact: fix panic on ia64 with NR_CPUS=1024 struct sched_domain is now a dangling structure; where we really want static ones, we need to use static_sched_domain. (As the FIXME in this file says, cpumask_var_t would be better, but this code is hairy enough without trying to add initialization code to the right places). Reported-by: Mike Travis Signed-off-by: Rusty Russell Signed-off-by: Ingo Molnar commit ff82c587a9a4cb8796e7e04377155deba15ae18b Author: John Linn Date: Fri Jan 9 16:01:53 2009 -0700 Xilinx: SPI: updated driver for device tree The driver was updated to use the device tree rather than the platform data. Signed-off-by: John Linn commit 2526c151c31358aec66b63921dd712bbec5ee0cb Author: Jon Smirl Date: Fri Jan 9 15:49:06 2009 -0700 drivers/of: Add the of_find_i2c_device_by_node function. The of_find_i2c_device_by_node function allows you to follow a reference in the device tree to an i2c device node and then locate the linux device instantiated by the device tree. Example use: an I2S bus driver finding the i2c_device instance for a codec described by a device tree node. This was waiting for Anton's i2c patches that were just added. Signed-off-by: Jon Smirl Signed-off-by: Grant Likely commit f5020384e4fa8ab9397aa6fa176e61e9bf7947f7 Author: Yuri Tikhonov Date: Fri Jan 9 15:49:06 2009 -0700 powerpc/xsysace: add compatible string for non-ipcore instance Add "xlnx,sysace" compatible string to the of_platform binding table. Platforms which have the SysACE chip on board (e.g. Katmai) instead of via a Xilinx generated IP core will use this value in their device tree. Signed-off-by: Yuri Tikhonov Signed-off-by: Grant Likely commit ddd527d56a0e635abdc7ffeb688cdde7593ad2d3 Author: Wolfram Sang Date: Fri Jan 9 15:49:05 2009 -0700 powerpc/mpc52xx: remove dead code from GPIO driver Eliminate duplicate return statements Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit d30239a0ef2000cfae6c60f8e870da2d8dba4d22 Author: Grant Likely Date: Fri Jan 9 15:49:05 2009 -0700 powerpc/mpc52xx: Properly update irq_desc when set_type() is called. The MPC5200 PIC driver doesn't correctly update the .status field of the irq_desc structure when the set_type hook is called. This patch adds the required code. Also cleans up the external IRQ typename field to be something easier to read (very minor). Signed-off-by: Grant Likely commit 23faf63123e306b4a134f6d6c501813f6c8599dc Author: roel kluin Date: Fri Jan 9 15:49:04 2009 -0700 powerpc/mpc5121: fix NULL test in mpc5121_clk_get utility function. strcmp on NULL results in a segmentation fault, also, remove the second, redundant test on dev Signed-off-by: Roel Kluin Signed-off-by: Grant Likely commit a50df398cddf6b757bdbf30f5f0875982ef5c660 Author: Yossi Etigin Date: Fri Jan 9 14:05:11 2009 -0800 IPoIB: Fix loss of connectivity after bonding failover on both sides Fix bonding failover in the case both peers failover and the gratuitous ARP is lost. In that case, the sender side will create an ipoib_neigh and issue a path request with the old GID first. When skb->dst->neighbour->ha changes due to ARP refresh, this ipoib_neigh will not be added to the path->list of the path of the new GID, because the ipoib_neigh already exists. It will not have an AH either, because of sender-side failover. Therefore, it will not get an AH when the path is resolved. The solution here is to compare GIDs in ipoib_start_xmit() even if neigh->ah is invalid. Comparing with an uninitialized value of neigh->dgid should be fine, since a spurious match is harmless (and astronomically unlikely too). Signed-off-by: Moni Shoua Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit 22e7ef9c089305111661b01e425cd0b974231e2e Author: Roland Dreier Date: Fri Jan 9 13:22:29 2009 -0800 IB/mlx4: Don't register IB device for adapters with no IB ports If the mlx4_ib driver finds an adapter that has only ethernet ports, the current code will register an IB device with 0 ports. Nothing useful or sensible can be done with such a device, so just skip registering it. Signed-off-by: Roland Dreier commit 70cb92539cd1b8e1dec935a68fc154ea0db3a177 Author: Roland Dreier Date: Fri Jan 9 13:14:07 2009 -0800 mlx4_core: Fix warning from min() Recent cpumask changes changed num_possible_cpus() from returning an int to returning an unsigned int. This means that doing min(num_possible_cpus(), ) now produces a warning like drivers/net/mlx4/main.c: In function 'mlx4_enable_msi_x': drivers/net/mlx4/main.c:915: warning: comparison of distinct pointer types lacks a cast Fix this by using min_t(int, ...). Signed-off-by: Roland Dreier commit c6d1662b229410e64092fe3a9caed6535fb3dc65 Author: Peter Ujfalusi Date: Thu Jan 8 15:52:43 2009 +0200 ASoC: TWL4030: Module unloading fix Call the snd_soc_free_pcm and snd_soc_dapm_free when the codec driver is unloaded. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 5a9e02e94989323c2a7102e2fc80ee9102b19fa0 Author: Wu Fengguang Date: Fri Jan 9 16:45:24 2009 +0800 ALSA: hda - create hda_codec.control_mutex for kcontrol->private_value Fix the following lockdep warning by not reusing the hda_codec.spdif_mutex. ALSA sound/pci/hda/hda_codec.c:882: hda_codec_cleanup_stream: NID=0x2 ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.28-next-20090102 #33 ------------------------------------------------------- mplayer/3151 is trying to acquire lock: (&pcm->open_mutex){--..}, at: [] snd_pcm_release+0x43/0xd0 [snd_pcm] but task is already holding lock: (&mm->mmap_sem){----}, at: [] sys_munmap+0x42/0x80 which lock already depends on the new lock. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 16b2857589b77c486f6261fbd0a28107bb9c9953 Author: Takashi Iwai Date: Fri Jan 9 07:51:10 2009 +0100 ALSA: caiaq - Version 1.3.10 Increase the version number in module info to indicate the fixes. Signed-off-by: Takashi Iwai commit 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 Author: Lachlan McIlroy Date: Wed Dec 31 12:10:12 2008 +1100 [XFS] Update maintainers New maintainer contact and new tree location. Reviewed-by: Bill O`Donnell Signed-off-by: Lachlan McIlroy commit 0087167c9d5b1273e7e6bbe39a9ab13bdb9a39bb Author: Nick Piggin Date: Tue Jan 6 14:43:09 2009 +1100 [XFS] use scalable vmap API Implement XFS's large buffer support with the new vmap APIs. See the vmap rewrite (db64fe02) for some numbers. The biggest improvement that comes from using the new APIs is avoiding the global KVA allocation lock on every call. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 958f8c0e4fc311e23a40635a530c01aec366a6e8 Author: Nick Piggin Date: Tue Jan 6 14:40:44 2009 +1100 [XFS] remove old vmap cache XFS's vmap batching simply defers a number (up to 64) of vunmaps, and keeps track of them in a list. To purge the batch, it just goes through the list and calls vunamp on each one. This is pretty poor: a global TLB flush is generally still performed on each vunmap, with the most expensive parts of the operation being the broadcast IPIs and locking involved in the SMP callouts, and the locking involved in the vmap management -- none of these are avoided by just batching up the calls. I'm actually surprised it ever made much difference. (Now that the lazy vmap allocator is upstream, this description is not quite right, but the vunmap batching still doesn't seem to do much) Rip all this logic out of XFS completely. I will improve vmap performance and scalability directly in subsequent patch. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 058652a37dd9eac18d6b8c1a311137c679de9dae Author: Christoph Hellwig Date: Thu Jan 8 13:42:25 2009 -0500 [XFS] make xfs_ino_t an unsigned long long Currently xfs_ino_t is defined as a u64 which can either be an unsigned long long or on some 64 bit platforms and unsigned long. Just making it and unsigned long long mean's it's still always 64 bits wide, but we don't need to resort to cases to print it. Fixes a warning regression on 64 bit powerpc in current git. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Lachlan McIlroy commit 15440319767942a363f282d6585303d3d75088ba Author: Christoph Hellwig Date: Thu Jan 8 14:00:00 2009 -0500 [XFS] truncate readdir offsets to signed 32 bit values John Stanley reported EOVERFLOW errors in readdir from his self-build glibc. I traced this down to glibc enabling d_off overflow checks in one of the about five million different getdents implementations. In 2.6.28 Dave Woodhouse moved our readdir double buffering required for NFS4 readdirplus into nfsd and at that point we lost the capping of the directory offsets to 32 bit signed values. Johns glibc used getdents64 to even implement readdir for normal 32 bit offset dirents, and failed with EOVERFLOW only if this happens on the first dirent in a getdents call. I managed to come up with a testcase that uses raw getdents and does the EOVERFLOW check manually. We always hit it with our last entry due to the special end of directory marker. The patch below is a dumb version of just putting back the masking, to make sure we have the same behavior as in 2.6.27 and earlier. I will work on a better and cleaner fix for 2.6.30. Reported-by: John Stanley Tested-by: John Stanley Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Lachlan McIlroy commit e6edbd1c1cbef278d58cdd8b046599ba8ac90cfc Author: Christoph Hellwig Date: Thu Jan 8 13:42:23 2009 -0500 [XFS] fix compile of xfs_btree_readahead_lblock on m68k Change the left/right variables to the proper always 64bit xfs_dfsbo_t type because otherwise compilation fails for Geert on m68k without CONFIG_LBD: | fs/xfs/xfs_btree.c: In function 'xfs_btree_readahead_lblock': | fs/xfs/xfs_btree.c:736: warning: comparison is always true due to limited range of data type | fs/xfs/xfs_btree.c:741: warning: comparison is always true due to limited range of data type Reported-by: Geert Uytterhoeven Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Lachlan McIlroy commit fb82557f16f3700ae4961a4ce599bdaff6a10b1c Author: Eric Sandeen Date: Fri Jan 9 15:53:54 2009 +1100 [XFS] Remove macro-to-function indirections in the mask code Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit c9fb86a917640d66ba2e0613a12f3a76eda8a30f Author: Eric Sandeen Date: Thu Jan 1 16:40:11 2009 -0600 [XFS] Remove macro-to-function indirections in attr code Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 9800b550355e99c9bcaba7ec6540751dce0823d7 Author: Eric Sandeen Date: Thu Jan 1 16:40:10 2009 -0600 [XFS] Remove several unused typedefs. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit c9a98553d513dfc82cdce869970d5662c1f22c68 Author: Christoph Hellwig Date: Thu Jan 1 14:21:16 2009 -0500 [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations NFS clients or users of the handle ioctls can pass us arbitrary inode numbers through the exportfs interface. Make sure we use the XFS_IGET_BULKSTAT so that these don't cause shutdowns due to the corruption checks. Also translate the EINVAL we get back for invalid inode clusters into an ESTALE which is more appropinquate, and remove the useless check for a NULL inode on a successfull xfs_iget return. I have a testcase to reproduce this using the handle interface which I will submit to xfsqa. Reported-by: Mario Becroft Signed-off-by: Christoph Hellwig Reviewed-by: Eric Sandeen Signed-off-by: Lachlan McIlroy commit 222bfda032d01d99501257e01a79833094f689f6 Author: Julian Calaby Date: Thu Jan 8 16:59:01 2009 -0800 sparc: Eliminate PROMLIB_INTERNAL as it does nothing Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit bc835978cfb5dbb904a9d2e13804b6c343743530 Author: Julian Calaby Date: Thu Jan 8 16:58:42 2009 -0800 sparc: Kill exports of prom internal functions __prom_getchild() and __prom_getsibling() are not used anywhere, so don't export them. Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit 917c3660d6d9a4b073a3db7c10f6989adae4e191 Author: Sam Ravnborg Date: Thu Jan 8 16:58:20 2009 -0800 sparc64: move EXPORT_SYMBOL to the symbols definition Move all applicable EXPORT_SYMBOL()s to the file where the respective symbol is defined. Removed all the includes that are no longer needed in sparc_ksyms_64.c Comment all remaining EXPORT_SYMBOL()s in sparc_ksyms_64.c Signed-off-by: Sam Ravnborg Additions by Julian Calaby: * Moved EXPORT_SYMBOL()s for prom functions to their rightful places. * Made some minor cleanups to the includes and comments of sparc_ksyms_64.c * Updated and tidied commit message. * Rebased patch over sparc-2.6.git HEAD. * Ensured that all modified files have the correct includes. Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit 6943f3da3e64edd95ee2d33abc0a642357746ba6 Author: Sam Ravnborg Date: Thu Jan 8 16:58:05 2009 -0800 sparc: move EXPORT_SYMBOL to the symbols definition Move all applicable EXPORT_SYMBOL()s to the file where the respective symbol is defined. Removed all the includes that are no longer needed in sparc_ksyms_32.c Comment all remaining EXPORT_SYMBOL()s in sparc_ksyms_32.c Two symbols are shared with sparc64 thus the exports were removed from the sparc_ksyms_64.c too, along with the include their ommission made redundant. Signed-off-by: Sam Ravnborg Additions by Julian Calaby: * Moved EXPORT_SYMBOL()s for prom functions to their rightful places. * Made some minor cleanups to the includes and comments of sparc_ksyms_32.c * Made another subtraction from sparc_ksyms_64.c * Updated and tidied commit message. * Rebased patch over sparc-2.6.git HEAD. * Ensured that all modified files have the correct includes. Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit 45536ffc8dcb7798ff4818f54391547e5af19648 Author: Sam Ravnborg Date: Thu Jan 8 16:57:35 2009 -0800 sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file. Remove the duplicate entries from kernel/sparc_ksyms_*.c The rationale behind this is that the EXPORT_SYMBOL() should be close to their definition and we cannot add designate a symbol to be exported in assembler so at least put it in a file in the same directory. Signed-off-by: Sam Ravnborg Additions by Julian Calaby: * Rebased over sparc-2.6.git HEAD Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit b41418f48c389bad4cd87156792b4a4f24a70729 Author: David S. Miller Date: Thu Jan 8 16:52:36 2009 -0800 sparc: Most unaligned_64.c tweaks for branch tracer warnings. arch/sparc/kernel/unaligned_64.c: In function 'handle_lddfmna': arch/sparc/kernel/unaligned_64.c:592: warning: 'second' may be used uninitialized in this function Signed-off-by: David S. Miller commit a638f25ab04bcb8fd3012b0d4a2fe7dab329f82c Author: David S. Miller Date: Thu Jan 8 16:47:17 2009 -0800 sparc: Fix sun4d_irq.c build. Reported by Robert Reif. Fallout from 'swap' changes. Signed-off-by: David S. Miller commit dd5d1241ebd3fe72a9a245912fd49137f311a524 Author: David S. Miller Date: Thu Jan 8 16:46:17 2009 -0800 sparc: Update 32-bit defconfig. Signed-off-by: David S. Miller commit c7be761a8163d2f1ac0b606c21e4316b7abc5af7 Author: David Teigland Date: Wed Jan 7 16:50:41 2009 -0600 dlm: change rsbtbl rwlock to spinlock The rwlock is almost always used in write mode, so there's no reason to not use a spinlock instead. Signed-off-by: David Teigland commit 892c4467e335e9050c95e0d8409c136c4dadaca2 Author: David Teigland Date: Wed Jan 7 16:48:52 2009 -0600 dlm: fix seq_file usage in debugfs lock dump The old code would leak iterators and leave reference counts on rsbs because it was ignoring the "stop" seq callback. The code followed an example that used the seq operations differently. This new code is based on actually understanding how the seq operations work. It also improves things by saving the hash bucket in the position to avoid cycling through completed buckets in start. Siged-off-by: Davd Teigland commit e8dc7c4882fd7629d8cf75a2a7b206d478dd0882 Author: Sam Ravnborg Date: Thu Jan 8 11:37:19 2009 -0800 sparc64: fix warnings in psycho_common after ull conversion After conversion to use unsigned long long for u64 I saw following warnings: CC arch/sparc/kernel/psycho_common.o arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error': arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4) arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5) arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4) arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5) arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6) arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7) arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data': arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8) arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6) arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr': arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3) arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4) This is due to different integer promotion in my 32 bit hosted gcc. The fix is to force a few constants to ULL. The following stands out from the rest: +#define PSYCHO_IOMMU_TAG_VPAGE 0x7ffffULL +#define PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL They were needed otherwise the expression: (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT) were promoted to a unsigned long and not a unsigned long long as expected. I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help. The only way gcc would make this expression an unsigned long long was to define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was not considered a valid solution. We had this issue in two places and this were the only places the above two constants are used. A small coding style diff sneaked in too. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 79f3b3cb7a2586b319a43a7f29924c6c555e4357 Author: Kyle McMartin Date: Thu Jan 8 10:04:30 2009 -0500 x86, mtrr: fix types used in userspace exported header Commit 932d27a7913fc6b3c64c6e6082628b0a1561dec9 exported some mtrr structures without using the exportable __uX types, causing userspace build failures. Signed-off-by: Kyle McMartin Signed-off-by: Ingo Molnar commit 57d139278e6c246d78f71e4bf0e0d15bb0390646 Author: Takashi Iwai Date: Thu Jan 8 15:52:09 2009 +0100 ALSA: hda - Add quirk for Dell Inspiron Mini9 Added a quirk, model=dell, for Dell Inspiron Mini9 with ALC268 codec. Signed-off-by: Takashi Iwai commit f3f80a9205da74fa56d613f4c14b88b6e4e6caa8 Author: Takashi Iwai Date: Thu Jan 8 15:32:56 2009 +0100 ALSA: caiaq - Fix Oops with MIDI The snd-usb-caiaq driver causes Oops occasionally when accessing MIDI devices. This patch fixes the Oops and invalid URB submission errors as well. Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit cb1ace04d7797db21cb5a746ac0e0fc81d526060 Author: Peter Ujfalusi Date: Thu Jan 8 13:34:30 2009 +0200 ASoC: TWL4030: Change the soc_value_enum back to soc_enum The soc_value_enum has been merged to soc_enum. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 741555568f8ba307c626019787c412f4386cafdc Author: Peter Ujfalusi Date: Thu Jan 8 13:34:29 2009 +0200 ASoC: Merge the soc_value_enum to soc_enum struct Merge the recently introduced soc_value_enum structure to the soc_enum. The value based enums are still handled separately from the normal enum types, but with the merge some of the newly introduced functions can be removed. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit a8e4f9ddea4a23705d4eea6afe4a01e1a57a0621 Author: Lukasz Wojnilowicz Date: Thu Jan 8 12:00:49 2009 +0100 ALSA: hda - Add quirks for Acer Aspire 5930G and 6930G This is a patch which adds correct auto detection of model for snd-hda-intel for Acer Aspire 5930G and 6930G. Tested on my 5930G. It finally adds hp jack sense and 5.1 speaker system sliders. Signed-off-by: Takashi Iwai commit c9d557c19f94df42db78d4a5de4d25feee694bad Author: Paul E. McKenney Date: Wed Jan 7 14:33:30 2009 -0800 rcu: fix bug in rcutorture system-shutdown code This patch fixes an rcutorture bug found by Eric Sesterhenn that resulted in oopses in response to "rmmod rcutorture". The problem was in some new code that attempted to handle the case where a system is shut down while rcutorture is still running, for example, when rcutorture is built into the kernel so that it cannot be removed. The fix causes the rcutorture threads to "park" in an schedule_timeout_uninterruptible(MAX_SCHEDULE_TIMEOUT) rather than trying to get them to terminate cleanly. Concurrent shutdown and rmmod is illegal. I believe that this is 2.6.29 material, as it is used in some testing setups. For reference, here are the rcutorture operating modes: CONFIG_RCU_TORTURE_TEST=m This is the normal rcutorture build. Use "modprobe rcutorture" (with optional arguments) to start, and "rmmod rcutorture" to stop. If you shut the system down without doing the rmmod, you should see console output like: rcutorture thread rcu_torture_writer parking due to system shutdown One for each rcutorture kthread. CONFIG_RCU_TORTURE_TEST=y CONFIG_RCU_TORTURE_TEST_RUNNABLE=n Use this if you want rcutorture built in, but don't want the test to start running during early boot. To start the torturing: echo 1 > /proc/sys/kernel/rcutorture_runnable To stop the torturing, s/1/0/ You will get "parking" console messages as noted above when you shut the system down. CONFIG_RCU_TORTURE_TEST=y CONFIG_RCU_TORTURE_TEST_RUNNABLE=y Same as above, except that the torturing starts during early boot. Only for the stout of heart and strong of stomach. The same /proc entry noted above may be used to control the test. Located-by: Eric Sesterhenn Tested-by: Eric Sesterhenn Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit 6fd8be4bf72879b3039654388e985cabf8449af5 Author: Trent Piepho Date: Mon Dec 8 19:34:56 2008 -0800 powerpc/fsl-booke: Remove num_tlbcam_entries This is a global variable defined in fsl_booke_mmu.c with a value that gets initialized in assembly code in head_fsl_booke.S. It's never used. If some code ever does want to know the number of entries in TLB1, then "numcams = mfspr(SPRN_TLB1CFG) & 0xfff", is a whole lot simpler than a global initialized during kernel boot from assembly. Signed-off-by: Trent Piepho Signed-off-by: Kumar Gala commit 19f5465e823858a2f0b0e9a92e52816ba3ee70bb Author: Trent Piepho Date: Mon Dec 8 19:34:55 2008 -0800 powerpc/fsl-booke: Don't hard-code size of struct tlbcam Some assembly code in head_fsl_booke.S hard-coded the size of struct tlbcam to 20 when it indexed the TLBCAM table. Anyone changing the size of struct tlbcam would not know to expect that. The kernel already has a system to get the size of C structures into assembly language files, asm-offsets, so let's use it. The definition of the struct gets moved to a header, so that asm-offsets.c can include it. Signed-off-by: Trent Piepho Signed-off-by: Kumar Gala commit 565f37642c78754a85efe6c20a4a15e18ed21f07 Author: Trent Piepho Date: Wed Dec 17 11:43:26 2008 -0800 powerpc/fsl-pci: Set relaxed ordering on prefetchable ranges Provides a small speedup when accessing pefetchable ranges. To indicate that a memory range is prefetchable, mark it in the dts file with 42000000 instead of 02000000. A powepc pci_controller is allowed three memory ranges, any of which may be prefetchable. However, the PCI-PCI bridge configuration space only has one field for "non-prefetchable memory behind bridge", which has a 32 bit address, and one field for "prefetchable memory behind bridge", which may have a 64 bit address. These are PCI bus addresses, not CPU physical addresses. So really you're only allowed one memory range of each type. And if you want the range at a PCI address above 32 bits you must make it prefetchable. Signed-off-by: Trent Piepho Signed-off-by: Kumar Gala commit a097a78c1e6e4030fcef3bcab6351b6001662335 Author: Trent Piepho Date: Tue Jan 6 22:37:53 2009 -0600 powerpc/fsl-pci: Better ATMU setup for 85xx/86xx The code that sets up the outbound ATMU windows, which is used to map CPU physical addresses into PCI bus addresses where BARs will be mapped, didn't work so well. For one, it leaked the ioremap() of the ATMU registers. Another small bug was the high 20 bits of the PCI bus address were left as zero. It's legal for prefetchable memory regions to be above 32 bits, so the high 20 bits might not be zero. Mainly, it couldn't handle ranges that were not a power of two in size or were not naturally aligned. The ATMU windows have these requirements (size & alignment), but the code didn't bother to check if the ranges it was programming met them. If they didn't, the windows would silently be programmed incorrectly. This new code can handle ranges which are not power of two sized nor naturally aligned. It simply splits the ranges into multiple valid ATMU windows. As there are only four windows, pooly aligned or sized ranges (which didn't even work before) may run out of windows. In this case an error is printed and an effort is made to disable the unmapped resources. An improvement that could be made would be to make use of the default outbound window. Iff hose->pci_mem_offset is zero, then it's possible that some or all of the ranges might not need an outbound window and could just use the default window. The default ATMU window can support a pci_mem_offset less than zero too, but pci_mem_offset is unsigned. One could say the abilities allowed a powerpc pci_controller is neither subset nor a superset of the abilities of a Freescale PCIe controller. Thankfully, the most useful bits are in the intersection of the two abilities. Signed-off-by: Trent Piepho Signed-off-by: Kumar Gala commit 7ddccb234ce1039f89387e0cec9c29dccf6e3476 Author: Stephen Rothwell Date: Wed Jan 7 11:24:36 2009 -0800 IB/ehca: spin_lock_irqsave() takes an unsigned long The flags argument to spin_lock_irqsave() should really be unsigned long. This will also help prevent some warnings when we change u64 to unsigned long long. Signed-off-by: Stephen Rothwell Signed-off-by: Roland Dreier commit fdd4e8152f5f0d6d500b35515265e425acdfd203 Author: Timur Tabi Date: Tue Jan 6 17:12:23 2009 -0600 powerpc/qe: add Ethernet UPSMR definitions to QE library Add the UCC_GETH_UPSMR_xxx definitions to qe.h. The ucc_geth driver will eventually use these instead of the UPSMR_ macros it currently defines. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit be122d6d8b836fec329d740e75bfbdffa96ff6ff Author: Kumar Gala Date: Tue Jan 6 10:23:37 2009 -0600 powerpc/85xx: Fix PCIe error interrupts The PCIe interrupts for 8544ds and 8572ds were incorrect. The 8572 case was found by Liu Yu. Signed-off-by: Kumar Gala commit 1433fa7d8da608f59df1f6f381da00958bf5a0b7 Author: Jason Jin Date: Thu Dec 4 19:14:28 2008 +0800 powerpc: Fix the ide suspend function in uli1575 The general pci resume code can only restore part of the configuration registers. We need to reconfigure those registers in the FIXUP_RESUME. Signed-off-by: Jason Jin Signed-off-by: Kumar Gala commit e3d6ce6ff6e22ba35de77e306520779b384f0c38 Author: Brian Hinz Date: Wed Jan 7 11:49:56 2009 +0100 ALSA: hda - Add codec ID for MCP73 HDMI Signed-off-by: Takashi Iwai commit c247ed6f5205f9feebd276c4cbe45018b10f19fa Author: Clemens Fruhwirth Date: Wed Jan 7 11:43:48 2009 +0100 ALSA: hda - Fix typos for AD1882 codecs Fixed typos of codec-id checks for AD1882/AD1882A. Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit d5337debacc00591b3f81fc3c982b40af7de1ab6 Author: Takashi Iwai Date: Wed Jan 7 11:41:57 2009 +0100 ALSA: hda - Add quirk for HP 2230s Added a quirk for HP 2230s, model=laptop, with AD1984A codec. Reference: Novell bnc#461660 https://bugzilla.novell.com/show_bug.cgi?id=461660 Signed-off-by: Takashi Iwai