1a499150e4ec1299232e24389f648d059ce5617a Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/cbd9c883696da72b2b1f03f909dbacc04bbf8b58 cbd9c883696da72b2b1f03f909dbacc04bbf8b58 2008-01-15T20:22:48-08:00 2008-01-15T20:22:48-08:00 Linux 2.6.24-rc8 1512f5d3e7ee3a5659382f3dce48475abca2bec5 Linus Torvalds torvalds@woody.linux-foundation.org 0938e7586440ac97cedc0f5528a8684ebfa4ce43 Luck, Tony tony.luck@intel.com http://github.com/github/linux-2.6/commit/1a499150e4ec1299232e24389f648d059ce5617a 1a499150e4ec1299232e24389f648d059ce5617a 2008-01-15T14:26:55-08:00 2008-01-14T09:59:24-08:00 [IA64] Fix unaligned handler for floating point instructions with base update The compiler team did the hard work for this distilling a problem in large fortran application which showed up when applied to a 290MB input data set down to this instruction: ldfd f34=[r17],-8 Which they noticed incremented r17 by 0x10 rather than decrementing it by 8 when the value in r17 caused an unaligned data fault. I tracked it down to some bad instruction decoding in unaligned.c. The code assumes that the 'x' bit can determine whether the instruction is an "ldf" or "ldfp" ... which it is for opcode=6 (see table 4-29 on page 3:302 of the SDM). But for opcode=7 the 'x' bit is irrelevent, all variants are "ldf" instructions (see table 4-36 on page 3:306). Note also that interpreting the instruction as "ldfp" means that the "paired" floating point register (f35 in the example here) will also be corrupted. Signed-off-by: Tony Luck <tony.luck@intel.com> ed83bc200faa49a67a18f6ca331f7e9275e43b13 Tony Luck tony.luck@intel.com 7d2284b09fd967b5cad6f03c6d4a5c064f37b855 121a09e590d54be840289c6feac840453aa999d9 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/0938e7586440ac97cedc0f5528a8684ebfa4ce43 0938e7586440ac97cedc0f5528a8684ebfa4ce43 2008-01-15T13:49:09-08:00 2008-01-15T13:49:09-08:00 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: libata: correct handling of TSS DVD [libata] core checkpatch fix [libata] pata_bf54x: checkpatch fixes libata fixes for sparse-found problems 3bdb55cb86b1ffb0bd136713eec975efae4cc651 Linus Torvalds torvalds@woody.linux-foundation.org 0f7577434bcdf99456757b44d8911dc6e51c3178 Alan Cox alan@lxorguk.ukuu.org.uk http://github.com/github/linux-2.6/commit/121a09e590d54be840289c6feac840453aa999d9 121a09e590d54be840289c6feac840453aa999d9 2008-01-15T13:35:21-08:00 2008-01-14T01:06:40-08:00 libata: correct handling of TSS DVD Devices that misreport the validity bit for word 93 look like SATA. If they are on the blacklist then we must not test for SATA but assume 40 wire in the 40 wire case (The TSSCorp reports 80 wire on SATA it seems!) Signed-off-by: Alan Cox <alan@redhat.com> Cc: Tejun Heo <htejun@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> 3787fdb9c29811d161049b669209b99dedf79f40 Jeff Garzik jeff@garzik.org ed722d3d3eb2e9ea87d9f8109c291337e79d584a Andrew Morton akpm@linux-foundation.org http://github.com/github/linux-2.6/commit/0f7577434bcdf99456757b44d8911dc6e51c3178 0f7577434bcdf99456757b44d8911dc6e51c3178 2008-01-15T12:59:18-08:00 2008-01-10T14:33:09-08:00 [libata] core checkpatch fix Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Jeff Garzik <jeff@garzik.org> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> e9f9ce712a611fd13794e2a00dda97c5b879b4ae Jeff Garzik jeff@garzik.org b50e56d81e0df964e9b28001d792021b109cf4f1 Andrew Morton akpm@linux-foundation.org http://github.com/github/linux-2.6/commit/ed722d3d3eb2e9ea87d9f8109c291337e79d584a ed722d3d3eb2e9ea87d9f8109c291337e79d584a 2008-01-15T12:58:59-08:00 2008-01-10T14:33:08-08:00 [libata] pata_bf54x: checkpatch fixes WARNING: line over 80 characters #36: FILE: drivers/ata/pata_bf54x.c:1512: + while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) { ERROR: need spaces around that '>' (ctx:VxV) #36: FILE: drivers/ata/pata_bf54x.c:1512: + while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) { ^ total: 1 errors, 1 warnings, 19 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Jeff Garzik <jeff@garzik.org> Cc: Sonic Zhang <sonic.zhang@analog.com> Cc: Tejun Heo <htejun@gmail.com> Cc: sonic zhang <sonic.adi@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> e79c8a1e94fb00dc84e8b23cc467e94e2ec54447 Jeff Garzik jeff@garzik.org 38ad9aebe70dc72df08851bbd1620d89329129ba Al Viro viro@ZenIV.linux.org.uk http://github.com/github/linux-2.6/commit/b50e56d81e0df964e9b28001d792021b109cf4f1 b50e56d81e0df964e9b28001d792021b109cf4f1 2008-01-15T12:58:36-08:00 2008-01-12T06:16:14-08:00 libata fixes for sparse-found problems In pata_legacy and pata_winbond we've got bugs - cpu_to_le16() instead of cpu_to_le32(). Fortunately, both affected suckers are VLB, thus l-e-only, so we might get away with that unless we hit it with slop == 3 (hadn't checked if playing with badly aligned sg could trigger that). Still buggy... Moreover, pata_legacy, pata_winbond and pata_qdi forgot to initialize pad on the write side of 32bit case in their ->data_xfer(). Hopefully the hardware does't care, but still, sending uninitialized data to it... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org> e76679a3230265d1484882fd914e1b7b208004ba Jeff Garzik jeff@garzik.org 38ad9aebe70dc72df08851bbd1620d89329129ba Mathieu Desnoyers mathieu.desnoyers@polymtl.ca http://github.com/github/linux-2.6/commit/7d2284b09fd967b5cad6f03c6d4a5c064f37b855 7d2284b09fd967b5cad6f03c6d4a5c064f37b855 2008-01-15T12:32:30-08:00 2008-01-15T09:42:02-08:00 Fix Blackfin HARDWARE_PM support This patch restores the blackfin Hardware Performance Monitor Profiling support that was killed by the combining of instrumentation menus in commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9. Since there seems to be no good reason to behave differently from other architectures, it now automatically selects the hardware performance counters whenever the profiling is activated. mach-common/irqpanic.c: pm_overflow calls pm_overflow_handler which is in oprofile/op_model_bf533.c. I doubt that setting HARDWARE_PM as "m" will work at all, since the pm_overflow_handler should be in the core kernel image because it is called by irqpanic.c. Therefore, I change HARDWARE_PM from a tristate to a bool. The whole arch/$(ARCH)/oprofile/ is built depending on CONFIG_OPROFILE. Since part of the HARDWARE_PM support files sits in this directory, it makes sense to also depend on OPROFILE, not only PROFILING. Since OPROFILE already depends on PROFILING, it is correct to only depend on OPROFILE only. Thanks to Adrian Bunk for finding this bug and providing an initial patch. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> CC: Adrian Bunk <adrian.bunk@movial.fi> CC: Randy Dunlap <randy.dunlap@oracle.com> CC: bryan.wu@analog.com Acked-by: Robin Getz <rgetz@blackfin.uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> c883197f7907315ca08cb322c4eb50de5ee0ce7c Linus Torvalds torvalds@woody.linux-foundation.org 3568834e813e0dd7547035b3148b2f2a2b48ee4e Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/38ad9aebe70dc72df08851bbd1620d89329129ba 38ad9aebe70dc72df08851bbd1620d89329129ba 2008-01-15T09:23:51-08:00 2008-01-15T09:23:51-08:00 Fix ARM profiling/instrumentation configuration Commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 ("Combine instrumentation menus in kernel/Kconfig.instrumentation") broke ARM profiling support, since ARM has some extra Kconfig options and doesn't just use the common OPROFILE/KPROBES config options. Rather than just revert the thing outright, or add ARM-specific knowledge to the generic Kconfig.instrumentation file (where the only and whole point was to be generic, not too architecture-specific), this just makes ARM not use the generic version, since it doesn't suit it. So create an arm-specific version of Kconfig.instrumentation instead, and use that. Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: Russell King <rmk+lkml@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 076d29952ab7d8c6caca21db8b04397d616a68b6 Linus Torvalds torvalds@woody.linux-foundation.org 8234b65afa92215ae0ed965811ac20c8b3a1806a 8ee291f87c5dcebcf9c3a0ee4e021586897db364 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/3568834e813e0dd7547035b3148b2f2a2b48ee4e 3568834e813e0dd7547035b3148b2f2a2b48ee4e 2008-01-15T08:08:40-08:00 2008-01-15T08:08:40-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC x86: asm-x86/msr.h: pull in linux/types.h x86: fix boot crash on HIGHMEM4G && SPARSEMEM 19dfbffbaba9c1b021f4ef2df783c3a3513a0891 Linus Torvalds torvalds@woody.linux-foundation.org 612166c76d6bd1ccd2624a15586a92444d2c4c0e bf4a7972d638741bbb0672653c1fa10e4480c385 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/8234b65afa92215ae0ed965811ac20c8b3a1806a 8234b65afa92215ae0ed965811ac20c8b3a1806a 2008-01-15T08:07:03-08:00 2008-01-15T08:07:03-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix build with SPARSEMEM_VMEMMAP disabled. [SPARC]: Make gettimeofday() monotonic again. 68b14dbbe0dadc81d4f3d6dec0ab675bf48e4994 Linus Torvalds torvalds@woody.linux-foundation.org f885b51967fb5f611c462841e5119853df00cc97 1b310fca30ac9851f79337ca72b1cf6a0f58064a Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/612166c76d6bd1ccd2624a15586a92444d2c4c0e 612166c76d6bd1ccd2624a15586a92444d2c4c0e 2008-01-15T08:06:47-08:00 2008-01-15T08:06:47-08:00 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: [TOKENRING]: rif_timer not initialized properly [NETFILTER]: bridge: fix double POST_ROUTING invocation [NETFILTER]: xt_helper: Do not bypass RCU [NETFILTER]: ip6t_eui64: Fixes calculation of Universal/Local bit [MACVLAN]: Prevent nesting macvlan devices [VLAN]: nested VLAN: fix lockdep's recursive locking warning [DECNET] ROUTE: fix rcu_dereference() uses in /proc/net/decnet_cache [BLUETOOTH]: Always send explicit hci_ll wake-up acks. [BLUETOOTH]: rfcomm tty BUG_ON() code fix [AX25] af_ax25: Possible circular locking. [AX25]: Kill user triggable printks. [IPV4] ROUTE: fix rcu_dereference() uses in /proc/net/rt_cache [NEIGH]: Fix race between neigh_parms_release and neightbl_fill_parms [NIU]: Support for Marvell PHY cbe3bbc73fe5321d109c01259e64ea98e2646a9c Linus Torvalds torvalds@woody.linux-foundation.org 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 dfbe0d3b6be52596b5694b1bb75b19562e769021 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/f885b51967fb5f611c462841e5119853df00cc97 f885b51967fb5f611c462841e5119853df00cc97 2008-01-15T08:01:48-08:00 2008-01-15T08:01:48-08:00 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix boot failure on POWER6 [POWERPC] Workaround for iommu page alignment 29ba7f6eb9dd607980e63917e7f68e88578e7aca Linus Torvalds torvalds@woody.linux-foundation.org d43a3312c77eb6bbf71fbadefb1683f6d197bf91 Bernhard Walle bwalle@suse.de http://github.com/github/linux-2.6/commit/8ee291f87c5dcebcf9c3a0ee4e021586897db364 8ee291f87c5dcebcf9c3a0ee4e021586897db364 2008-01-15T07:44:38-08:00 2008-01-15T07:44:38-08:00 x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC In the current code, RTC_AIE doesn't work if the RTC relies on CONFIG_HPET_EMULATE_RTC because the code sets the RTC_AIE flag in hpet_set_rtc_irq_bit(). The interrupt handles does accidentally check for RTC_PIE and not RTC_AIE when comparing the time which was set in hpet_set_alarm_time(). I now verified on a test system here that without the patch applied, the attached test program fails on a system that has HPET with 2.6.24-rc7-default. That's not critical since I guess the problem has been there for several kernel releases, but as the fix is quite obvious. Configuration is CONFIG_RTC=y and CONFIG_HPET_EMULATE_RTC=y. Signed-off-by: Bernhard Walle <bwalle@suse.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> e25b0847beb1834f6166458d7eaf1ae4bfb0944d Ingo Molnar mingo@elte.hu 23be8c7ddf4fd31a14579a2109c89845f7a0fbb6 Mike Frysinger vapier@gentoo.org http://github.com/github/linux-2.6/commit/d43a3312c77eb6bbf71fbadefb1683f6d197bf91 d43a3312c77eb6bbf71fbadefb1683f6d197bf91 2008-01-15T07:44:38-08:00 2008-01-15T07:44:38-08:00 x86: asm-x86/msr.h: pull in linux/types.h Since the msr.h header uses types like __u32, it should pull in linux/types.h. [ mingo@elte.hu: affects user-space that includes this header. We dont actually like user-space including raw kernel headers but it's a longstanding practice and it's easy for the kernel to be nice about this. ] Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> 104b6f0c1bead32be79c9e7b3c2f0f5f9873e25e Ingo Molnar mingo@elte.hu 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 Ingo Molnar mingo@elte.hu http://github.com/github/linux-2.6/commit/23be8c7ddf4fd31a14579a2109c89845f7a0fbb6 23be8c7ddf4fd31a14579a2109c89845f7a0fbb6 2008-01-15T07:44:37-08:00 2008-01-15T07:44:37-08:00 x86: fix boot crash on HIGHMEM4G && SPARSEMEM Denys Fedoryshchenko reported a bootup crash when he upgraded his system from 3GB to 4GB RAM: http://lkml.org/lkml/2008/1/7/9 the bug is due to HIGHMEM4G && SPARSEMEM kernels making pfn_to_page() to return an invalid pointer when the pfn is in a memory hole. The 256 MB PCI aperture at the end of RAM was not mapped by sparsemem, and hence the pfn was not valid. But set_highmem_pages_init() iterated this range without checking the pfn's validity first. this bug was probably present in the sparsemem code ever since sparsemem has been introduced in v2.6.13. It was masked due to HIGHMEM64G using larger memory regions in sparsemem_32.h: #ifdef CONFIG_X86_PAE #define SECTION_SIZE_BITS 30 #define MAX_PHYSADDR_BITS 36 #define MAX_PHYSMEM_BITS 36 #else #define SECTION_SIZE_BITS 26 #define MAX_PHYSADDR_BITS 32 #define MAX_PHYSMEM_BITS 32 #endif which creates 1GB sparsemem regions instead of 64MB sparsemem regions. So in practice we only ever created true sparsemem holes on x86 with HIGHMEM4G - but that was rarely used by distros. ( btw., we could probably save 2MB of mem_map[]s on X86_PAE if we reduced the sparsemem region size to 256 MB. ) Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Thomas Gleixner <tglx@linutronix.de> 57d28dd27783e79273c9a2c6e3c4307c0ac945e1 Ingo Molnar mingo@elte.hu d262c32a4bcc3e5fda0325a64e53c25fe1e999d7 Paul Mackerras paulus@samba.org http://github.com/github/linux-2.6/commit/dfbe0d3b6be52596b5694b1bb75b19562e769021 dfbe0d3b6be52596b5694b1bb75b19562e769021 2008-01-14T22:30:58-08:00 2008-01-14T22:29:33-08:00 [POWERPC] Fix boot failure on POWER6 Commit 473980a99316c0e788bca50996375a2815124ce1 added a call to clear the SLB shadow buffer before registering it. Unfortunately this means that we clear out the entries that slb_initialize has previously set in there. On POWER6, the hypervisor uses the SLB shadow buffer when doing partition switches, and that means that after the next partition switch, each non-boot CPU has no SLB entries to map the kernel text and data, which causes it to crash. This fixes it by reverting most of 473980a9 and instead clearing the 3rd entry explicitly in slb_initialize. This fixes the problem that 473980a9 was trying to solve, but without breaking POWER6. Signed-off-by: Paul Mackerras <paulus@samba.org> 75e3ef05b6dd8cc7065fe77a05a9cd1b3495619a Paul Mackerras paulus@samba.org c60ecec67ab3f6b5791ef49d502b7a61909aa13e d8cf5389bd9d1f0ac9fea51796c274ba64b83d80 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 2008-01-14T21:26:08-08:00 2008-01-14T21:26:08-08:00 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: libata: relocate sdev->manage_start_stop configuration sata_sil24: freeze on non-dev errors reported via CERR sata_sil24: fix stupid typo ata_piix: ignore ATA_DMA_ERR on vmware ich4 1adceb5d74b574bb99b67dd0a7456e60f2fbd39f Linus Torvalds torvalds@woody.linux-foundation.org c23f72cae9523d29ff94eec8f30ccbdaf234b20e 2e4f95822cc17cb7095d50babe2d2fc4c043fa25 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/c60ecec67ab3f6b5791ef49d502b7a61909aa13e c60ecec67ab3f6b5791ef49d502b7a61909aa13e 2008-01-14T21:25:39-08:00 2008-01-14T21:25:39-08:00 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Cacheops.h: Fix typo. [MIPS] Cobalt: Qube1 has no serial port so don't use it [MIPS] Cobalt: Fix ethernet interrupts for RaQ1 [MIPS] Kconfig fixes for BCM47XX platform e8180ad2ec48a6063277ee51cf10dc8541dcac2f Linus Torvalds torvalds@woody.linux-foundation.org 031f2dcd7075e218e74dd7f942ad015cf82dffab Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/c23f72cae9523d29ff94eec8f30ccbdaf234b20e c23f72cae9523d29ff94eec8f30ccbdaf234b20e 2008-01-14T21:21:29-08:00 2008-01-14T21:21:29-08:00 Revert "writeback: introduce writeback_control.more_io to indicate more io" This reverts commit 2e6883bdf49abd0e7f0d9b6297fc3be7ebb2250b, as requested by Fengguang Wu. It's not quite fully baked yet, and while there are patches around to fix the problems it caused, they should get more testing. Says Fengguang: "I'll resend them both for -mm later on, in a more complete patchset". See http://bugzilla.kernel.org/show_bug.cgi?id=9738 for some of this discussion. Requested-by: Fengguang Wu <wfg@mail.ustc.edu.cn> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 1e5f46971510cd36a3deebfa8f160933212f4df0 Linus Torvalds torvalds@woody.linux-foundation.org 031f2dcd7075e218e74dd7f942ad015cf82dffab Benjamin Herrenschmidt benh@kernel.crashing.org http://github.com/github/linux-2.6/commit/d262c32a4bcc3e5fda0325a64e53c25fe1e999d7 d262c32a4bcc3e5fda0325a64e53c25fe1e999d7 2008-01-14T20:39:59-08:00 2008-01-07T15:34:22-08:00 [POWERPC] Workaround for iommu page alignment Commit 5d2efba64b231a1733c4048d1708d77e07f26426 changed our iommu code so that it always uses an iommu page size of 4kB. That means with our current code, drivers may do a dma_map_sg() of a 64kB page and obtain a dma_addr_t that is only 4k aligned. This works fine in most cases except for some infiniband HW it seems, where they tell the HW about the page size and it ignores the low bits of the DMA address. This works around it by making our IOMMU code enforce a PAGE_SIZE alignment for mappings of objects that are page aligned in the first place and whose size is larger or equal to a page. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> aa09101b13dac2bca27c5bab878c72c9c9015505 Paul Mackerras paulus@samba.org c2e14f11120bbef0c883e795da8180b58f3cddae Tejun Heo htejun@gmail.com http://github.com/github/linux-2.6/commit/d8cf5389bd9d1f0ac9fea51796c274ba64b83d80 d8cf5389bd9d1f0ac9fea51796c274ba64b83d80 2008-01-14T18:11:02-08:00 2008-01-14T15:46:59-08:00 libata: relocate sdev->manage_start_stop configuration After 9b8e8de7, manage_start_stop configuration depends on valid ATA device. Move it into ata_scsi_dev_config(). This was detected by the coverity checker. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> b6f6c10b9d7ca625ad531bd5ca1778d354fb15d5 Jeff Garzik jeff@garzik.org 7293fa8fb74f17077a2ac7ccd5b58ae3225317d0 Tejun Heo htejun@gmail.com http://github.com/github/linux-2.6/commit/c2e14f11120bbef0c883e795da8180b58f3cddae c2e14f11120bbef0c883e795da8180b58f3cddae 2008-01-14T18:11:02-08:00 2008-01-12T21:04:16-08:00 sata_sil24: freeze on non-dev errors reported via CERR CERR reports errors detected during executing a command. This doesn't mean the error is tied to the command and can be recovered by just issuing it again. Many of the errors are fatal port-wide connditions including HSM violation, host bus error and ATA bus error and require freezing and port reset. The freezing part wasn't implemented previously. This used to be okay because port resets were scheduled anyway and EH eventually resets and recovers the port. With PMP support added, this is no longer true. The error condition and recover actions are attributed to the fan-out port and the host port condition isn't properly recovered leading to EH failures. This patch makes CERR errors which require resets to freeze the port. This will force host port reset and proper recovery. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Andrew Ryder <tireman@shaw.ca> Signed-off-by: Jeff Garzik <jeff@garzik.org> 3ecad039951b09fc7de9271d9f9b498402d99eb9 Jeff Garzik jeff@garzik.org 25f98131a292f4c81e4619bdf48f00a991386f73 Tejun Heo htejun@gmail.com http://github.com/github/linux-2.6/commit/7293fa8fb74f17077a2ac7ccd5b58ae3225317d0 7293fa8fb74f17077a2ac7ccd5b58ae3225317d0 2008-01-14T18:11:01-08:00 2008-01-12T20:49:22-08:00 sata_sil24: fix stupid typo Fix stupid typo. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> 27a4d4fdfd7ff814834e9463ca456e435564c5b6 Jeff Garzik jeff@garzik.org 031f2dcd7075e218e74dd7f942ad015cf82dffab Tejun Heo htejun@gmail.com http://github.com/github/linux-2.6/commit/25f98131a292f4c81e4619bdf48f00a991386f73 25f98131a292f4c81e4619bdf48f00a991386f73 2008-01-14T18:11:01-08:00 2008-01-07T02:38:53-08:00 ata_piix: ignore ATA_DMA_ERR on vmware ich4 VMware ich4 emulation incorrectly sets DMA_ERR on TF error. Ignore it. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> 1d44c22d18fcfd33fdd73c48647af118063a5649 Jeff Garzik jeff@garzik.org c43756da94863395d5ee088659676029b3ae7191 Ralf Baechle ralf@linux-mips.org http://github.com/github/linux-2.6/commit/2e4f95822cc17cb7095d50babe2d2fc4c043fa25 2e4f95822cc17cb7095d50babe2d2fc4c043fa25 2008-01-14T17:04:42-08:00 2008-01-14T06:46:31-08:00 [MIPS] Cacheops.h: Fix typo. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 35476b43fbce7033d0d2f72268dcda9dd71c7d9d Ralf Baechle ralf@linux-mips.org f6c0f32ee8d21e800097fc35ba8ab2b5a3b9bdfa Thomas Bogendoerfer tsbogend@alpha.franken.de http://github.com/github/linux-2.6/commit/c43756da94863395d5ee088659676029b3ae7191 c43756da94863395d5ee088659676029b3ae7191 2008-01-14T17:04:42-08:00 2008-01-11T15:25:17-08:00 [MIPS] Cobalt: Qube1 has no serial port so don't use it Because Qube1 doesn't have a serial chip waiting for transmit fifo empty takes forever, which isn't a good idea. No prom_putchar/early console for Qube1 fixes this. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> f5778b886527af2333bfa451d58221a75e9d4de3 Ralf Baechle ralf@linux-mips.org 2f02c15a5d963007bd721d76f644c9491f6fec06 Thomas Bogendoerfer tsbogend@alpha.franken.de http://github.com/github/linux-2.6/commit/f6c0f32ee8d21e800097fc35ba8ab2b5a3b9bdfa f6c0f32ee8d21e800097fc35ba8ab2b5a3b9bdfa 2008-01-14T17:04:42-08:00 2008-01-11T15:25:14-08:00 [MIPS] Cobalt: Fix ethernet interrupts for RaQ1 RAQ1 uses the same interrupt routing as Qube2. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 207e4b67003eab4c5e9eb9e8f014601f2049b2eb Ralf Baechle ralf@linux-mips.org 88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d Aurelien Jarno aurelien@aurel32.net http://github.com/github/linux-2.6/commit/2f02c15a5d963007bd721d76f644c9491f6fec06 2f02c15a5d963007bd721d76f644c9491f6fec06 2008-01-14T17:04:41-08:00 2007-12-11T02:30:34-08:00 [MIPS] Kconfig fixes for BCM47XX platform The patch below fixes two problems for Kconfig on the BCM47xx platform: - arch/mips/bcm47xx/gpio.c uses ssb_extif_* functions. Selecting SSB_DRIVER_EXTIF makes sure those functions are available. - arch/mips/pci/pci.c needs, when enabled, platform specific functions, which are defined when SSB_PCICORE_HOSTMODE is enabled. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> b2703396e25d2e37129cb01a7ad66f138a60559a Ralf Baechle ralf@linux-mips.org a98fdcef941e107eeabae622d85a1f476f25a160 5cd6e675f862568ad73c061665ee5080cfd952c5 Linus Torvalds torvalds@woody.linux-foundation.org http://github.com/github/linux-2.6/commit/031f2dcd7075e218e74dd7f942ad015cf82dffab 031f2dcd7075e218e74dd7f942ad015cf82dffab 2008-01-14T13:23:20-08:00 2008-01-14T13:23:20-08:00 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-sibyte: Fix an error path i2c: Driver IDs are optional i2c: Spelling fixes i2c-omap: Fix NULL pointer dereferencing d7ee06c0fcfb2e841230e38de704dd0fed60bd7e Linus Torvalds torvalds@woody.linux-foundation.org