commit de5f503cfbe4f942492269c6bd97a16a4d61e488 tree 680d9c6624c9cad72e4654dd6c986f6ea4df21ac parent d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 parent 2fd628fe25e1f3d07996b0dab728ea0702f81306 author Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 committer Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 2fd628fe25e1f3d07996b0dab728ea0702f81306 tree f57882e33f96141ba59f8f188e8797adb40e42b0 parent 92f22c183cd669c8575767fede8fe43bb4f7bce9 author Atsushi Nemoto Tue, 21 Feb 2006 15:59:00 +0900 committer Ralf Baechle Mon, 27 Feb 2006 17:30:37 +0000 [MIPS] Use generic compat routines for readdir, getdents Not just cleanup but also fixes O32 readdir(2) emulation. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 92f22c183cd669c8575767fede8fe43bb4f7bce9 tree df4aae80db1218a8fab613689e99acf96f18f417 parent 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 author Ralf Baechle Thu, 23 Feb 2006 14:10:53 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] Fix atomic*_sub_if_positive return value. Reported and initial fix by Thomas Koeller , rewritten by me. Signed-off-by: Ralf Baechle commit 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 tree 62ba9475530c88ccf2149cd58eabd97ebe096aca parent 3e6cb2d38a9c9758170813497a860c64543643d5 author Ralf Baechle Thu, 23 Feb 2006 12:23:27 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] SMP: Fix initialization order bug. A recent change requires cpu_possible_map to be initialized before smp_sched_init() but most MIPS platforms were initializing their processors in the prom_prepare_cpus callback of smp_prepare_cpus. The simple fix of calling prom_prepare_cpus from one of the earlier SMP initialization hooks doesn't work well either since IPIs may require init_IRQ() to have completed, so bit the bullet and split prom_prepare_cpus into two initialization functions, plat_smp_setup which is called early from setup_arch and plat_prepare_cpus called where prom_prepare_cpus used to be called. Signed-off-by: Ralf Baechle commit 3e6cb2d38a9c9758170813497a860c64543643d5 tree 8d1d8f075b516c475c0fae5669a1ead536b1ad51 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Ralf Baechle Tue, 21 Feb 2006 18:32:14 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:35 +0000 [MIPS] Use "=R" constraint to avoid compiler errors in cmpxchg(). Signed-off-by: Ralf Baechle commit d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 tree e872c4fcbbf661cccd40d5c414801544c5ef8a5c parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Marc Zyngier Mon, 27 Feb 2006 12:08:00 +0100 committer Linus Torvalds Mon, 27 Feb 2006 08:18:04 -0800 [PATCH] Fix Specialix SX corruption With the latest kernels, I experienced some strange corruption, some '*****' being randomly inserted in the character flow, like this: ashes:~# ashes:~# a*******shes:~# ashes:~# ashes:~# Further investigation shows that the problem was introduced during Alan's "TTY layer buffering revamp" patch, the amount of data to be copied being reduced after buffer allocation. Moving the count fixup around solves the problem. Signed-off-by: Marc Zyngier Approved-by: Rogier Wolff Signed-off-by: Linus Torvalds commit e95a9ec1bb66e07b138861c743192f06e7b3e4de tree 8ee8b2c5339af31f9f79423b3c503f30e0651e4a parent 6d6585e490d985d421d7cd3cfc7d77b618c44130 parent e4e10e3e7995f5bd481d2720bf30d3a661d110ca author Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 6d6585e490d985d421d7cd3cfc7d77b618c44130 tree bf8c941eec540f0e30a37252be031c5504a24e16 parent b9a33cebac70d6f67a769ce8d4078fee2b254ada parent 7bef4b397874eee4484457040e8a1013361d7758 author Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 7bef4b397874eee4484457040e8a1013361d7758 tree 9a13e891ade50d32806ad303b80526bef9b9df3f parent a0124d780d06db711e8a92135d774940588a27da author Daniele Venzano Sat, 25 Feb 2006 17:01:09 -0500 committer Jeff Garzik Sat, 25 Feb 2006 17:01:09 -0500 Fix Wake on LAN support in sis900 Fix two bugs in the WoL implementation of sis900. The first causes hangs on some system on driver load, the second causes troubles when disabling WoL support. Both fixes are one liner and really simple. Signed-off-by: Lennert Buytenhek Signed-off-by: Daniele Venzano commit e4e10e3e7995f5bd481d2720bf30d3a661d110ca tree 14dbbab4fcc8c2fd10376751516c2f0088459247 parent 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: implement R_ERR on DMA activate FIS errata fix Silicon Image has disclosed a new sil3114/3152 errata and workaround which causes the controller to return R_ERR on DMA activate FIS if the FIS is received while the next PRD is being fetched. This patch implements the workaround. This errata results in lock up and doesn't trigger if m15w workaround is in effect. We stopped applying m15w to 3512 and 3114 in 2.6.14-rc1 which makes 3512/3114 lock up with some drives on all kernel versions since 2.6.14-rc1 upto now (2.6.16-rc4). This patch should fix the regression. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 tree f3f7924305c78b714e671e8525de5c1eb02dd268 parent a0124d780d06db711e8a92135d774940588a27da author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: add board ID for 3512 3512 is slightly different from 3112 errata-wise. Differentiate it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik