commit f891caf28febf9d4129716e848227148654b5993 Merge: 1fe01cb... 5663a12... Author: Linus Torvalds Date: Fri Oct 31 08:14:15 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits) Revert "powerpc: Sync RPA note in zImage with kernel's RPA note" powerpc: Fix compile errors with CONFIG_BUG=n powerpc: Fix format string warning in arch/powerpc/boot/main.c powerpc: Fix bug in kernel copy of libfdt's fdt_subnode_offset_namelen() powerpc: Remove duplicate DMA entry from mpc8313erdb device tree powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function powerpc/mpic: Fix regression caused by change of default IRQ affinity powerpc: Update remaining dma_mapping_ops to use map/unmap_page powerpc/pci: Fix unmapping of IO space on 64-bit powerpc/pci: Properly allocate bus resources for hotplug PHBs OF-device: Don't overwrite numa_node in device registration powerpc: Fix swapcontext system for VSX + old ucontext size powerpc: Fix compiler warning for the relocatable kernel powerpc: Work around ld bug in older binutils powerpc/ppc64/kdump: Better flag for running relocatable powerpc: Use is_kdump_kernel() powerpc: Kexec exit should not use magic numbers powerpc/44x: Update 44x defconfigs powerpc/40x: Update 40x defconfigs powerpc: enable heap randomization for linkstations ... commit 1fe01cb57c6272577ebb107a03253484f6dabe7c Merge: 63b40456... 216813a... Author: Linus Torvalds Date: Fri Oct 31 07:53:17 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (21 commits) sh: fix sh2a cache entry_mask sh: Enable NFS root in Migo-R defconfig. sh: FTRACE renamed to FUNCTION_TRACER. sh: Fix up the shared IRQ demuxer's control bit testing logic. Define SCSPTR1 for SH 7751R sh: Add sci_rxd_in of SH4-202 Add support usb setting on sh 7366 sh: Change register name SCSPTR to SCSPTR2 sh: use the new byteorder headers. sh: SHmedia ISA tuning fixups. sh: Kill off long-dead HD64465 cchip support. sh: Revert "SH 7366 needs SCIF_ONLY" sh: Simplify and lock down the ISA tuning. sh: sh7785lcr: Select uImage as default image target. sh: Add on-chip RTC support for SH7722. SH 7366 needs SCIF_ONLY gdrom: Fix compile error sh: Provide a sample defconfig for the UL2 (SH7366) board. sh: Fix FPU tuning on toolchains with mismatched multilib targets. sh: oprofile: Fix up the SH7750 performance counter name. ... commit 63b40456a30912084c90753582137b9e0495c5c3 Merge: eff2502... 770a424... Author: Linus Torvalds Date: Fri Oct 31 07:52:51 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Add missing null terminating entry to bq4802_match[]. sparc: use the new byteorder headers rtc-m48t59: shift zero year to 1968 on sparc (rev 2) dbri: check dma_alloc_coherent errors sparc64: remove byteshifting from out* helpers commit eff2502801e9a3a34882c6bd720470d65394522e Merge: f73aaf1... a996031... Author: Linus Torvalds Date: Fri Oct 31 07:52:12 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: delay capable() check in ext4_has_free_blocks() merge ext4_claim_free_blocks & ext4_has_free_blocks jbd2: Call the commit callback before the transaction could get dropped ext4: fix a bug accessing freed memory in ext4_abort ext3: fix a bug accessing freed memory in ext3_abort commit f73aaf10ae14ee8f9644b0f7abe252fe7eeb17f5 Merge: 721d5df... 9ce8e30... Author: Linus Torvalds Date: Fri Oct 31 07:47:57 2008 -0700 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: add whitelist for devices with known good pata-sata bridges sata_via: fix support for 5287 libata: Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127 ATA: remove excess kernel-doc notation commit 5663a1232bd557b4b2141ad345dd56785fa51c2a Author: Paul Mackerras Date: Fri Oct 31 22:27:17 2008 +1100 Revert "powerpc: Sync RPA note in zImage with kernel's RPA note" This reverts commit 91a00302959545a9ae423e99732b1e46eb19e877, plus commit 0dcd440120ef12879ff34fc78d7e4abf171c79e4 ("powerpc: Revert CHRP boot wrapper to real-base = 12MB on 32-bit") which depended on it. Commit 91a00302 was causing NVRAM corruption on some pSeries machines, for as-yet unknown reasons, so this reverts it until the cause is identified. Signed-off-by: Paul Mackerras commit bfb99f8258b5981ef7a2ec8099db56317ea16695 Merge: ebdba9a... 65325d5... Author: Paul Mackerras Date: Fri Oct 31 21:34:56 2008 +1100 Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge commit ebdba9af940d63e469dc8e46b4aa1fc474e8ee2d Author: Paul Mackerras Date: Fri Oct 31 21:34:09 2008 +1100 powerpc: Fix compile errors with CONFIG_BUG=n This makes sure we don't try to call find_bug or is_warning_bug when CONFIG_BUG=n and CONFIG_XMON=y. Otherwise we get these errors: arch/powerpc/xmon/xmon.c: In function ‘print_bug_trap’: arch/powerpc/xmon/xmon.c:1364: error: implicit declaration of function ‘find_bug’ arch/powerpc/xmon/xmon.c:1364: warning: assignment makes pointer from integer without a cast arch/powerpc/xmon/xmon.c:1367: error: implicit declaration of function ‘is_warning_bug’ arch/powerpc/xmon/xmon.c:1374: error: dereferencing pointer to incomplete type make[2]: *** [arch/powerpc/xmon/xmon.o] Error 1 make[1]: *** [arch/powerpc/xmon] Error 2 make: *** [sub-make] Error 2 Signed-off-by: Paul Mackerras commit 8ba4773aee23a5e2e1ce386c5bd86e407496de99 Author: Jon Smirl Date: Thu Oct 30 16:51:32 2008 +0000 powerpc: Fix format string warning in arch/powerpc/boot/main.c Fix format string warning in arch/powerpc/boot/main.c. Also correct a typo ("uncomressed") on the same line. BOOTCC arch/powerpc/boot/main.o arch/powerpc/boot/main.c: In function 'prep_kernel': arch/powerpc/boot/main.c:65: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' Signed-off-by: Jon Smirl Acked-by: David Gibson Signed-off-by: Paul Mackerras commit 2dccbf4ea05d2c3603b8c1359019bf7148a316a5 Author: David Gibson Date: Thu Oct 30 16:37:05 2008 +0000 powerpc: Fix bug in kernel copy of libfdt's fdt_subnode_offset_namelen() There's currently an off-by-one bug in fdt_subnode_offset_namelen() which causes it to keep searching after it's finished the subnodes of the given parent, and into the subnodes of siblings of the original node which come after it in the tree. This bug was introduced in commit ed95d7450dcbfeb45ffc9d39b1747aee82b49a51 ("powerpc: Update in-kernel dtc and libfdt to version 1.2.0"). A patch has already been submitted to dtc/libfdt mainline. We don't really want to pull in a new upstream version during the 2.6.28 cycle, but we should still fix this bug, hence this standalone version of the fix for the in-kernel libfdt. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 65325d5c45a4363b4ad2ce2a55793a131b667de6 Author: Mike Dyer Date: Wed Oct 29 10:10:06 2008 +0000 powerpc: Remove duplicate DMA entry from mpc8313erdb device tree Commit 574366128db29e7da609ec1f9c01bf9d80adec87 added a duplicate DMA controller node. Signed-off-by: Mike Dyer Signed-off-by: Kumar Gala commit 216813a8bb4db97eb7a6e75c533894430053df48 Author: Yoshihiro Shimoda Date: Thu Aug 7 13:54:59 2008 +0900 sh: fix sh2a cache entry_mask fix sh2a cache entry_mask in __flush_{purge,invalidate}_region. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 464f763d5aeac1c31f6c626afbc4ea086c78a7b4 Author: Kuninori Morimoto Date: Fri Oct 31 16:01:19 2008 +0900 sh: Enable NFS root in Migo-R defconfig. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 694f94f263bee30ada18bab178b98a0d10917e68 Author: Paul Mundt Date: Fri Oct 31 16:20:36 2008 +0900 sh: FTRACE renamed to FUNCTION_TRACER. Signed-off-by: Paul Mundt commit 0803d540db06f53acd2fabf1347d5b665218f14a Merge: a8884e3... 721d5df... Author: Paul Mundt Date: Fri Oct 31 16:18:02 2008 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 Author: Michael Trimarchi Date: Fri Oct 31 16:10:23 2008 +0900 sh: Fix up the shared IRQ demuxer's control bit testing logic. Correct the interrupt handler in sh4 serial device, return the correct value and check for what is anabled in the SCSCR register. The sh7722 is broken just sending a break using minicom. Signed-off-by: Michael Trimarchi Signed-off-by: Paul Mundt commit 7abc404a5a1e3785749acb8dbfcc558223f78444 Author: Matt Fleming Date: Wed Oct 29 07:16:02 2008 +0000 Define SCSPTR1 for SH 7751R After the recent commit to kill off SCI/SCIF special casing SH 7751R fails to compile with CONFIG_SH_RTS7751R2D set. This is because SCSPTR1 is undefined. Take the value for SCSPTR1 from the SH7751R Group Hardware Manual. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 961e9ff9025ef2dfdebe843549b7e1ec4d48c17c Author: Nobuhiro Iwamatsu Date: Wed Oct 29 13:33:45 2008 +0900 sh: Add sci_rxd_in of SH4-202 SH4-202 doesn't have SCSXX1. But it is treated so that there is SCSPTR1 in current code. This patch add sci_rxd_in of SH4-202. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 47c2968c84cb737f8dd8b79e34b75242ec7e0796 Author: Kuninori Morimoto Date: Thu Oct 30 14:49:03 2008 +0900 Add support usb setting on sh 7366 This patch add usb setting for sh 7366 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit aeffd54ad7e3af513c6a0dadda71e6316e5ba230 Author: Nobuhiro Iwamatsu Date: Wed Oct 29 13:34:50 2008 +0900 sh: Change register name SCSPTR to SCSPTR2 This change a name of SCSPTR used in sci_rxd_in of SH5-101. SCSPTR is not declared and will become the error. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 140626673289a25f677fb006fafb3f6a95b8eb97 Author: Harvey Harrison Date: Fri Oct 31 16:01:22 2008 +0900 sh: use the new byteorder headers. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit ddb72b02414228844ad46f7cbd42eccea01fb485 Author: Paul Mundt Date: Fri Oct 31 15:58:53 2008 +0900 sh: SHmedia ISA tuning fixups. SH-5 doesn't support any elaborate ISA inheritance schemes (-dsp, -up, etc.), so only bother with that if we are building an sh32 kernel. Signed-off-by: Paul Mundt commit 770a424112cb2c3a3e39221299eaf5244b76479a Author: David S. Miller Date: Thu Oct 30 22:58:06 2008 -0700 sparc64: Add missing null terminating entry to bq4802_match[]. Signed-off-by: David S. Miller commit 9ce8e3073d9cfd6f859c22a25441db41b85cbf6e Author: Jens Axboe Date: Wed Aug 27 15:23:18 2008 +0200 libata: add whitelist for devices with known good pata-sata bridges libata currently imposes a UDMA5 max transfer rate and 200 sector max transfer size for SATA devices that sit behind a pata-sata bridge. Lots of devices have known good bridges that don't need this limit applied. The MTRON SSD disks are such devices. Transfer rates are increased by 20-30% with the restriction removed. So add a "blacklist" entry for the MTRON devices, with a flag indicating that the bridge is known good. Signed-off-by: Jeff Garzik commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 Author: Tejun Heo Date: Wed Oct 22 00:46:36 2008 +0900 sata_via: fix support for 5287 5287 used to be treated as vt6420 but it didn't work. It's new family of controllers called vt8251 which hosts four SATA ports as M/S of the two ATA ports. This configuration is rather peculiar in that although the M/S devices are on the same port, each have its own SCR (or equivalent link status/control) registers which screws up the port-link-device hierarchy assumed by libata. Another controller which falls into this category is ata_piix w/ SIDPR access. libata now has facility to deal with this class of controllers named slave_link. A low level driver for such controllers can just call ata_slave_link_init() on the respective ports and libata will handle all the difficult parts like following up with single SRST after hardresetting both ports. This patch creates new controller class vt8251, implements slave_link aware init sequence and config space based SCR access for it and moves 5287 to the new class. This patch is based on Joseph Chan's larger patch which was created before slave_link was implemented in libata. http://thread.gmane.org/gmane.linux.kernel.commits.mm/40640 Signed-off-by: Tejun Heo Cc: Joseph Chan Signed-off-by: Jeff Garzik commit ba14a9c291aa867896a90b3571fcc1c3759942ff Author: Roland Dreier Date: Tue Oct 28 16:52:20 2008 -0700 libata: Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127 In ata_tf_to_lba48(), when evaluating (tf->hob_lbal & 0xff) << 24 the expression is promoted to signed int (since int can hold all values of u8). However, if hob_lbal is 128 or more, then it is treated as a negative signed value and sign-extended when promoted to u64 to | into sectors, which leads to the MSB 32 bits of section getting set incorrectly. For example, Phillip O'Donnell reported that a 1.5GB drive caused: ata3.00: HPA detected: current 2930277168, native 18446744072344861488 where 2930277168 == 0xAEA87B30 and 18446744072344861488 == 0xffffffffaea87b30 which shows the problem when hob_lbal is 0xae. Fix this by adding a cast to u64, just as is used by for hob_lbah and hob_lbam in the function. Reported-by: Phillip O'Donnell Signed-off-by: Roland Dreier Signed-off-by: Jeff Garzik commit 5b97fbd093ac2e0da0c7eec894fee065a04af55d Author: Randy Dunlap Date: Wed Oct 29 22:35:08 2008 -0700 ATA: remove excess kernel-doc notation Remove excess kernel-doc function parameter notation from drivers/ata/: Warning(drivers/ata/libata-core.c:1622): Excess function parameter or struct member 'fn' description in 'ata_pio_queue_task' Warning(drivers/ata/libata-core.c:4655): Excess function parameter or struct member 'err_mask' description in 'ata_qc_complete' Warning(drivers/ata/ata_piix.c:751): Excess function parameter or struct member 'udma' description in 'do_pata_set_dmamode' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 210434d7633d477aa503454d68511fa2904e418e Author: Carl Love Date: Wed Oct 29 05:06:45 2008 +0000 powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function The size of the pm_signal_local array should be equal to the number of SPUs being configured in the array. Currently, the array is of size 4 (NR_PHYS_CTRS) but being indexed by a for loop from 0 to 7 (NUM_SPUS_PER_NODE). This could potentially cause an oops or random memory corruption since the pm_signal_local array is on the stack. This fixes it. Signed-off-by: Carl Love Signed-off-by: Paul Mackerras commit 3c10c9c45e290022ca7d2aa1ad33a0b6ed767520 Author: Kumar Gala Date: Tue Oct 28 18:01:39 2008 +0000 powerpc/mpic: Fix regression caused by change of default IRQ affinity The Freescale implementation of MPIC only allows a single CPU destination for non-IPI interrupts. We add a flag to the mpic_init to distinquish these variants of MPIC. We pull in the irq_choose_cpu from sparc64 to select a single CPU as the destination of the interrupt. This is to deal with the fact that the default smp affinity was changed by commit 18404756765c713a0be4eb1082920c04822ce588 ("genirq: Expose default irq affinity mask (take 3)") to be all CPUs. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit f9226d572d2f8b5f564596db8c6a13e458c46191 Author: Mark Nelson Date: Mon Oct 27 20:38:08 2008 +0000 powerpc: Update remaining dma_mapping_ops to use map/unmap_page After the merge of the 32 and 64bit DMA code, dma_direct_ops lost their map/unmap_single() functions but gained map/unmap_page(). This caused a problem for Cell because Cell's dma_iommu_fixed_ops called the dma_direct_ops if the fixed linear mapping was to be used or the iommu ops if the dynamic window was to be used. So in order to fix this problem we need to update the 64bit DMA code to use map/unmap_page. First, we update the generic IOMMU code so that iommu_map_single() becomes iommu_map_page() and iommu_unmap_single() becomes iommu_unmap_page(). Then we propagate these changes up through all the callers of these two functions and in the process update all the dma_mapping_ops so that they have map/unmap_page rahter than map/unmap_single. We can do this because on 64bit there is no HIGHMEM memory so map/unmap_page ends up performing exactly the same function as map/unmap_single, just taking different arguments. This has no affect on drivers because the dma_map_single_attrs() just ends up calling the map_page() function of the appropriate dma_mapping_ops and similarly the dma_unmap_single_attrs() calls unmap_page(). This fixes an oops on Cell blades, which oops on boot without this because they call dma_direct_ops.map_single, which is NULL. Signed-off-by: Mark Nelson Signed-off-by: Paul Mackerras commit b30115ea8f685bcd1769553fe8511745f985053c Author: Benjamin Herrenschmidt Date: Mon Oct 27 19:48:47 2008 +0000 powerpc/pci: Fix unmapping of IO space on 64-bit A typo/thinko made us pass the wrong argument to __flush_hash_table_range when unplugging bridges, thus not flushing all the translations for the IO space on unplug. The third parameter to __flush_hash_table_range is `end', not `size'. This causes the hypervisor to refuse unplugging slots. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e90a13184600ec756875238ad130e2f205cd9a1b Author: Nathan Fontenot Date: Mon Oct 27 19:48:17 2008 +0000 powerpc/pci: Properly allocate bus resources for hotplug PHBs Resources for PHB's that are dynamically added to a system are not properly allocated in the resource tree. Not having these resources allocated causes an oops when removing the PHB when we try to release them. The diff appears a bit messy, this is mainly due to moving everything one tab to the left in the pcibios_allocate_bus_resources routine. The functionality change in this routine is only that the list_for_each_entry() loop is pulled out and moved to the necessary calling routine. Signed-off-by: Nathan Fontenot Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6098e2ee14849e0819ffa887ebf470dcfad4a2be Author: Jeremy Kerr Date: Sun Oct 26 21:51:25 2008 +0000 OF-device: Don't overwrite numa_node in device registration Currently, the numa_node of OF-devices will be overwritten during device_register, which simply sets the node to -1. On cell machines, this means that devices can't find their IOMMU, which is referenced through the device's numa node. Set the numa node for OF devices with no parent, and use the lower-level device_initialize and device_add functions, so that the node is preserved. We can remove the call to set_dev_node in of_device_alloc, as it will be overwritten during register. Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 16c29d180becc5bdf92fd0fc7314a44a671b5f4e Author: Michael Neuling Date: Thu Oct 23 00:42:36 2008 +0000 powerpc: Fix swapcontext system for VSX + old ucontext size Since VSX support was added, we now have two sizes of ucontext_t; the older, smaller size without the extra VSX state, and the new larger size with the extra VSX state. A program using the sys_swapcontext system call and supplying smaller ucontext_t structures will currently get an EINVAL error if the task has used VSX (e.g. because of calling library code that uses VSX) and the old_ctx argument is non-NULL (i.e. the program is asking for its current context to be saved). Thus the program will start getting EINVAL errors on calls that previously worked. This commit changes this behaviour so that we don't send an EINVAL in this case. It will now return the smaller context but the VSX MSR bit will always be cleared to indicate that the ucontext_t doesn't include the extra VSX state, even if the task has executed VSX instructions. Both 32 and 64 bit cases are updated. [paulus@samba.org - also fix some access_ok() and get_user() calls] Thanks to Ben Herrenschmidt for noticing this problem. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit b160544cccb403310cf38ddb3ebc156ea454848a Author: Michael Neuling Date: Wed Oct 22 19:39:49 2008 +0000 powerpc: Fix compiler warning for the relocatable kernel Fixes this warning: arch/powerpc/kernel/setup_64.c:447:5: warning: "kernstart_addr" is not defined which arises because PHYSICAL_START is no longer a constant when CONFIG_RELOCATABLE=y. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 2a4b9c5af82035c591adca951a9af1665ad1a2b0 Author: Paul Mackerras Date: Wed Oct 22 18:43:45 2008 +0000 powerpc: Work around ld bug in older binutils Commit 549e8152de8039506f69c677a4546e5427aa6ae7 ("powerpc: Make the 64-bit kernel as a position-independent executable") added lines to vmlinux.lds.S to add the extra sections needed to implement a relocatable kernel. However, those lines seem to trigger a bug in older versions of GNU ld (such as 2.16.1) when building a non-relocatable kernel. Since ld 2.16.1 is still a popular choice for cross-toolchains, this adds an #ifdef to vmlinux.lds.S so the added lines are only included when building a relocatable kernel. Signed-off-by: Paul Mackerras commit 8b8b0cc1c736ddca39b60bb098bd0a23daaa495f Author: Milton Miller Date: Thu Oct 23 18:41:09 2008 +0000 powerpc/ppc64/kdump: Better flag for running relocatable The __kdump_flag ABI is overly constraining for future development. As of 2.6.27, the kernel entry point has 4 constraints: Offset 0 is the starting point for the master (boot) cpu (entered with r3 pointing to the device tree structure), offset 0x60 is code for the slave cpus (entered with r3 set to their device tree physical id), offset 0x20 is used by the iseries hypervisor, and secondary cpus must be well behaved when the first 256 bytes are copied to address 0. Placing the __kdump_flag at 0x18 is bad because: - It was taking the last 8 bytes before the iseries hypervisor data. - It was 8 bytes for a boolean flag - It had no way of identifying that the flag was present - It does leave any room for the master to add any additional code before branching, which hurts debug. - It will be unnecessarily hard for 32 bit code to be common (8 bytes) Now that we have eliminated the use of __kdump_flag in favor of the standard is_kdump_kernel(), this flag only controls run without relocating the kernel to PHYSICAL_START (0), so rename it __run_at_load. Move the flag to 0x5c, 1 word before the secondary cpu entry point at 0x60. Initialize it with "run0" to say it will run at 0 unless it is set to 1. It only exists if we are relocatable. Signed-off-by: Milton Miller Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 62a8bd6c9246c0e1f19dfb8fc65ad7c4f7cac8bb Author: Milton Miller Date: Wed Oct 22 15:39:04 2008 -0500 powerpc: Use is_kdump_kernel() linux/crash_dump.h defines is_kdump_kernel() to be used by code that needs to know if the previous kernel crashed instead of a (clean) boot or reboot. This updates the just added powerpc code to use it. This is needed for the next commit, which will remove __kdump_flag. Signed-off-by: Milton Miller Signed-off-by: Paul Mackerras commit 1767c8f392857694899403a65942cc70b5b7d132 Author: Milton Miller Date: Wed Oct 22 10:39:18 2008 +0000 powerpc: Kexec exit should not use magic numbers Commit 54622f10a6aabb8bb2bdacf3dd070046f03dc246 ("powerpc: Support for relocatable kdump kernel") added a magic flag value in a register to tell purgatory that it should be a panic kernel. This part is wrong and is reverted by this commit. The kernel gets a list of memory blocks and a entry point from user space. Its job is to copy the blocks into place and then branch to the designated entry point (after turning "off" the mmu). The user space tool inserts a trampoline, called purgatory, that runs before the user supplied code. Its job is to establish the entry environment for the new kernel or other application based on the contents of memory. The purgatory code is compiled and embedded in the tool, where it is later patched using the elf symbol table using elf symbols. Since the tool knows it is creating a purgatory that will run after a kernel crash, it should just patch purgatory (or the kernel directly) if something needs to happen. Signed-off-by: Milton Miller Signed-off-by: Paul Mackerras commit 8694a1c6056f1f5f006a0442428f2df5171b9656 Merge: 43271c4... 8531b7a... Author: Paul Mackerras Date: Fri Oct 31 16:08:14 2008 +1100 Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge commit 721d5dfe7e516954c501d5e9d0dfab379cf4241a Merge: f2347df... 934d9c2... Author: Linus Torvalds Date: Thu Oct 30 18:36:16 2008 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: destroy partitions and notify udev when md array is stopped. commit f2347dfcd14fd9e30714656cb27be2b7abe59c63 Merge: 74c75f5... 526e5ab... Author: Linus Torvalds Date: Thu Oct 30 18:35:09 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: fix irq vectors. lguest: fix early_ioremap. lguest: fix example launcher compile after moved asm-x86 dir. commit 74c75f524ec5a48a00a8f01864a754c1d0e4a44b Merge: 0b23e30... 1c4acdb... Author: Linus Torvalds Date: Thu Oct 30 18:33:46 2008 -0700 Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: cpu_index build fix x86/voyager: fix missing cpu_index initialisation x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c600fee1e2 x86: fix /dev/mem mmap breakage when PAT is disabled x86/voyager: fix compile breakage casued by x86: move prefill_possible_map calling early x86: use CONFIG_X86_SMP instead of CONFIG_SMP x86/voyager: fix boot breakage caused by x86: boot secondary cpus through initial_code x86, uv: fix compile error in uv_hub.h i386/PAE: fix pud_page() x86: remove debug code from arch_add_memory() x86: start annotating early ioremap pointers with __iomem x86: two trivial sparse annotations x86: fix init_memory_mapping for [dc000000 - e0000000) - v2 commit 0b23e30b48b0b634fdc8c8198ea9dfec8c091968 Merge: 147db6e... a0e5ebd... Author: Linus Torvalds Date: Thu Oct 30 18:32:03 2008 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: remove sched-design.txt from 00-INDEX sched: change sched_debug's mode to 0444 commit 147db6e9474b444149238b77ceae335ca20e7b4a Merge: 4390819... 9244489... Author: Linus Torvalds Date: Thu Oct 30 18:31:42 2008 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: handle archs that do not support irqs_disabled_flags commit 43908195e04ee27779a60c55b5bb47aebf1c46ae Merge: 7105212... d68612b... Author: Linus Torvalds Date: Thu Oct 30 18:31:27 2008 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: resources: fix x86info results ioremap.c:226 __ioremap_caller+0xf2/0x2d6() WARNINGs commit 526e5ab200ce483dcdf146806f4936bd58daa800 Author: Rusty Russell Date: Fri Oct 31 11:24:27 2008 -0500 lguest: fix irq vectors. do_IRQ: cannot handle IRQ -1 vector 0x20 cpu 0 ------------[ cut here ]------------ kernel BUG at arch/x86/kernel/irq_32.c:219! We're not ISA: we have a 1:1 mapping from vectors to irqs. Signed-off-by: Rusty Russell commit ad5173ff8a387191dbacf889becb92c59aba5d59 Author: Rusty Russell Date: Fri Oct 31 11:24:27 2008 -0500 lguest: fix early_ioremap. dmi_scan_machine breaks under lguest: lguest: unhandled trap 14 at 0xc04edeae (0xffa00000) This is because we use current_cr3 for the read_cr3() paravirt function, and it isn't set until the first cr3 change. We got away with it until this happened. Signed-off-by: Rusty Russell commit d5d02d6dd394b295abcadd6b0ce4932c07916fdf Author: Rusty Russell Date: Fri Oct 31 11:24:25 2008 -0500 lguest: fix example launcher compile after moved asm-x86 dir. Signed-off-by: Rusty Russell commit 1c4acdb467f8a6704855a5670ff3d82e3c18eb0b Author: Ingo Molnar Date: Fri Oct 31 00:43:03 2008 +0100 x86: cpu_index build fix fix: arch/x86/kernel/cpu/common.c: In function 'early_identify_cpu': arch/x86/kernel/cpu/common.c:553: error: 'struct cpuinfo_x86' has no member named 'cpu_index' as cpu_index is only available on SMP. Signed-off-by: Ingo Molnar commit bfcb4c1becf93b1592f4a03a4d6e00a3ab89d5ec Author: James Bottomley Date: Thu Oct 30 16:13:37 2008 -0500 x86/voyager: fix missing cpu_index initialisation Impact: fix /proc/cpuinfo output on x86/Voyager Ever since | commit 92cb7612aee39642d109b8d935ad265e602c0563 | Author: Mike Travis | Date: Fri Oct 19 20:35:04 2007 +0200 | | x86: convert cpuinfo_x86 array to a per_cpu array We've had an extra field in cpuinfo_x86 which is cpu_index. Unfortunately, voyager has never initialised this, although the only noticeable impact seems to be that /proc/cpuinfo shows all zeros for the processor ids. Anyway, fix this by initialising the boot CPU properly and setting the index when the secondaries update. Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar commit b3572e361b6b2ac5e724bc4bb932b7774b720b95 Author: James Bottomley Date: Thu Oct 30 16:00:59 2008 -0500 x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c600fee1e2 Impact: build fix on x86/Voyager Given commits like this: | Author: Suresh Siddha | Date: Tue Jul 29 10:29:19 2008 -0700 | | x86, xsave: enable xsave/xrstor on cpus with xsave support Which deliberately expose boot cpu dependence to pieces of the system, I think it's time to explicitly have a variable for it to prevent this continual misassumption that the boot CPU is zero. Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar commit 7105212bd309752b589a3ba816afdd7fed190b85 Merge: 65fc716... b73b925... Author: Linus Torvalds Date: Thu Oct 30 16:16:39 2008 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure [ARM] mx31ads: Add missing include [ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR. [ARM] MX3: Use ioremap wrapper to map SoC devices nonshared [ARM] gpio_free might sleep, arm architecture [ARM] ep93xx: fix OHCI DMA mask leds: da903x: (da9030 only) led brightness reversed. [ARM] sharpsl_pm: fix compilation w/o CONFIG_PM [ARM] pcm037: map AIPS1 and AIPS2 as nonshared area [ARM] build fixes for netX serial driver [ARM] 5323/1: Remove outdated empeg documentation. [ARM] 5299/1: Add maintainer for Mobilepro 900/c [ARM] corgi_lcd: fix simultaneous compilation with corgi_bl [ARM] pxa/spitz: fix spi cs on spitz [ARM] 5322/1: Fix fastpath issue in mmci.c [ARM] xsc3: revert writethrough memory-type encoding change commit 9244489a7b69fe0746dc7cb3957f02e05bd1ceb0 Author: Steven Rostedt Date: Fri Oct 24 09:42:59 2008 -0400 ftrace: handle archs that do not support irqs_disabled_flags Impact: build fix on non-lockdep architectures Some architectures do not support a way to read the irq flags that is set from "local_irq_save(flags)" to determine if interrupts were disabled or enabled. Ftrace uses this information to display to the user if the trace occurred with interrupts enabled or disabled. Besides the fact that those archs that do not support this will fail to compile, unless they fix it, we do not want to have the trace simply say interrupts were not disabled or they were enabled, without knowing the real answer. This patch adds a 'X' in the output to let the user know that the architecture they are running on does not support a way for the tracer to determine if interrupts were enabled or disabled. It also lets those same archs compile with tracing enabled. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 9e41bff2708e420e61e6b89a54c15232857069b1 Author: Ravikiran G Thirumalai Date: Thu Oct 30 13:59:21 2008 -0700 x86: fix /dev/mem mmap breakage when PAT is disabled Impact: allow /dev/mem mmaps on non-PAT CPUs/platforms Fix mmap to /dev/mem when CONFIG_X86_PAT is off and CONFIG_STRICT_DEVMEM is off mmap to /dev/mem on kernel memory has been failing since the introduction of PAT (CONFIG_STRICT_DEVMEM=n case). Seems like the check to avoid cache aliasing with PAT is kicking in even when PAT is disabled. The bug seems to have crept in 2.6.26. This patch makes sure that the mmap to regular kernel memory succeeds if CONFIG_STRICT_DEVMEM=n and PAT is disabled, and the checks to avoid cache aliasing still happens if PAT is enabled. Signed-off-by: Ravikiran Thirumalai Tested-by: Tim Sirianni Cc: Acked-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 8531b7a805833649591fa324cadbab7d6b667f4b Author: Josh Boyer Date: Thu Oct 30 18:18:46 2008 -0400 powerpc/44x: Update 44x defconfigs Update the PowerPC 44x defconfigs for 2.6.28 Signed-off-by: Josh Boyer commit c4cd9ec48a2075a2692ff90a040e745b8f8cd83a Author: Josh Boyer Date: Thu Oct 30 18:16:14 2008 -0400 powerpc/40x: Update 40x defconfigs Update the PowerPC 40x defconfigs for 2.6.28 Signed-off-by: Josh Boyer commit ee477524b461324ed8fc950f451c3671dc79f12e Author: James Bottomley Date: Thu Oct 30 16:28:35 2008 -0500 x86/voyager: fix compile breakage casued by x86: move prefill_possible_map calling early Impact: fix build failure on x86/Voyager Before: | commit 329513a35d1a2b6b28d54f5c2c0dde4face8200b | Author: Yinghai Lu | Date: Wed Jul 2 18:54:40 2008 -0700 | | x86: move prefill_possible_map calling early prefill_possible_mask() was hidden under CONFIG_HOTPLUG_CPU rendering it invisitble to voyager. Since this commit it's exposed, but not provided by the voyager subarch, so add a dummy stub to fix the link breakage. Signed-off-by: James Bottomley Cc: Yinghai Lu Signed-off-by: Ingo Molnar commit 017d9d20d88cacb0a6a29f343b23c95e203f6645 Author: James Bottomley Date: Thu Oct 30 16:05:39 2008 -0500 x86: use CONFIG_X86_SMP instead of CONFIG_SMP Impact: fix x86/Voyager boot CONFIG_SMP is used for features which work on *all* x86 boxes. CONFIG_X86_SMP is used for standard PC like x86 boxes (for things like multi core and apics) Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar commit 08c33308575b370c89b4ed1198ece5f93145a2aa Author: James Bottomley Date: Thu Oct 30 16:08:38 2008 -0500 x86/voyager: fix boot breakage caused by x86: boot secondary cpus through initial_code Impact: boot up secondary CPUs as well on x86/Voyager systems This commit: | commit 3e9704739daf46a8ba6593d749c67b5f7cd633d2 | Author: Glauber Costa | Date: Wed May 28 13:01:54 2008 -0300 | | x86: boot secondary cpus through initial_code removed the use of initialize_secondary. However, it didn't update voyager, so the secondary cpus no longer boot. Fix this by adding the initial_code switch to voyager as well. Signed-off-by: James Bottomley Cc: Glauber Costa Signed-off-by: Ingo Molnar commit 65fc716fa673cf98fb5887180fd3c52ca0371198 Merge: 814b3be... 15a2ee7... Author: Linus Torvalds Date: Thu Oct 30 12:55:49 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: Fix incompatibility with versions of Perl less than 5.6.0 kbuild: do not include arch//include/asm in find-sources twice. kbuild: tag with git revision when git describe is missing kbuild: prevent modpost from looking for a .cmd file for a static library linked into a module kbuild: fix KBUILD_EXTRA_SYMBOLS adjust init section definitions scripts/checksyscalls.sh: fix for non-gnu sed scripts/package: don't break if %{_smp_mflags} isn't set kbuild: setlocalversion: dont include svn change count kbuild: improve check-symlink kbuild: mkspec - fix build rpm commit 814b3bed63c23f310121befa0fe004a20dec95b2 Merge: e61467e... 29fa058... Author: Linus Torvalds Date: Thu Oct 30 12:54:03 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [PATCH] Switch all my contributions stuff to a single common address [WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog commit e61467e9b6c88e97560873603cf9aceaf7435480 Merge: c732acd... 09d9327... Author: Linus Torvalds Date: Thu Oct 30 12:53:33 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: CHAR: Delete old and now unused M48T35 RTC driver for SGI IP27. CHAR: Delete old and now unused DS1286 driver. MIPS: Sort out CPU type to name translation. MIPS: Use the new byteorder headers MIPS: Probe for watch registers on cores of all vendors, not just MTI. MIPS: Switch FPU emulator trap to BREAK instruction. MIPS: SMP: Do not initialize __cpu_number_map/__cpu_logical_map for CPU 0. MIPS: Consider value of c0_ebase when computing value of exception base. MIPS: Clean up MIPSxx-optimized bitop functions MIPS: New feature test macro cpu_has_mips_r MIPS: RBTX4927: Add GPIO-LED support MIPS: TXx9: Fix RBTX4939 ethernet address initialization commit c732acd96085347027b11961463a243c568d9aab Merge: 1b2d3d9... 5cb02ff... Author: Linus Torvalds Date: Thu Oct 30 12:52:53 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: fdomain_cs: Sort out modules with duplicate description pcmcia: Whine harder about use of EXCLUSIVE pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted commit 1b2d3d94ec878c3529153061cd8cceb876e01a3e Merge: 8bd93ca... 5f707eb... Author: Linus Torvalds Date: Thu Oct 30 12:51:42 2008 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: SUNRPC: Fix potential race in put_rpccred() SUNRPC: Fix rpcauth_prune_expired NFS: Convert nfs_attr_generation_counter into an atomic_long SUNRPC: Respond promptly to server TCP resets commit 8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b Merge: 7f82f00... 87c6f40... Author: Linus Torvalds Date: Thu Oct 30 12:50:59 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, gart: fix gart detection for Fam11h CPUs x86: 64 bit print out absent pages num too x86, kdump: fix invalid access on i386 sparsemem x86: fix APIC_DEBUG with inquire_remote_apic x86: AMD microcode patch loader author update x86: microcode patch loader author update mailmap: add Peter Oruba x86, bts: improve help text for BTS config doc/x86: fix doc subdirs commit 7f82f000ed030d1108b4de47d9e2d556092980c6 Merge: d6c3112... 879129d... Author: Linus Torvalds Date: Thu Oct 30 12:16:38 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm snapshot: wait for chunks in destructor dm snapshot: fix register_snapshot deadlock dm raid1: fix do_failures commit d6c3112abe44d7f718bd5aec8ab9469fecff6041 Merge: fce4877... 3b15e58... Author: Linus Torvalds Date: Thu Oct 30 12:09:44 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI commit fce4877a6792ad72b88f6fd7556d19da5f20364d Author: Alan Cox Date: Thu Oct 30 15:54:12 2008 +0000 tty: Fix USB kref leak When we close we must clear the extra reference we got when we read port->tty. Setting the port tty NULL will clear the kref held by the driver but not the one we obtained ourselves while doing the lookup. Signed-off-by: Alan Cox Tested-by: Helge Hafting Signed-off-by: Linus Torvalds commit 0fb7f4f0cef8e7d2944189ff2cb68694ef4b683a Merge: cdcba02... da6801e... Author: Linus Torvalds Date: Thu Oct 30 12:07:25 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-s3c2410: Correct use of ! and & i2c: The i2c mailing list is moving scx200_i2c: Add missing class parameter commit cdcba02a5f64f4df20b6749a0169124e38ecb733 Merge: 53387b0... fa157bd... Author: Linus Torvalds Date: Thu Oct 30 11:51:43 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: add quirk entry for no-name keyboard (0x13ba/0x0017) HID: fix hid_device_id for cross compiling HID: sync on deleted io_retry timer in usbhid driver HID: fix oops during suspend of unbound HID devices commit 53387b0151260f6c3513adeca77f05ed052d6217 Merge: 52e8e19... 1133283... Author: Linus Torvalds Date: Thu Oct 30 11:50:57 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Driver core: fix 'dynamic_debug' cmd line parameter HOWTO: Sync patch for jp_JP/HOWTO Update stable tree documentation sysfs: Fix return values for sysdev_store_{ulong,int} driver core: drivers/base/sys.c: update comments Document kernel taint flags properly commit 52e8e19b019ca7ad6951d7a39b78d24b198238bc Merge: 908c3d8... 61fbeba... Author: Linus Torvalds Date: Thu Oct 30 11:49:12 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: prevent autosuspend during hub initialization USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera. USB: usbtmc: Use explicit unsigned type for input buffer instead of char* USB: fix crash when URBs are unlinked after the device is gone commit 908c3d8c005f19f807c67105cede0bd2c352a8e6 Merge: 3a7029d... 1841c0f... Author: Linus Torvalds Date: Thu Oct 30 11:47:21 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: da903x regulator bug fix regulator: Build on non-ARM platforms commit 3a7029d822d3aef4502269dae5fe8fbb83672bc5 Merge: 4ac08d3... 48e5eca... Author: Linus Torvalds Date: Thu Oct 30 11:46:28 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: amd8111e: Fix rx return code pktgen: fix multiple queue warning mac80211.h: fix kernel-doc excesses p54: fix build warnings ath5k: Reset key cache on interface up, thus fixing resume mac80211: correct warnings in minstrel rate control algorithm RFKILL: fix input layer initialisation p54: fix misbehavings when firmware can't be found dm9601: runtime mac address change support via-velocity: use driver string instead of dev->name before register_netdev() drivers/net/wan/syncppp: Fix unused-var warnings mlx4: Setting the correct offset for default mac address mlx4_en: remove duplicated #include ibm_newemac: Fix typo in flow control config option ehea: Detect 16GB hugepages for firmware restriction dmfe: check pci_alloc_consistent errors qeth: avoid skb_under_panic for malformatted inbound data qeth: remove unnecessary support ckeck in sysfs route6 qeth: fix offset error in non prealloc header path qeth: remove non-recover-thread checkings commit 4ac08d36aa9c556556c7b150caee263c6d542645 Merge: 0b54968... 71c21b4... Author: Linus Torvalds Date: Thu Oct 30 11:44:35 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Fix WM9713 ALC Decay Time name ALSA: ASoC: Fix some minor errors in mpc5200 psc i2s driver ALSA: ASoC: Fix mono controls after conversion to support full int masks ALSA: sound/ice1712: indentation & braces disagree - add braces ALSA: usb - Add quirk for Edirol UA-25EX advanced modes sound: struct device - replace bus_id with dev_name(), dev_set_name() ALSA: hda - Add reboot notifier ALSA: Warn when control names are truncated ALSA: intel8x0 - add Dell Optiplex GX620 (AD1981B) to AC97 clock whitelist ALSA: hda - Fix SPDIF mute on IDT/STAC codecs ALSA: hda: Add HDA vendor ID for Wolfson Microelectronics ALSA: hda - Add another HP model for AD1884A commit 0b54968f667585aa4b98a7225f4d4df63917703c Merge: effdb94... f3384b2... Author: Linus Torvalds Date: Thu Oct 30 11:44:09 2008 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: fix trace_nop config select ftrace: perform an initialization for ftrace to enable it commit effdb9492de01a51f8123e62e87e3330688f9bf1 Author: Fernando Luis Vazquez Cao Date: Wed Oct 29 14:01:21 2008 -0700 spi: fix compile error Fix compile error below: LD drivers/spi/built-in.o CC [M] drivers/spi/spi_gpio.o In file included from drivers/spi/spi_gpio.c:26: include/linux/spi/spi_bitbang.h:23: error: field `work' has incomplete type make[2]: *** [drivers/spi/spi_gpio.o] Error 1 make[1]: *** [drivers/spi] Error 2 make: *** [drivers] Error 2 Signed-off-by: Fernando Luis Vazquez Cao Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 731572d39fcd3498702eda4600db4c43d51e0b26 Author: Alan Cox Date: Wed Oct 29 14:01:20 2008 -0700 nfsd: fix vm overcommit crash Junjiro R. Okajima reported a problem where knfsd crashes if you are using it to export shmemfs objects and run strict overcommit. In this situation the current->mm based modifier to the overcommit goes through a NULL pointer. We could simply check for NULL and skip the modifier but we've caught other real bugs in the past from mm being NULL here - cases where we did need a valid mm set up (eg the exec bug about a year ago). To preserve the checks and get the logic we want shuffle the checking around and add a new helper to the vm_ security wrappers Also fix a current->mm reference in nommu that should use the passed mm [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: fix build] Reported-by: Junjiro R. Okajima Acked-by: James Morris Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c89161b10f5771ee0b51ada0fce0e8835e72ade Author: Scott James Remnant Date: Wed Oct 29 14:01:18 2008 -0700 ipmi: add MODULE_ALIAS to load ipmi_devintf with ipmi_si The ipmi_devintf module contains the userspace interface for IPMI devices, yet will not be loaded automatically with a system interface handler driver. Add a MODULE_ALIAS for the "platform:ipmi_si" MODALIAS exported by the ipmi_si driver, so that userspace knows of the recommendation. Signed-off-by: Scott James Remnant Cc: Tim Gardner Cc: Corey Minyard Cc: [2.6.27.x, maybe earlier?] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 120a37470c2831fea49fdebaceb5a7039f700ce6 Author: Mikulas Patocka Date: Wed Oct 29 14:01:17 2008 -0700 framebuffer compat_ioctl deadlock Fix deadlock in fb_compat_ioctl. fb_compat_ioctl acquires a mutex and calls fb_ioctl that tries to acquire that mutex too. A regression added during BKL removal. Signed-off-by: Mikulas Patocka Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51b7616e36fbad93d7ba9e41f11fb57143d11252 Author: Yauhen Kharuzhy Date: Wed Oct 29 14:01:16 2008 -0700 rtc S3C: add device_init_wakeup() invokation tAdd adds device_init_wakeup() ivokation to probe function of s3c2410_rtc_driver. Without of this wakealarm sysfs attribute does not initialise. Signed-off-by: Yauhen Kharuzhy Acked-by: Ben Dooks Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7106a27b52940085c2c3f6e42742d3a2a84d872a Author: Randy Dunlap Date: Wed Oct 29 14:01:15 2008 -0700 kernel.h: fix might_sleep kernel-doc Put the kernel-doc for might_sleep() _immediately_ before the macro (no intervening lines). Otherwise kernel-doc complains like so: Warning(linux-2.6.27-rc3-git2//include/linux/kernel.h:129): No description found for parameter 'file' Warning(linux-2.6.27-rc3-git2//include/linux/kernel.h:129): No description found for parameter 'line' because kernel-doc is looking at the wrong function prototype (i.e., __might_sleep). [Yes, I have a todo note to myself to check/warn for that inconsistency in scripts/kernel-doc.] Signed-off-by: Randy Dunlap Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89a056df78b113fcab21d71cd24aa1893c09225b Author: Alan Cox Date: Wed Oct 29 14:01:14 2008 -0700 Rationalise Randy's address a bit Acked-by: Randy Dunlap Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc378e777514832c11b09d194a7f946e7ad803a Author: Geert Uytterhoeven Date: Wed Oct 29 14:01:13 2008 -0700 rtc: ds3234 doesn't link when built-in When ds3234 is built-in, the final links fails with the following vague error message: `.exit.text' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o ds3234_remove() cannot be marked __exit, as it's accessed via __devexit_p(). In addition, mark ds3234_probe() __devinit while we're at it. Signed-off-by: Geert Uytterhoeven Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81365c31afcea2bd6d551a029282d59c89e8fd54 Author: Mike Frysinger Date: Wed Oct 29 14:01:12 2008 -0700 MAINTAINERS: add LTP info to the list Cc: Subrata Modak Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c08b6acc9b996ba6231105cb12a4125c957e0c97 Author: Mike Travis Date: Thu Oct 30 11:33:19 2008 -0700 x86, uv: fix compile error in uv_hub.h Impact: include file dependency cleanup Fix compile errors of files that include asm/uv/uv_hub.h but do not include linux/timer.h. [ such files are not mainline right now. ] Signed-of-by: Mike Travis Signed-off-by: Ingo Molnar commit b7f7b07479de2d91443b81938db1e1940c56b13c Author: Dean Nelson Date: Wed Oct 29 14:01:12 2008 -0700 sgi-xp: only build for ia64-sn2 when CONFIG_IA64_GENERIC specified For the time being build for ia64-sn2 alone when CONFIG_IA64_GENERIC is specified. This eliminates a dependency of the XP/XPC drivers on having the GRU driver insmod'd in order to insmod them, when running on an ia64-sn2 system. On such a system the GRU driver serves no useful purpose. Signed-off-by: Dean Nelson Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d25141a818383b3c3b09f065698c544a7a0ec6e7 Author: Sukadev Bhattiprolu Date: Wed Oct 29 14:01:11 2008 -0700 'kill sig -1' must only apply to caller's namespace Currently "kill -1" kills processes in all namespaces and breaks the isolation of namespaces. Earlier attempt to fix this was discussed at: http://lkml.org/lkml/2008/7/23/148 As suggested by Oleg Nesterov in that thread, use "task_pid_vnr() > 1" check since task_pid_vnr() returns 0 if process is outside the caller's namespace. Signed-off-by: Sukadev Bhattiprolu Acked-by: Eric W. Biederman Tested-by: Daniel Hokka Zakrisson Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e74481e23283fb080d4591c258de20785cc3b6c3 Author: Randy Dunlap Date: Wed Oct 29 14:01:10 2008 -0700 fs: remove excess kernel-doc Delete excess kernel-doc notation in fs/ subdirectory: Warning(linux-2.6.27-git10//fs/jbd/transaction.c:886): Excess function parameter or struct member 'credits' description in 'journal_get_undo_access' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e99c97ade53fb6f5e665f2960eb86c624a532d7b Author: Randy Dunlap Date: Wed Oct 29 14:01:09 2008 -0700 mm: fix kernel-doc function notation Delete excess kernel-doc notation in mm/ subdirectory. Actually this is a kernel-doc notation fix. Warning(/var/linsrc/linux-2.6.27-git10//mm/vmalloc.c:902): Excess function parameter or struct member 'returns' description in 'vm_map_ram' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b77b0ef207624c9d9f8064ccbfd6da169780df44 Author: Randy Dunlap Date: Wed Oct 29 14:01:09 2008 -0700 i2o: fix kernel-doc warnings Fixup i2o kernel-doc warnings: Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:579): No description found for parameter 'bdev' Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:579): No description found for parameter 'mode' Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:608): No description found for parameter 'disk' Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:608): No description found for parameter 'mode' Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:657): No description found for parameter 'bdev' Warning(linux-next-20081022//drivers/message/i2o/i2o_block.c:657): No description found for parameter 'mode' Signed-off-by: Randy Dunlap Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87b811c3f96559e466403e22b1fa99d472571625 Author: Eric Sandeen Date: Wed Oct 29 14:01:08 2008 -0700 ecryptfs: fix memory corruption when storing crypto info in xattrs When ecryptfs allocates space to write crypto headers into, before copying it out to file headers or to xattrs, it looks at the value of crypt_stat->num_header_bytes_at_front to determine how much space it needs. This is also used as the file offset to the actual encrypted data, so for xattr-stored crypto info, the value was zero. So, we kzalloc'd 0 bytes, and then ran off to write to that memory. (Which returned as ZERO_SIZE_PTR, so we explode quickly). The right answer is to always allocate a page to write into; the current code won't ever write more than that (this is enforced by the (PAGE_CACHE_SIZE - offset) length in the call to ecryptfs_generate_key_packet_set). To be explicit about this, we now send in a "max" parameter, rather than magically using PAGE_CACHE_SIZE there. Also, since the pointer we pass down the callchain eventually gets the virt_to_page() treatment, we should be using a alloc_page variant, not kzalloc (see also 7fcba054373d5dfc43d26e243a5c9b92069972ee) Signed-off-by: Eric Sandeen Acked-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce05fcc30ea41c85f9d50bee1ce289f7cb7fb223 Author: Paul Mundt Date: Wed Oct 29 14:01:07 2008 -0700 kernel/profile: fix profile_init() section mismatch profile_init() calls in to alloc_bootmem() on early initialization. While alloc_bootmem() is __init, the reference itself is safe in that it is tucked below a !slab_is_available() check. So, flag profile_init() as __ref. Signed-off-by: Paul Mundt Cc: Dave Hansen Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84ad6d70001df969d7e8569dd18d98d9550277fb Author: KAMEZAWA Hiroyuki Date: Wed Oct 29 14:01:06 2008 -0700 memcg: update menuconfig help text page_cgroup is now allocated at boot and memmap doesn't includes pointer for page_cgroup. Fix the menu help text. Reviewed-by: Balbir Singh Signed-off-by: KAMEZAWA hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99e87fd19a2dfba8ec0f2110f6f1b63062a52a6f Author: Mariusz Kozlowski Date: Wed Oct 29 14:01:05 2008 -0700 hdpuftrs: fix build drivers/misc/hdpuftrs/hdpu_nexus.c:118: error: expected identifier or '(' before 'return' drivers/misc/hdpuftrs/hdpu_nexus.c:119: error: expected identifier or '(' before '}' token Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8b77d39397e1510b1a3bcfd385ebd1a45aae77f Author: Alexey Dobriyan Date: Wed Oct 29 14:01:05 2008 -0700 init/do_mounts_md.c: msleep compile fix init/do_mounts_md.c:285: error: implicit declaration of function 'msleep' Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6158d3a2323835546c7cf83a170316fa77b726e0 Author: Matthew Garrett Date: Wed Oct 29 14:01:03 2008 -0700 sony-laptop: ignore missing _DIS method on pic device At least the Vaio VGN-Z540N doesn't have this method, so let's not fail to suspend just because it doesn't exist. Signed-off-by: Adam Jackson Acked-by: Mattia Dongili Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit def1be2d727a1764205479b3e3e3ba16ffbad028 Author: Marcin Slusarz Date: Wed Oct 29 14:01:01 2008 -0700 fbcon: don't inline updatescrollmode Updatescrollmode is marked inline, but it's big and is called only from non-critical codepaths (fbcon_resize, fbcon_switch, fbcon_modechanged). Dropping it saves almost 800 bytes of text size. text data bss dec hex filename 23859 287 8448 32594 7f52 drivers/video/console/fbcon.o.before 23065 287 8448 31800 7c38 drivers/video/console/fbcon.o.after Signed-off-by: Marcin Slusarz Cc: Antonino Daplas Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 992b692dcf43612be805465ca4b76f434c715023 Author: Benjamin Herrenschmidt Date: Wed Oct 29 14:01:00 2008 -0700 edac: fix enabling of polling cell module The edac driver on cell turned out to be not enabled because of a missing op_state. This patch introduces it. Verified to work on top of Ben's next branch. Signed-off-by: Arnd Bergmann Signed-off-by: Jens Osterkamp Acked-by: Benjamin Herrenschmidt Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb944db0cfeb0ee934e2a74d5b3516f80cf2c208 Author: Yauhen Kharuzhy Date: Wed Oct 29 14:00:59 2008 -0700 rtc-s3c: fix section mismatch warnings Warnings was appeared when compile rtc-s3c.c because platform_driver structure s3c2410_rtcdrv has wrong name. Signed-off-by: Yauhen Kharuzhy Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e11e3643f300f2e3a3ea21658e9f80b412c2c8a1 Author: Jiri Pirko Date: Wed Oct 29 14:00:58 2008 -0700 docs: fix ManagementStyle book name Just corrected the book name. I'm probably the only one who ever read this file :-) Signed-off-by: Jiri Pirko Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a34645f56a5dae70233701275fb8b2d979a664fd Author: Hans Ulrich Niedermann Date: Wed Oct 29 14:00:57 2008 -0700 docbook: fix command spacing The total width of the command name plus spaces should be 8 characters, but were 7 and 9, respectively. With 8 chars, all commands are now lining up nicely. The mandocs, psdocs, xmldocs commands are OK. Before: HOSTCC scripts/basic/docproc DOCPROC Documentation/DocBook/deviceiobook.xml HTML Documentation/DocBook/deviceiobook.html DOCPROC Documentation/DocBook/wanbook.xml PDF Documentation/DocBook/wanbook.pdf After: HOSTCC scripts/basic/docproc DOCPROC Documentation/DocBook/deviceiobook.xml HTML Documentation/DocBook/deviceiobook.html DOCPROC Documentation/DocBook/wanbook.xml PDF Documentation/DocBook/wanbook.pdf Signed-off-by: Hans Ulrich Niedermann Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e02ed4b4a2fae34aae766a5bb93ae235f60adb8 Author: Nick Piggin Date: Wed Oct 29 14:00:55 2008 -0700 fs: remove prepare_write/commit_write Nothing uses prepare_write or commit_write. Remove them from the tree completely. [akpm@linux-foundation.org: schedule simple_prepare_write() for unexporting] Signed-off-by: Nick Piggin Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b913735e53ab0da4a792bac0de8e178cc13dcfb Author: Li Zefan Date: Wed Oct 29 14:00:54 2008 -0700 cgroups: tiny cleanups - remove 'private' field from struct subsys - remove cgroup_init_smp() Signed-off-by: Li Zefan Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51308ee59dee1136ed599d875ea8968d7be55c91 Author: Li Zefan Date: Wed Oct 29 14:00:54 2008 -0700 freezer_cg: simplify freezer_change_state() Just call unfreeze_cgroup() if goal_state == THAWED, and call try_to_freeze_cgroup() if goal_state == FROZEN. No behavior has been changed. Signed-off-by: Li Zefan Acked-by: Cedric Le Goater Acked-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00c2e63c31d0f431952ff2a671c5c6997dd4f8b2 Author: Li Zefan Date: Wed Oct 29 14:00:53 2008 -0700 freezer_cg: use thaw_process() in unfreeze_cgroup() Don't duplicate the implementation of thaw_process(). [akpm@linux-foundation.org: make __thaw_process() static] Signed-off-by: Li Zefan Cc: Cedric Le Goater Acked-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80a6a2cf3bebcf20285cf05373b9c5ec96816577 Author: Li Zefan Date: Wed Oct 29 14:00:52 2008 -0700 freezer_cg: remove redundant check in freezer_can_attach() It is sufficient to check if @task is frozen, and no need to check if the original freezer is frozen. Signed-off-by: Li Zefan Acked-by: Cedric Le Goater Acked-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ccb97437bcc818d0ba6067513475f6ee8177a15 Author: Li Zefan Date: Wed Oct 29 14:00:51 2008 -0700 freezer_cg: fix improper BUG_ON() causing oops The BUG_ON() should be protected by freezer->lock, otherwise it can be triggered easily when a task has been unfreezed but the corresponding cgroup hasn't been changed to FROZEN state. Signed-off-by: Li Zefan Acked-by: Cedric Le Goater Acked-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df8bc08c192f00f155185bfd6f052d46a728814a Author: Hitoshi Mitake Date: Wed Oct 29 14:00:50 2008 -0700 edac x38: new MC driver module I wrote a new module for Intel X38 chipset. This chipset is very similar to Intel 3200 chipset, but there are some different points, so I copyed i3200_edac.c and modified. This is Intel's web page describing this chipset. http://www.intel.com/Products/Desktop/Chipsets/X38/X38-overview.htm I've tested this new module with broken memory, and it seems to be working well. Signed-off-by: Hitoshi Mitake Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c17dad6905fc82d8f523399e5c3f014e81d61df6 Author: Alexey Dobriyan Date: Wed Oct 29 14:00:50 2008 -0700 .gitignore updates Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75b7edfdc12c213402b17a62e5cfe7a802a4ab57 Author: Huang Weiyi Date: Wed Oct 29 14:00:49 2008 -0700 viafb: removed duplicated #include's Removed duplicated #include's in drivers/video/via/global.h. debug.h viafbdev.h viamode.h Signed-off-by: Huang Weiyi Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0833422274ff00729a603b020fac297e69a03e40 Author: Kurt Garloff Date: Wed Oct 29 14:00:48 2008 -0700 mm: increase the default mlock limit from 32k to 64k By default, non-privileged tasks can only mlock() a small amount of memory to avoid a DoS attack by ordinary users. The Linux kernel defaulted to 32k (on a 4k page size system) to accommodate the needs of gpg. However, newer gpg2 needs 64k in various circumstances and otherwise fails miserably, see bnc#329675. Change the default to 64k, and make it more agnostic to PAGE_SIZE. Signed-off-by: Kurt Garloff Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b73b925a6b9d69478c6ae4e74ef20607fd24aeaa Author: Sergey Lapin Date: Mon Oct 27 07:43:45 2008 +0100 [ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure i2c_board_info array was filled incorrectly. Due to circumstances, the way it is filled works. This patch fills array properly. Signed-off-by: Sergey Lapin Signed-off-by: Russell King commit 1841c0f2bf6835aa3d18216e3a932371efa902f0 Author: Jonathan Cameron Date: Tue Oct 28 11:03:48 2008 +0000 regulator: da903x regulator bug fix Changes the device registration part of the probe function to supply the regulator device rather than its parent (the mfd device) as this caused problems when the regulator core attempted to find constraints associated with the regulators. Signed-off-by: Jonathan Cameron Acked-by: Eric Miao Signed-off-by: Liam Girdwood commit ab3bd08a257d4b92384de2720b7294b444578ba5 Merge: 9c65685... 2eca047... Author: Russell King Date: Thu Oct 30 15:04:22 2008 +0000 Merge branch 'for-rmk-rc' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 commit 2eca047b289307594d0d6ce62c8237fa9c5b9b5e Author: Sascha Hauer Date: Fri Oct 17 16:10:38 2008 +0200 [ARM] mx31ads: Add missing include mx31ads_defconfig compilation failed with arch/arm/mach-mx3/mx31ads.c: In function 'mxc_init_imx_uart': arch/arm/mach-mx3/mx31ads.c:102: error: 'mxc_uart_device0' undeclared (first use in this function) arch/arm/mach-mx3/mx31ads.c:102: error: (Each undeclared identifier is reported only once arch/arm/mach-mx3/mx31ads.c:102: error: for each function it appears in.) make[1]: *** [arch/arm/mach-mx3/mx31ads.o] Error 1 Add missing include Signed-off-by: Sascha Hauer commit 5cac9d6558009d0fcdb7a0f38247ca578c8c685b Author: Darius Augulis Date: Wed Oct 15 10:38:30 2008 +0200 [ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR. The Data register holds the value we have written to a gpio. To get the input value we must read the Pad Status Register MX3 (or Sample Status register in MX1/2 terms) Signed-off-by: Darius Augulis Signed-off-by: Sascha Hauer commit eadefeff9c5572d82c2f5d907a0bfb3ba55ce901 Author: Sascha Hauer Date: Wed Oct 15 09:50:23 2008 +0200 [ARM] MX3: Use ioremap wrapper to map SoC devices nonshared The internal devices of the MX3 Processor have to be mapped MT_DEVICE_NONSHARED devices, otherwise cache corruptions occur. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Sascha Hauer commit da6801e38b7fba28fbdc0ceae6681d5a261a42a6 Author: Julia Lawall Date: Thu Oct 30 15:55:47 2008 +0100 i2c-s3c2410: Correct use of ! and & In commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337, a bug was fixed that involved converting !x & y to !(x & y). The code below shows the same pattern, and thus should perhaps be fixed in the same way. In particular, the result of !readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN is always 0. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; constant C; @@ ( !E & !C | - !E & C + !(E & C) ) // Signed-off-by: Julia Lawall Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare commit 846557d3ceb6c7493e090921db5d6158ec237228 Author: Jean Delvare Date: Thu Oct 30 15:55:47 2008 +0100 i2c: The i2c mailing list is moving Replace all references to the old i2c mailing list. Signed-off-by: Jean Delvare commit 4a029abee0f1d69cb0445657d6fa5a38597bd17d Author: Lennart Sorensen Date: Thu Oct 30 15:55:47 2008 +0100 scx200_i2c: Add missing class parameter The scx200_i2c driver is missing the .class parameter, which means no i2c drivers are willing to probe for devices on the bus and attach to them. Signed-off-by: Len Sorensen Signed-off-by: Jean Delvare commit 09d9327b3420002c9952a81db37effec9dc1135e Author: Ralf Baechle Date: Mon Oct 27 13:10:29 2008 +0000 CHAR: Delete old and now unused M48T35 RTC driver for SGI IP27. It was only used by this one SGI platform which recently was converted to RTC_LIB and with RTC_LIB enabled the legacy drivers are no more selectable. Signed-off-by: Ralf Baechle commit 4bdebe5b4a7216bd6bfca9e9b368abad8e9f9bd9 Author: Ralf Baechle Date: Sun Oct 26 16:12:13 2008 +0000 CHAR: Delete old and now unused DS1286 driver. It was only used by two SGI platforms which recently were converted to RTC_LIB and with RTC_LIB enabled the legacy drivers are no more selectable. Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa commit cea7e2dfdef53fe55f359d00da562a268be06fd2 Author: Ralf Baechle Date: Thu Oct 30 13:38:45 2008 +0000 MIPS: Sort out CPU type to name translation. As noticed by David Daney , the old long switch statement did not comply with the Linux C coding style. It was also yet another place of code to be changed when adding a new processor type leading to annoying bugs for example in /proc/cpuinfo. Fixed by moving the setting of the CPU type string into the core of the probing code and a few BUG_ON() test to ensure the CPU probing code indeed did its job and removing multiple now redundant tests. Signed-off-by: Ralf Baechle commit 255a12fbf994664125983e389c975b4403aea167 Author: Harvey Harrison Date: Wed Oct 29 14:21:32 2008 -0700 MIPS: Use the new byteorder headers Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Ralf Baechle commit 558ce12494e9e0321b77b9f1ef62c16d0b893cf5 Author: Ralf Baechle Date: Wed Oct 29 12:33:34 2008 +0000 MIPS: Probe for watch registers on cores of all vendors, not just MTI. Signed-off-by: Ralf Baechle Acked-by: David Daney commit ba3049ed4086737dab200b6087138a4b8e06915d Author: Ralf Baechle Date: Tue Oct 28 17:38:42 2008 +0000 MIPS: Switch FPU emulator trap to BREAK instruction. Arguably using the address error handler has always been ugly. But with processors that handle unaligned loads and stores in hardware the current mechanism ceases to work so switch it to a BREAK instruction and allocate break code 514 to the FPU emulator. Yoichi Yuasa provided a build fix for CONFIG_BUG=n. Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa commit 076c6e4f4d81113615f50e5bc2c569f628bcd54a Author: Ralf Baechle Date: Tue Oct 28 10:03:57 2008 +0000 MIPS: SMP: Do not initialize __cpu_number_map/__cpu_logical_map for CPU 0. A system isn't necessarily booted on physical processor 0 as this code assumes. Also the array happens to be allocated in .bss so it's zero initialized anyway. Systems which need to override this can do so in their mp_ops->smp_setup() method. Signed-off-by: Ralf Baechle commit 566f74f6b2f8b85d5b8d6caaf97e5672cecd3e3e Author: David Daney Date: Thu Oct 23 17:56:35 2008 -0700 MIPS: Consider value of c0_ebase when computing value of exception base. It just so happens to be zero on all currently supported systems so this hasn't bitten yet ... [Ralf: Original patch from Cavium; handling of set_uncached_handler() and de-ifdef'ed trap_init() implementation by me.] Signed-off-by: Tomaso Paoletti Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 4816227b54d2366cba785e6f3b9f81495b83a5f1 Author: Ralf Baechle Date: Tue Oct 28 09:40:35 2008 +0000 MIPS: Clean up MIPSxx-optimized bitop functions Signed-off-by: Ralf Baechle commit c46b302b948e2070cb713171207c42e9586f131a Author: Ralf Baechle Date: Tue Oct 28 09:37:47 2008 +0000 MIPS: New feature test macro cpu_has_mips_r cpu_has_mips_r is true if a processor is MIPS32 or MIPS64, any architecture revision. Signed-off-by: Ralf Baechle commit 864cbf804ddfb3d63d3ba3cca7afdeb98be23434 Author: Atsushi Nemoto Date: Tue Sep 2 22:44:38 2008 +0900 MIPS: RBTX4927: Add GPIO-LED support Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9cc4581528233e2a4eb8720621c1e2f613d7c38a Author: Atsushi Nemoto Date: Thu Sep 11 00:44:04 2008 +0900 MIPS: TXx9: Fix RBTX4939 ethernet address initialization Fix location of ethernet adddress when booted from external ROM. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9c6568501cbf731a910db2fcb7d094977dcb154c Author: Uwe Kleine-König Date: Wed Oct 29 14:14:54 2008 -0700 [ARM] gpio_free might sleep, arm architecture According to the documentation gpio_free should only be called from task context only. To make this more explicit add a might sleep to all implementations. This patch changes the gpio_free implementations for the arm architecture. DaVinci is skipped on purpose to simplify the merge process for patches switching it over to use gpiolib as per request by David Brownell. Signed-off-by: Uwe Kleine-König Cc: David Brownell Cc: Andrew Victor Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 63890a0ee1af994122094bd01f87ea6251631a3f Author: Matthias Kaehlcke Date: Wed Oct 29 14:14:52 2008 -0700 [ARM] ep93xx: fix OHCI DMA mask Signed-off-by: Matthias Kaehlcke Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 05cd2544f4b64d9a9eca0d170191867495e01feb Merge: 27f680a... a0601c8... Author: Russell King Date: Thu Oct 30 14:26:45 2008 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit a0601c8944dc08c2d349c24bd9c0b09c406229fc Author: Jonathan Cameron Date: Thu Oct 30 11:05:00 2008 +0000 leds: da903x: (da9030 only) led brightness reversed. The brightness control register calculation (for the pwm) is effectively the reverse of what would be expected. 1 is maximum brightness, 255 minimum. This patch inverts this. Signed-off-by: Jonathan Cameron Acked-by: Mike Rapoport Signed-off-by: Eric Miao commit 56e7d85cf982dda4b453c157f3f64aea1478bc4d Author: Dmitry Baryshkov Date: Fri Oct 17 02:34:41 2008 +0400 [ARM] sharpsl_pm: fix compilation w/o CONFIG_PM Fix compilation of sharpsl_pm when CONFIG_PM in unselected. Signed-off-by: Dmitry Baryshkov Acked-by: Russell King Signed-off-by: Eric Miao commit 879129d208f725267366296b631aef31409cf304 Author: Mikulas Patocka Date: Thu Oct 30 13:33:16 2008 +0000 dm snapshot: wait for chunks in destructor If there are several snapshots sharing an origin and one is removed while the origin is being written to, the snapshot's mempool may get deleted while elements are still referenced. Prior to dm-snapshot-use-per-device-mempools.patch the pending exceptions may still have been referenced after the snapshot was destroyed, but this was not a problem because the shared mempool was still there. This patch fixes the problem by tracking the number of mempool elements in use. The scenario: - You have an origin and two snapshots 1 and 2. - Someone writes to the origin. - It creates two exceptions in the snapshots, snapshot 1 will be primary exception, snapshot 2's pending_exception->primary_pe will point to the exception in snapshot 1. - The exceptions are being relocated, relocation of exception 1 finishes (but it's pending_exception is still allocated, because it is referenced by an exception from snapshot 2) - The user lvremoves snapshot 1 --- it calls just suspend (does nothing) and destructor. md->pending is zero (there is no I/O submitted to the snapshot by md layer), so it won't help us. - The destructor waits for kcopyd jobs to finish on snapshot 1 --- but there are none. - The destructor on snapshot 1 cleans up everything. - The relocation of exception on snapshot 2 finishes, it drops reference on primary_pe. This frees its primary_pe pointer. Primary_pe points to pending exception created for snapshot 1. So it frees memory into non-existing mempool. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 60c856c8e2f57a3f69c505735ef66e3719ea0bd6 Author: Mikulas Patocka Date: Thu Oct 30 13:33:12 2008 +0000 dm snapshot: fix register_snapshot deadlock register_snapshot() performs a GFP_KERNEL allocation while holding _origins_lock for write, but that could write out dirty pages onto a device that attempts to acquire _origins_lock for read, resulting in deadlock. So move the allocation up before taking the lock. This path is not performance-critical, so it doesn't matter that we allocate memory and free it if we find that we won't need it. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit b34578a48459ed1bd5396631aaa4a65d6bcc7726 Author: Ilpo Jarvinen Date: Thu Oct 30 13:33:07 2008 +0000 dm raid1: fix do_failures Missing braces. Commit 1f965b1943 (dm raid1: separate region_hash interface part1) broke it. Signed-off-by: Ilpo Jarvinen Signed-off-by: Alasdair G Kergon Cc: Heinz Mauelshagen commit 71c21b4cf62177a9d1ea46ff4c6073c907122226 Merge: 0552f29... 8cd2b26... 13d622b... Author: Takashi Iwai Date: Thu Oct 30 14:26:24 2008 +0100 Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus commit 13d622b33dfbd99205a7add5751ba47445e480a6 Author: Mark Brown Date: Thu Oct 30 12:37:10 2008 +0000 ALSA: ASoC: Fix WM9713 ALC Decay Time name The control had an extra space at the end of the name. Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit f06c8fd73e3658a659d5e5b56c44bd80fe244268 Author: Jon Smirl Date: Thu Oct 30 12:37:09 2008 +0000 ALSA: ASoC: Fix some minor errors in mpc5200 psc i2s driver Fix missing unsigned for irqsave flags in psc i2s driver Make attribute visiblity static Collect all sysfs errors before checking status [Word wrapped DEVICE_ATTR() lines for 80 columns -- broonie] Signed-off-by: Jon Smirl Acked-by: Grant Likely Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit 762b8df748d83c14070afbf0c6f8c0f4a91a13bf Author: Mark Brown Date: Thu Oct 30 12:37:08 2008 +0000 ALSA: ASoC: Fix mono controls after conversion to support full int masks When ASoC was converted to support full int width masks SOC_SINGLE_VALUE() omitted the assignment of rshift, causing the control operatins to report some mono controls as stereo. This happened to work some of the time due to a confusion between shift and min in snd_soc_info_volsw(). Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit 8cd2b264d92bb949ddccfb6db6a82254bb07af75 Author: Ilpo Järvinen Date: Thu Oct 30 13:09:55 2008 +0200 ALSA: sound/ice1712: indentation & braces disagree - add braces Neither has any significance currently to the flow because err is checked for the same condition before the place of disagreement. Signed-off-by: Ilpo Järvinen Signed-off-by: Takashi Iwai commit ab00fee30cddf975200b3c97aef25bea144a0d89 Author: Jan Beulich Date: Thu Oct 30 10:37:21 2008 +0000 i386/PAE: fix pud_page() Impact: cleanup To the unsuspecting user it is quite annoying that this broken and inconsistent with x86-64 definition still exists. Signed-off-by: Jan Beulich Signed-off-by: Ingo Molnar commit a0e5ebdc1d16871222f9815f5066e4ca47e368fa Author: Li Zefan Date: Thu Oct 30 15:23:39 2008 +0800 sched: remove sched-design.txt from 00-INDEX Impact: remove stale documentation reference sched-design.txt has been removed. Signed-off-by: Li Zefan Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit a9cf4ddb3b2ce03c3027929b22a920aeff933009 Author: Li Zefan Date: Thu Oct 30 15:23:34 2008 +0800 sched: change sched_debug's mode to 0444 Impact: change /proc/sched/debug from rw-r--r-- to r--r--r-- /proc/sched_debug is read-only. Signed-off-by: Li Zefan Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit e2736261b4c85e36f7c8a66dd082ec0751230460 Author: Takashi Iwai Date: Mon Oct 20 16:07:45 2008 +0200 ALSA: usb - Add quirk for Edirol UA-25EX advanced modes Added the quirk for UA-25EX advanced modes. UA-25EX is almost compatible with UA-25. Tested-by: Serge Perinsky Signed-off-by: Takashi Iwai commit 6c1249e588cbf0484fc3e6b0f0fc4a5892749b4d Author: Sascha Hauer Date: Thu Sep 18 15:48:23 2008 +0200 [ARM] pcm037: map AIPS1 and AIPS2 as nonshared area The internal devices of the MX3 Processor have to be mapped MT_DEVICE_NONSHARED devices, otherwise cache corruptions occur. Signed-off-by: Sascha Hauer commit fb881f785f0003fc904c6db82909d937d968bcc9 Author: Paul Bolle Date: Tue Oct 14 18:13:45 2008 +0200 [ARM] build fixes for netX serial driver Make the netX serial driver tristate (as the help text implied). Make the serial driver build correctly if the netX serial console is disabled. Do not allow the netX serial console if the netX serial driver is build as a module. Signed-off-by: Paul Bolle Signed-off-by: Sascha Hauer commit 096a957169ff1c31d9d8fbf4e59e45497cfae10d Author: Kay Sievers Date: Thu Oct 30 02:27:20 2008 +0100 sound: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-By: Kay Sievers Signed-off-by: Takashi Iwai commit fa157bdfe87c5ea98a80b96cb08f1ab509e21a52 Author: Alan Stern Date: Thu Oct 30 01:06:13 2008 +0100 HID: add quirk entry for no-name keyboard (0x13ba/0x0017) This patch (as1157) adds a no-name PS/2-to-USB keyboard+mouse adapter to the hid-dell driver. (The device shows up with a Product string saying "Generic USB K/B", nothing more.) This will force an initial "Set-LEDs" report to be sent to the device, without which it won't send any keystroke information. Several bug reports mentioning this device have been filed in various forums; the patch should resolve them. This is just a temporary stop-gap for 2.6.28. A later patch for 2.6.29 will introduce a more generic mechanism for "Set-LEDs", making this change (and the entire hid-dell driver) unnecessary. Signed-off-by: Alan Stern Signed-off-by: Jiri Kosina commit 398cf93a394a6f2e42b8e61b1071fc32ecf18647 Author: Harvey Harrison Date: Wed Oct 29 15:36:00 2008 -0700 sparc: use the new byteorder headers Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 12a9ee3cce256ae0f178d604f2c8764fb2942cfe Author: Krzysztof Helt Date: Wed Oct 29 15:35:24 2008 -0700 rtc-m48t59: shift zero year to 1968 on sparc (rev 2) Shift the first year to 1968 for Sun SPARC machines. Move this logic from platform specific files to rtc driver as this fixes problems with calculating a century bit. Signed-off-by: Krzysztof Helt Tested-by: Alexander Beregalov Signed-off-by: David S. Miller commit be376649344ba2c3d00021f8bbf64392aa01ad55 Author: FUJITA Tomonori Date: Wed Oct 29 15:34:39 2008 -0700 dbri: check dma_alloc_coherent errors Needs to check for dma_alloc_coherent() allocation failure. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 1758ef68a07f42983371dc1d2bf0ae80b4d8ea16 Author: Harvey Harrison Date: Wed Oct 29 15:33:28 2008 -0700 sparc64: remove byteshifting from out* helpers __raw_write avoids the need to byteswap, as we are reading from a host-endian area, just deref the pointers directly, taking care of alignment. As before, outsw must be called with a 2-byte aligned pointer. Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 113328306dbdfd5f146f257e447364dc66d025d4 Author: Jason Baron Date: Mon Oct 27 12:05:14 2008 -0400 Driver core: fix 'dynamic_debug' cmd line parameter In testing 2.6.28-rc1, I found that passing 'dynamic_printk' on the command line didn't activate the debug code. The problem is that dynamic_printk_setup() (which activates the debugging) is being called before dynamic_printk_init() is called (which initializes infrastructure). Fix this by setting setting the state to 'DYNAMIC_ENABLED_ALL' in dynamic_printk_setup(), which will also cause all subsequent modules to have debugging automatically started, which is probably the behavior we want. Signed-off-by: Jason Baron Signed-off-by: Greg Kroah-Hartman commit 555ac6482ea7d0f29ec524b816f2f547ec94e882 Author: Tsugikazu Shibata Date: Mon Oct 27 18:05:40 2008 +0900 HOWTO: Sync patch for jp_JP/HOWTO Sync the jp_JP version of HOWTO to contain the latest updates From: Tsugikazu Shibata Signed-off-by: Greg Kroah-Hartman commit 79cd80a1d9a4e13c150ba43f140f18b202adce65 Author: Josh Boyer Date: Fri Oct 24 10:10:42 2008 -0400 Update stable tree documentation Update the documentation for the stable tree rules to reflect that device IDs and quirks are also suitable for -stable kernels. Signed-off-by: Josh Boyer Signed-off-by: Greg Kroah-Hartman commit 4e318d7c6c9dd5cdae48bcf61558bbc0c09b12ac Author: Andi Kleen Date: Mon Oct 13 12:03:03 2008 +0200 sysfs: Fix return values for sysdev_store_{ulong,int} SYSFS: Fix return values for sysdev_store_{ulong,int} Always return the full size instead of the consumed length of the string in sysdev_store_{ulong,int} This avoids EINVAL errors in some echo versions. Signed-off-by: Andi Kleen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 65151365ad59af00e229d0fe33b4f1f9350c685f Author: Qinghuang Feng Date: Mon Oct 13 18:05:04 2008 +0800 driver core: drivers/base/sys.c: update comments There are no functions named sys_device_shutdown or sys_device_suspend in the kernel. They should be fixed to sysdev_shutdown and sysdev_suspend respectively. Signed-off-by: Qinghuang Feng Signed-off-by: Greg Kroah-Hartman commit bb20698d46bac1b2b48cfe1fcb33e54ac885946a Author: Greg Kroah-Hartman Date: Fri Oct 17 15:01:07 2008 -0700 Document kernel taint flags properly This fills in the documentation for all of the current kernel taint flags, and fixes the number for TAINT_CRAP, which was incorrectly described. Cc: Michael Kerrisk Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a Author: Mike Crowe Date: Mon Oct 27 13:52:49 2008 +0100 [ARM] 5323/1: Remove outdated empeg documentation. The documents aren't particularly useful anyway and the hardware in question has never run anything newer than a v2.2.14 kernel to my knowledge. Signed-off-by: Mike Crowe Signed-off-by: Russell King commit 9624dfe6165826745481cfa55b2ef21f3a43d89d Author: Kristoffer Ericson Date: Thu Oct 9 16:50:46 2008 +0100 [ARM] 5299/1: Add maintainer for Mobilepro 900/c This patch adds the new maintainer for the Mobilepro 900/c handheld. Signed-off-by: Kristoffer Ericson Acked-by: Michael Petchkovsky Acked-by: Eric Miao Signed-off-by: Russell King commit 61fbeba11c553c489ba5284c0ed67067dc7b7c0f Author: Alan Stern Date: Mon Oct 27 12:07:44 2008 -0400 USB: prevent autosuspend during hub initialization This patch (as1153) fixes a potential problem in hub initialization. Starting in 2.6.28, initialization was split into several tasks to help speed up booting. This opens the possibility that the hub may be autosuspended before all the initialization tasks can complete. Normally that wouldn't matter, but with incomplete initialization there is a risk that the hub would never autoresume -- especially if devices were plugged into the hub beforehand. The solution is a simple one-line change to suppress autosuspend until the initialization is finished. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 74511bb340059be5a3fceb032213c7f325344694 Author: Jens Taprogge Date: Sun Oct 26 18:16:09 2008 +0100 USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera. The camera reports an incorrect size and fails to handle PREVENT-ALLOW MEDIUM REMOVAL commands. The patch marks the camera as an unusual dev and adds the flags to enable the workarounds for both shortcomings. Signed-off-by: Jens Taprogge Cc: Alan Stern Cc: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit b361a6e348a5de9e18eb17542663d34a57740e87 Author: Chris Malley Date: Sat Oct 25 22:07:32 2008 +0100 USB: usbtmc: Use explicit unsigned type for input buffer instead of char* Silences compiler warning about comparison with 0x80, and type now matches the corresponding _bulk_out function. drivers/usb/class/usbtmc.c: In function ‘usbtmc_ioctl_abort_bulk_in’: drivers/usb/class/usbtmc.c:163: warning: comparison is always false due to limited range of data type Signed-off-by: Chris Malley Signed-off-by: Greg Kroah-Hartman commit cde217a556ec552d28ac9e136c5a94684a69ae94 Author: Alan Stern Date: Tue Oct 21 15:28:46 2008 -0400 USB: fix crash when URBs are unlinked after the device is gone This patch (as1151) protects usbcore against drivers that try to unlink an URB after the URB's device or bus have been removed. The core does not currently check for this, and certain drivers can cause a crash if they are running while an HCD is unloaded. Certainly it would be best to fix the guilty drivers. But a little defensive programming doesn't hurt, especially since it appears that quite a few drivers need to be fixed. The patch prevents the problem by grabbing a reference to the device while an unlink is in progress and using a new spinlock to synchronize unlinks with device removal. (There's no need to acquire a reference to the bus as well, since the device structure itself keeps a reference to the bus.) In addition, the kerneldoc is updated to indicate that URBs should not be unlinked after the disconnect method returns. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 15a2ee74d22674c58f347b16b3af5601fa4e15db Author: Jeremy Huntwork Date: Wed Oct 29 14:20:13 2008 -0700 Fix incompatibility with versions of Perl less than 5.6.0 Fix headers_install.pl and headers_check.pl to be compatible with versions of Perl less than 5.6.0. It has been tested with Perl 5.005_03 and 5.8.8. I realize this may not be an issue for most people, but there will still be some that hit it, I imagine. There are three basic issues: 1. Prior to 5.6.0 open() only used 2 arguments, and the versions of the scripts in 2.6.27.1 use 3. 2. 5.6.0 also introduced the ability to use uninitialized scalar variables as file handles, which the current scripts make use of. 3. Lastly, 5.6.0 also introduced the pragma 'use warnings'. We can use the -w switch and be backwards compatible. Signed-off-by: Jeremy Huntwork Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit de2addf592894b31b8149cca008f00d8102401e9 Author: Ian Campbell Date: Tue Oct 28 13:36:25 2008 +0000 kbuild: do not include arch//include/asm in find-sources twice. Architectures which have moved their includes to arch//include now list the headers twice in the source listing used by "make cscope" and friends, causing those tools to list symbols twice. Skipping these files in the ALLSOURCE_ARCHS pass rather than removing the ALLINCLUDE_ARCHS pass preserves the semantics of the later. Signed-off-by: Ian Campbell Signed-off-by: Sam Ravnborg commit f03b283f081f538ec71b9e87cb8411bb62e2abc9 Author: Trent Piepho Date: Fri Sep 12 12:26:24 2008 -0700 kbuild: tag with git revision when git describe is missing setlocalversion used to use an abbreviated git commit sha1 to generate the tag. This was changed in commit d882421f4e08ddf0a94245cdbe516db260aa6f41 "kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format" to use git describe to come up with a tag. Which is nice, but git describe sometimes can't describe the revision. Commit 56b2f0706d82535fd8d85503f2dcc0be40c8e55d ("setlocalversion: do not describe if there is nothing to describe") addressed this, but there is still no tag generated. So, generate a plain abbreviated sha1 tag like setlocalversion used to when git describe comes up short. Signed-off-by: Trent Piepho CC: Jan Engelhardt Signed-off-by: Sam Ravnborg commit e6e6733ed9451827165d853f25bf99ba55e12feb Author: Ashutosh Naik Date: Sat Oct 25 15:02:53 2008 -0700 kbuild: prevent modpost from looking for a .cmd file for a static library linked into a module This fixes a compile time warning which occurs whenever a static library is linked into a kernel module. MODPOST tries to look for a "..cmd" file to look for its dependencies, but that file doesn't exist or get generated for static libraries. This patch prevents modpost from looking for a .cmd file when a module is linked with a static library [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Ashutosh Naik Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 92f83cc56eeafdb8fcf07ceb89fd9a0212bd498c Author: Peter Volkov Date: Sat Oct 25 15:02:52 2008 -0700 kbuild: fix KBUILD_EXTRA_SYMBOLS Taken from http://bugzilla.kernel.org/show_bug.cgi?id=11567 If you even define KBUILD_EXTRA_SYMBOLS in Makefile it will not be expanded into command line argument for modpost. Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 3f5e26cee443eb4d3900cd3085664c3e51b72135 Author: Jan Beulich Date: Sat Oct 25 15:02:51 2008 -0700 adjust init section definitions Add rodata equivalents for assembly use, and fix the section attributes used by __REFCONST. Signed-off-by: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit bd8f89ff47f11941a109220dbd51d81fd7ed2058 Author: Thomas Volpini Date: Sat Oct 25 15:02:50 2008 -0700 scripts/checksyscalls.sh: fix for non-gnu sed Make the checksyscalls script work even on systems where sed is non-gnu. Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 13797b77d419fc1b16eebf2993bf7b5cea65f0bf Author: Jeremy Kerr Date: Sat Oct 25 15:02:47 2008 -0700 scripts/package: don't break if %{_smp_mflags} isn't set Currently, if we do a 'make rpm-pkg' without the _smp_mflags rpm macro defined, the build fails with: [snip] Executing(%build): /bin/bash -e /var/tmp/rpm-tmp.67959 + umask 022 + cd /home/jk/devel/kernel-snapshot/rpm/BUILD + cd kernel-2.6.26 + make clean + make '%{_smp_mflags}' make[3]: *** No rule to make target `%{_smp_mflags}'. Stop. error: Bad exit status from /var/tmp/rpm-tmp.67959 (%build) This change uses the 'null if not set' reference to the _smp_mflags macro instead. Signed-off-by: Jeremy Kerr Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit e3da2fb712bb75b6035ba0743f3256df1de30bce Author: Mike Frysinger Date: Sat Oct 25 17:43:50 2008 -0400 kbuild: setlocalversion: dont include svn change count The number of pending changes is pretty useless, so encoding it into the version is just annoying by the constant shuffle in corresponding modules. Signed-off-by: Mike Frysinger Signed-off-by: Sam Ravnborg commit dcc2da1a9693807096e9ac5137b499a829c51268 Author: Sam Ravnborg Date: Sat Oct 25 22:58:23 2008 +0200 kbuild: improve check-symlink o if include/asm point to a nonexisting directory remove the asm symlink o if include/asm is a directory error out This fixes a situation where one could be left with a symlink to asm-x86 but that directory no longer exist and thus the build would error out. include/asm may be a directory if the kernel tree has been copied Signed-off-by: Sam Ravnborg commit 46dca86cb93db80992a45e4b55737ff2b2f61cd0 Author: Evgeniy Manachkin Date: Wed Oct 15 23:37:26 2008 +0600 kbuild: mkspec - fix build rpm This is patch to fix incorrect mkspec script to make rpm correctly at 2.6.27 vanilla kernel. This is regression in 2.6.27. 2.6.26 make rpm work good. In 2.6.27 'make rpm' say error from rpmbuild "Many unpacked files (*.fw)." Signed-off-by: Evgeniy Manachkin Acked-by: Alan Cox Signed-off-by: Sam Ravnborg Cc: Stable commit f3384b28a05624783b53836ccfed95ecde66a7ad Author: Steven Rostedt Date: Wed Oct 29 11:15:57 2008 -0400 ftrace: fix trace_nop config select Impact: build fix on non-function-tracing architectures The trace_nop is the tracer that is defined when no tracer is set in the ftrace infrastructure. The trace_nop was mistakenly selected by HAVE_FTRACE due to the confusion between ftrace infrastructure and the ftrace function tracer (which has been solved by renaming the function tracer). This patch changes the select to the approriate TRACING. This patch should fix compile errors on architectures that do not define the FUNCTION_TRACER. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 0552f297951d0ab3a1027f9b06fa40c9be8378ba Merge: 0a9b863... 0cbf009... 366840d... Author: Takashi Iwai Date: Wed Oct 29 16:40:00 2008 +0100 Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus commit 0cbf00980f0fc4cc064a15ab3dfce19b5fae9130 Author: Takashi Iwai Date: Wed Oct 29 16:18:25 2008 +0100 ALSA: hda - Add reboot notifier The current snd-hda-intel driver seems blocking the power-off on some devices like eeepc. Although this is likely a BIOS problem, we can add a workaround by disabling IRQ lines before power-off operation. This patch adds the reboot notifier to achieve it. The detailed problem description is found in bug#11889: http://bugme.linux-foundation.org/show_bug.cgi?id=11889 Tested-by: Luiz Fernando N. Capitulino Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit 366840d7e1ece4331bb3ccc2a53e3bc355529f21 Author: Mark Brown Date: Wed Oct 29 14:40:30 2008 +0000 ALSA: Warn when control names are truncated This is likely to confuse user interfaces since the end of the control name is interpreted (eg, "Volume", "Switch"). Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit 78fad343a4fd4c837e3034dcbca13269a783e0f6 Author: Bastien Nocera Date: Wed Oct 29 12:59:05 2008 +0000 ALSA: intel8x0 - add Dell Optiplex GX620 (AD1981B) to AC97 clock whitelist alsa-info.sh output at: https://bugzilla.redhat.com/show_bug.cgi?id=441087#c49 Signed-off-by: Bastien Nocera Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit fe8b868eccb9f85a0e231e35f0abac5b39bac801 Author: Gary Hade Date: Tue Oct 28 16:43:14 2008 -0700 x86: remove debug code from arch_add_memory() Impact: remove incorrect WARN_ON(1) Gets rid of dmesg spam created during physical memory hot-add which will very likely confuse users. The change removes what appears to be debugging code which I assume was unintentionally included in: x86: arch/x86/mm/init_64.c printk fixes commit 10f22dde556d1ed41d55355d1fb8ad495f9810c8 Signed-off-by: Gary Hade Signed-off-by: Ingo Molnar commit 1d6cf1feb854c53c6d59e0d879603692b379e208 Author: Harvey Harrison Date: Tue Oct 28 22:46:04 2008 -0700 x86: start annotating early ioremap pointers with __iomem Impact: some new sparse warnings in e820.c etc, but no functional change. As with regular ioremap, iounmap etc, annotate with __iomem. Fixes the following sparse warnings, will produce some new ones elsewhere in arch/x86 that will get worked out over time. arch/x86/mm/ioremap.c:402:9: warning: cast removes address space of expression arch/x86/mm/ioremap.c:406:10: warning: cast adds address space to expression () arch/x86/mm/ioremap.c:782:19: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar commit c1e99bd9d6a0c82f4fa9078ed1f570e57b2f3944 Author: Takashi Iwai Date: Wed Oct 29 08:03:42 2008 +0100 ALSA: hda - Fix SPDIF mute on IDT/STAC codecs The SPDIF mute switch code seems broken. It doesn't set unmute bits properly. Also it contains the duplicated lines (merge error?) to be cleaned up. Signed-off-by: Takashi Iwai commit 9352f5698db2c6d7f2789f6cd37e3996d49ac4b5 Author: Harvey Harrison Date: Tue Oct 28 23:05:22 2008 -0700 x86: two trivial sparse annotations Impact: fewer sparse warnings, no functional changes arch/x86/kernel/vsmp_64.c:87:14: warning: incorrect type in argument 1 (different address spaces) arch/x86/kernel/vsmp_64.c:87:14: expected void const volatile [noderef] *addr arch/x86/kernel/vsmp_64.c:87:14: got void *[assigned] address arch/x86/kernel/vsmp_64.c:88:22: warning: incorrect type in argument 1 (different address spaces) arch/x86/kernel/vsmp_64.c:88:22: expected void const volatile [noderef] *addr arch/x86/kernel/vsmp_64.c:88:22: got void * arch/x86/kernel/vsmp_64.c:100:23: warning: incorrect type in argument 2 (different address spaces) arch/x86/kernel/vsmp_64.c:100:23: expected void volatile [noderef] *addr arch/x86/kernel/vsmp_64.c:100:23: got void * arch/x86/kernel/vsmp_64.c:101:23: warning: incorrect type in argument 1 (different address spaces) arch/x86/kernel/vsmp_64.c:101:23: expected void const volatile [noderef] *addr arch/x86/kernel/vsmp_64.c:101:23: got void * arch/x86/mm/gup.c:235:6: warning: incorrect type in argument 1 (different base types) arch/x86/mm/gup.c:235:6: expected void const volatile [noderef] * arch/x86/mm/gup.c:235:6: got unsigned long [unsigned] [assigned] start Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar commit 5cbff9603a77d01315859690a8f125f817bed73b Author: Dmitry Baryshkov Date: Tue Oct 28 20:26:40 2008 +0300 [ARM] corgi_lcd: fix simultaneous compilation with corgi_bl corgi_lcd has symbol conflict with corgi_bl driver. Fix it by renaming common symbol in new corgi_lcd driver. Signed-off-by: Dmitry Baryshkov Signed-off-by: Eric Miao commit b6e642e498097e3d66e25ee9499f7719976263cf Author: Dmitry Baryshkov <[dbaryshkov@gmail.com]> Date: Wed Oct 29 11:40:46 2008 +0800 [ARM] pxa/spitz: fix spi cs on spitz On spitz configure SPI CS GPIOs as outputs to unbreak spi chip selection. Signed-off-by: Dmitry Baryshkov Signed-off-by: Eric Miao commit 8175fe2dda1c93a9c596921c8ed4a0b4baccdefe Author: Andreas Schwab Date: Sun Oct 26 00:30:18 2008 +0200 HID: fix hid_device_id for cross compiling struct hid_device_id contains hidden padding which is bad for cross compiling. Make the padding explicit and consistent across architectures. Signed-off-by: Andreas Schwab Signed-off-by: Jiri Kosina commit 48e5ecae691cfb50aa39036ba9fc193f5c24dbb3 Author: Chris Friesen Date: Tue Oct 28 15:50:54 2008 -0700 amd8111e: Fix rx return code The amd8111e rx poll routine currently mishandles the case when we process exactly the number of packets specified in the budget. This patch is basically as suggested by David Miller. Signed-off-by: Chris Friesen Signed-off-by: David S. Miller commit f49d81a8992c4ec43480195a93f30ab4b736f960 Author: Mark Brown Date: Wed Oct 15 11:53:34 2008 +0100 regulator: Build on non-ARM platforms When the regulator API was merged it was added to the separate Kconfig which ARM uses for drivers but not the generic one in drivers/. Since there is nothing ARM-specific about the API add it there too. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 882716604ecf388b2ff09bc76eb2a752aa9cc76b Author: Jesse Brandeburg Date: Tue Oct 28 13:21:51 2008 -0700 pktgen: fix multiple queue warning when testing the new pktgen module with multiple queues and ixgbe with: pgset "flag QUEUE_MAP_CPU" I found that I was getting errors in dmesg like: pktgen: WARNING: QUEUE_MAP_CPU disabled because CPU count (8) exceeds number <4>pktgen: WARNING: of tx queues (8) on eth15 you'll note, 8 really doesn't exceed 8. This patch seemed to fix the logic errors and also the attempts at limiting line length in printk (which didn't work anyway) Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit f96f57d91c2df75011d1e260c23edca429f37361 Author: Yinghai Lu Date: Tue Oct 28 12:39:23 2008 -0700 x86: fix init_memory_mapping for [dc000000 - e0000000) - v2 Impact: change over-mapping to precise mapping, fix /proc/meminfo output v2: fix less than 1G ram system handling when gart aperture is 0xdc000000 - 0xe0000000 it return 0xc0000000 - 0xe0000000 that is not right. this patch fix that will get exact mapping on 256g sytem with that aperture after patch LBSuse:~ # cat /proc/meminfo MemTotal: 264742432 kB MemFree: 263920628 kB Buffers: 1416 kB Cached: 24468 kB ... DirectMap4k: 5760 kB DirectMap2M: 3205120 kB DirectMap1G: 265289728 kB it is consistent to LBSuse:~ # cat /sys/kernel/debug/kernel_page_tables .. ---[ Low Kernel Mapping ]--- 0xffff880000000000-0xffff880000200000 2M RW GLB x pte 0xffff880000200000-0xffff880040000000 1022M RW PSE GLB x pmd 0xffff880040000000-0xffff8800c0000000 2G RW PSE GLB NX pud 0xffff8800c0000000-0xffff8800d7e00000 382M RW PSE GLB NX pmd 0xffff8800d7e00000-0xffff8800d7fa0000 1664K RW GLB NX pte 0xffff8800d7fa0000-0xffff8800d8000000 384K pte 0xffff8800d8000000-0xffff8800dc000000 64M pmd 0xffff8800dc000000-0xffff8800e0000000 64M RW PSE GLB NX pmd 0xffff8800e0000000-0xffff880100000000 512M pmd 0xffff880100000000-0xffff880800000000 28G RW PSE GLB NX pud 0xffff880800000000-0xffff880824600000 582M RW PSE GLB NX pmd 0xffff880824600000-0xffff8808247f0000 1984K RW GLB NX pte 0xffff8808247f0000-0xffff880824800000 64K RW PCD GLB NX pte 0xffff880824800000-0xffff880840000000 440M RW PSE GLB NX pmd 0xffff880840000000-0xffff884000000000 223G RW PSE GLB NX pud 0xffff884000000000-0xffff884028000000 640M RW PSE GLB NX pmd 0xffff884028000000-0xffff884040000000 384M pmd 0xffff884040000000-0xffff888000000000 255G pud 0xffff888000000000-0xffffc20000000000 58880G pgd Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 5f707eb429e2c98dfd564ffbbd9f536bf493d869 Author: Trond Myklebust Date: Tue Oct 28 15:21:42 2008 -0400 SUNRPC: Fix potential race in put_rpccred() We have to be careful when we try to unhash the credential in put_rpccred(), because we're not holding the credcache lock, so the call to rpcauth_unhash_cred() may fail if someone else has looked the cred up, and obtained a reference to it. Signed-off-by: Trond Myklebust commit eac0d18d44705f8a1b72cccec3a453e1a43eb20a Author: Trond Myklebust Date: Tue Oct 28 15:21:41 2008 -0400 SUNRPC: Fix rpcauth_prune_expired We need to make sure that we don't remove creds from the cred_unused list if they are still under the moratorium, or else they will never get garbage collected. Signed-off-by: Trond Myklebust commit ae05f269400533cbb32bfba131ab528d78dffd16 Author: Trond Myklebust Date: Tue Oct 28 15:21:40 2008 -0400 NFS: Convert nfs_attr_generation_counter into an atomic_long The most important property we need from nfs_attr_generation_counter is monotonicity, which is not guaranteed by the current system of smp memory barriers. We should convert it to an atomic_long_t, and drop the memory barriers. Signed-off-by: Trond Myklebust commit 2a9e1cfa23fb62da37739af81127dab5af095d99 Author: Trond Myklebust Date: Tue Oct 28 15:21:39 2008 -0400 SUNRPC: Respond promptly to server TCP resets If the server sends us an RST error while we're in the TCP_ESTABLISHED state, then that will not result in a state change, and so the RPC client ends up hanging forever (see http://bugzilla.kernel.org/show_bug.cgi?id=11154) We can intercept the reset by setting up an sk->sk_error_report callback, which will then allow us to initiate a proper shutdown and retry... We also make sure that if the send request receives an ECONNRESET, then we shutdown too... Signed-off-by: Trond Myklebust commit 29fa0586de4fe518f122a915b8c6e92d12e8ca7f Author: Alan Cox Date: Mon Oct 27 15:17:56 2008 +0000 [PATCH] Switch all my contributions stuff to a single common address Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit d68612b257b5f4ea2e6535859c5a26b10011a9df Author: Suresh Siddha Date: Tue Oct 28 11:45:42 2008 -0700 resources: fix x86info results ioremap.c:226 __ioremap_caller+0xf2/0x2d6() WARNINGs Impact: avoid false-positive WARN_ON() Andi Kleen reported: > When running x86info on a 2.6.27-git8 system I get > > resource map sanity check conflict: 0x9e000 0x9efff 0x10000 0x9e7ff System RAM > ------------[ cut here ]------------ > WARNING: at /home/lsrc/linux/arch/x86/mm/ioremap.c:226 __ioremap_caller+0xf2/0x2d6() > ... Some of the pages below the 1MB ISA addresses will be shared typically by both BIOS and system usable RAM. For example: BIOS-e820: 0000000000000000 - 000000000009f800 (usable) BIOS-e820: 000000000009f800 - 00000000000a0000 (reserved) x86info reads the low physical address using /dev/mem, which internally uses ioremap() for accessing non RAM pages. ioremap() of such low pages conflicts with multiple resource entities leading to the above warning. Change the iomem_map_sanity_check() to allow mapping a page spanning multiple resource entities (minimum granularity that one can map is a page anyhow). Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit 0b6e4d56bf71866a2b58daa8323cf747988ce7e4 Author: Frederic Weisbecker Date: Tue Oct 28 20:17:38 2008 +0100 ftrace: perform an initialization for ftrace to enable it Impact: corrects a bug which made the non-dyn function tracer not functional With latest git, the non-dynamic function tracer didn't get any trace. The problem was the fact that ftrace_enabled wasn't initialized to 1 because ftrace hasn't any init function when DYNAMIC_FTRACE is disabled. So when a tracer tries to register an ftrace_ops struct, __register_ftrace_function failed to set the hook. This patch corrects it by setting an init function to initialize ftrace during the boot. Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar commit b3ed4bc082077045f680400c8bb02fa8d9c9ecf5 Merge: ea2d8b5... 753dcfe... Author: David S. Miller Date: Tue Oct 28 11:01:07 2008 -0700 Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit e946217e4fdaa67681bbabfa8e6b18641921f750 Merge: a186576... 60063a6... Author: Linus Torvalds Date: Tue Oct 28 09:52:25 2008 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits) ftrace: fix current_tracer error return tracing: fix a build error on alpha ftrace: use a real variable for ftrace_nop in x86 tracing/ftrace: make boot tracer select the sched_switch tracer tracepoint: check if the probe has been registered asm-generic: define DIE_OOPS in asm-generic trace: fix printk warning for u64 ftrace: warning in kernel/trace/ftrace.c ftrace: fix build failure ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file ftrace: remove ftrace hash ftrace: remove mcount set ftrace: remove daemon ftrace: disable dynamic ftrace for all archs that use daemon ftrace: add ftrace warn on to disable ftrace ftrace: only have ftrace_kill atomic ftrace: use probe_kernel ftrace: comment arch ftrace code ftrace: return error on failed modified text. ftrace: dynamic ftrace process only text section ... commit a1865769254dd4eefbc1e857d17bc2a77d5f8580 Merge: 0d8762c... e45948b... Author: Linus Torvalds Date: Tue Oct 28 09:50:11 2008 -0700 Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h KVM: Future-proof device assignment ABI KVM: ia64: Fix halt emulation logic KVM: Fix guest shared interrupt with in-kernel irqchip KVM: MMU: sync root on paravirt TLB flush commit 0d8762c9ee40cf83d5dbf3a22843bc566912b592 Merge: cf76ddd... 6afe40b... Author: Linus Torvalds Date: Tue Oct 28 09:49:27 2008 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: fix irqs on/off ip tracing lockdep: minor fix for debug_show_all_locks() x86: restore the old swiotlb alloc_coherent behavior x86: use GFP_DMA for 24bit coherent_dma_mask swiotlb: remove panic for alloc_coherent failure xen: compilation fix of drivers/xen/events.c on IA64 xen: portability clean up and some minor clean up for xencomm.c xen: don't reload cr3 on suspend kernel/resource: fix reserve_region_with_split() section mismatch printk: remove unused code from kernel/printk.c commit cf76dddb22c019f03ada6479210f894f19bd591b Merge: 8ca6215... 3786fc7... Author: Linus Torvalds Date: Tue Oct 28 09:48:25 2008 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: make variable static commit 8ca6215502462f564d7bcae2d8dcc825aa95d743 Merge: f8245e9... 4078e35... Author: Linus Torvalds Date: Tue Oct 28 09:46:20 2008 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: fix documentation reference for sched_min_granularity_ns sched: virtual time buddy preemption sched: re-instate vruntime based wakeup preemption sched: weaken sync hint sched: more accurate min_vruntime accounting sched: fix a find_busiest_group buglet sched: add CONFIG_SMP consistency commit f8245e91a5121acc435e509aa56cd04d445a74c7 Merge: b30fc14... 60817c9... Author: Linus Torvalds Date: Tue Oct 28 09:45:31 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, memory hotplug: remove wrong -1 in calling init_memory_mapping() x86: keep the /proc/meminfo page count correct x86/uv: memory allocation at initialization xen: fix Xen domU boot with batched mprotect commit b30fc14c5c94728baa42b7c17d83ea17185b5c40 Merge: 3c136f2... ea4bfdf... Author: Linus Torvalds Date: Tue Oct 28 09:44:59 2008 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE [S390] No more 4kb stacks. [S390] Change default IPL method to IPL_VM. [S390] tape: disable interrupts in tape_open and tape_release [S390] appldata: unsigned ops->size cannot be negative [S390] tape block: complete request with correct locking [S390] Fix sysdev class file creation. [S390] pgtables: Fix race in enable_sie vs. page table ops [S390] qdio: remove incorrect memset [S390] qdio: prevent double qdio shutdown in case of I/O errors commit 3c136f29ba5ae8dfcae4958bbcb581420b43a74d Merge: 49fdf67... 87943ac... Author: Linus Torvalds Date: Tue Oct 28 09:42:48 2008 -0700 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: ahci enclosure management bit mask libata: ahci enclosure management led sync pata_ninja32: suspend/resume support libata: Fix LBA48 on pata_it821x RAID volumes. libata: clear saved xfer_mode and ncq_enabled on device detach sata_sil24: configure max read request size to 4k libata: add missing kernel-doc libata: fix device iteration bugs ahci: Add support for Promise PDC42819 ata: Switch all my stuff to a common address commit 87c6f40128f92621698f97a62d2ead5184d1dd97 Author: Joerg Roedel Date: Tue Oct 28 16:13:54 2008 +0100 x86, gart: fix gart detection for Fam11h CPUs Impact: fix AMD Family 11h boot hangs / USB device problems The AMD Fam11h CPUs have a K8 northbridge. This northbridge is different from other family's because it lacks GART support (as I just learned). But the kernel implicitly expects a GART if it finds an AMD northbridge. Fix this by removing the Fam11h northbridge id from the scan list of K8 northbridges. This patch also changes the message in the GART driver about missing K8 northbridges to tell that the GART is missing which is the correct information in this case. Reported-by: Jouni Malinen Signed-off-by: Joerg Roedel Signed-off-by: Ingo Molnar commit 11a6b0c933b55654a58afd84f63a5dde1607d78f Author: Yinghai Lu Date: Tue Oct 14 18:59:18 2008 -0700 x86: 64 bit print out absent pages num too so users are not confused with memhole causing big total ram we don't need to worry about 32 bit, because memhole is always above max_low_pfn. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit e7706fc691513b0f06adb3de3d6ac04293180146 Author: Ken'ichi Ohmichi Date: Mon Oct 20 13:51:52 2008 +0900 x86, kdump: fix invalid access on i386 sparsemem Impact: fix kdump crash on 32-bit sparsemem kernels Since linux-2.6.27, kdump has failed on i386 sparsemem kernel. 1st-kernel gets a panic just before switching to 2nd-kernel. The cause is that a kernel accesses invalid mem_section by page_to_pfn(image->swap_page) at machine_kexec(). image->swap_page is allocated if kexec for hibernation, but it is not allocated if kdump. So if kdump, a kernel should not access the mem_section corresponding to image->swap_page. The attached patch fixes this invalid access. Signed-off-by: Ken'ichi Ohmichi Cc: kexec-ml Cc: Andrew Morton Signed-off-by: Ingo Molnar commit 1281675e9c0d4d42d993697f4daab45ef22d49da Author: Yinghai Lu Date: Tue Oct 14 18:59:17 2008 -0700 x86: fix APIC_DEBUG with inquire_remote_apic APIC_DEBUG is always 2. need to update inquire_remote_apic to check apic_verbosity with it instead. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 3c52204bb90834bca8e9e78a3628d886ad6d4db5 Author: Peter Oruba Date: Fri Oct 17 15:30:38 2008 +0200 x86: AMD microcode patch loader author update Removed author's email address from MODULE_AUTHOR. Signed-off-by: Peter Oruba Signed-off-by: Ingo Molnar commit 36b75da27bb51dc34e358d0b7487406132806c46 Author: Peter Oruba Date: Fri Oct 17 15:30:37 2008 +0200 x86: microcode patch loader author update Removed one author's email address from module init message. Signed-off-by: Peter Oruba Signed-off-by: Ingo Molnar commit 17c22978562df42e608a9c10bc46a0e7f5660094 Author: Peter Oruba Date: Fri Oct 17 15:30:36 2008 +0200 mailmap: add Peter Oruba Signed-off-by: Peter Oruba Signed-off-by: Ingo Molnar commit 531f6ed7de911e975352fbb2b228367121da630a Author: Markus Metzger Date: Fri Oct 17 09:09:27 2008 +0200 x86, bts: improve help text for BTS config Improve the help text of the X86_PTRACE_BTS config. Make X86_DS invisible and depend on X86_PTRACE_BTS. Reported-by: Roland Dreier Signed-off-by: Markus Metzger Signed-off-by: Ingo Molnar commit 71cced6eb044f5b096d35755963f3a2035603b73 Author: Uwe Hermann Date: Mon Oct 20 09:32:21 2008 -0700 doc/x86: fix doc subdirs The Documentation/i386 and Documentation/x86_64 directories and their contents have been moved into Documentation/x86. Fix references to those files accordingly. Signed-off-by: Uwe Hermann Signed-off-by: Randy Dunlap Signed-off-by: Ingo Molnar commit 60063a66236c15f5613f91390631e06718689782 Author: Steven Rostedt Date: Tue Oct 28 10:44:24 2008 -0400 ftrace: fix current_tracer error return The commit (in linux-tip) c2931e05ec5965597cbfb79ad332d4a29aeceb23 ( ftrace: return an error when setting a nonexistent tracer ) added useful code that would error when a bad tracer was written into the current_tracer file. But this had a bug if the amount written was more than the amount read by that code. The first iteration would set the tracer correctly, but since it did not consume the rest of what was written (usually whitespace), the userspace utility would continue to write what was not consumed. This second iteration would fail to find a tracer and return -EINVAL. Funny thing is that the tracer would have already been set. This patch just consumes all the data that is written to the file. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 8199de3b29d7f22f3163fcf03f7a61644c93c2ea Author: Mark Brown Date: Tue Oct 28 14:50:13 2008 +0000 ALSA: hda: Add HDA vendor ID for Wolfson Microelectronics Add Wolfson Microelectronics to the HDA vendor ID table. Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit 43271c4128071c39ac8f7bfda4780c28b6401545 Author: Rogério Brito Date: Mon Oct 13 01:51:17 2008 -0300 powerpc: enable heap randomization for linkstations The current defconfig for Linkstation/Kuroboxes has the "Disable Heap Randomization" option enabled. Since some of these machines are facing the internet, it helps to have heap randomization enabled. This patch enables it. Signed-off-by: Rogério Brito Signed-off-by: Kumar Gala commit 3420a982c74eddcf9d2a5d504dd2b272cceddae7 Author: Rogério Brito Date: Mon Oct 13 01:07:03 2008 -0300 powerpc: compile kernel for linkstations optimized for size Since Linkstations and Kuroboxes often have *very* little memory (as they are embedded systems), it is desirable to get their kernels compiled optimized for size. Signed-off-by: Rogério Brito Signed-off-by: Kumar Gala commit 22e181ba7f09197dd6f35a48013cb86289644eb6 Author: Guennadi Liakhovetski Date: Fri Oct 24 01:05:56 2008 +0200 powerpc: fix i2c on PPC linkstation / kurobox machines The i2c bus defn is broken on linkstation / kurobox machines since at least 2.6.27. Fix it. Also remove CONFIG_SERIAL_OF_PLATFORM, which, if enabled, breaks the serial console after the "console handover: boot [udbg0] -> real [ttyS1]" message. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Kumar Gala commit 5695ff44160e62d9193c0201706853bcfe2a077f Author: Takashi Iwai Date: Tue Oct 28 15:39:26 2008 +0100 ALSA: hda - Add another HP model for AD1884A Added a quirk entry for another HP mobile device with AD1884A codec. Signed-off-by: Takashi Iwai commit c8d7aa91bc38e2de5c74c48ba33b9c950c28ffac Author: Josh Boyer Date: Fri Oct 24 04:31:58 2008 +0000 powerpc/40x: Don't enable HCU4 board by default Fix the HCU4 Kconfig option to 'default n'. We don't want the board to always be enabled for other board defconfigs. Signed-off-by: Josh Boyer commit e45948b071d8be59044ac232d99a2ca83fd93266 Author: Xiantao Zhang Date: Thu Oct 23 10:37:06 2008 +0800 KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h To avoid using stale asm-offsets.h. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit bb45e202e695dea8657bb03a01d1522c37558672 Author: Avi Kivity Date: Sun Oct 19 16:39:45 2008 +0200 KVM: Future-proof device assignment ABI Reserve some space so we can add more data. Signed-off-by: Avi Kivity commit decc90162a99b4e51c534ab63f9b6fc5cb0f2596 Author: Xiantao Zhang Date: Thu Oct 16 15:58:15 2008 +0800 KVM: ia64: Fix halt emulation logic Common halt logic was changed by x86 and did not update ia64. This patch updates halt for ia64. Fixes a regression causing guests to hang with more than 2 vcpus. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 5550af4df179e52753d3a43a788a113ad8cd95cd Author: Sheng Yang Date: Wed Oct 15 20:15:06 2008 +0800 KVM: Fix guest shared interrupt with in-kernel irqchip Every call of kvm_set_irq() should offer an irq_source_id, which is allocated by kvm_request_irq_source_id(). Based on irq_source_id, we identify the irq source and implement logical OR for shared level interrupts. The allocated irq_source_id can be freed by kvm_free_irq_source_id(). Currently, we support at most sizeof(unsigned long) different irq sources. [Amit: - rebase to kvm.git HEAD - move definition of KVM_USERSPACE_IRQ_SOURCE_ID to common file - move kvm_request_irq_source_id to the update_irq ioctl] [Xiantao: - Add kvm/ia64 stuff and make it work for kvm/ia64 guests] Signed-off-by: Sheng Yang Signed-off-by: Amit Shah Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 6ad9f15c94822c3f067a7d443f3b414e08b34460 Author: Marcelo Tosatti Date: Wed Oct 15 07:45:08 2008 -0200 KVM: MMU: sync root on paravirt TLB flush The pvmmu TLB flush handler should request a root sync, similarly to a native read-write CR3. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 3eeebf17f31c583f83e081b17b3076477cb96886 Author: Paul Mundt Date: Tue Oct 28 20:07:44 2008 +0900 sh: Kill off long-dead HD64465 cchip support. This code has been dead for many years. The last update it received was in 2003 in order to update it for the driver model changes, though it had already been in disarray and unused before that point. The only boards that ever used this chip have not had users in many years either, so it is finally safe to just kill it off and move on with life. Signed-off-by: Paul Mundt commit 5ff0594e2f6fb3242a1a2a4794286244e95afab1 Author: Paul Mundt Date: Tue Oct 28 19:45:47 2008 +0900 sh: Revert "SH 7366 needs SCIF_ONLY" This reverts commit 5ca8c4852fcbbc8a8497c4ee8b2a0a7466f3524c. With the killing off of SCIF_ONLY and its spawn in sh-sci, we no longer require this change, so just revert it. Signed-off-by: Paul Mundt commit 86d758ef2cb0677b471a88ffe33a29cdfec4ceca Merge: b2d86a3... 15c73aa... 2a88b6e... Author: Paul Mundt Date: Tue Oct 28 19:44:15 2008 +0900 Merge branches 'sh/serial-rework' and 'sh/oprofile' commit b2d86a3fd9855380598c0c039e712a20086e119f Author: Paul Mundt Date: Tue Oct 28 19:37:05 2008 +0900 sh: Simplify and lock down the ISA tuning. The ISA tuning as it is today can not cope with all of the different variations that are possible, so all we can do is a best attempt based on the CPU family. The DSP and FPU generation are already at odds with each other, and the nommu tuning we weren't handling at all. Additionally, for platforms that never had an FPU, the -nofpu variant never existed, meaning that we would lose out on family granular tuning completely in certain cases. With tat out of the way, we were also using -up versions, allowing for later instructions that branched off of a particular subset of the ISA, but are not actually reflected on the hardware being targetted. This leads to some confusion, and the possibility of bogus instructions on older parts. Kill that off and lock it down to the family being built for specifically. Signed-off-by: Paul Mundt commit 6afe40b4dace385d7ba2faf24b352f066f3b71bf Author: Heiko Carstens Date: Tue Oct 28 11:14:58 2008 +0100 lockdep: fix irqs on/off ip tracing Impact: fix lockdep lock-api-caller output when irqsoff tracing is enabled 81d68a96 "ftrace: trace irq disabled critical timings" added wrappers around trace_hardirqs_on/off_caller. However these functions use __builtin_return_address(0) to figure out which function actually disabled or enabled irqs. The result is that we save the ips of trace_hardirqs_on/off instead of the real caller. Not very helpful. However since the patch from Steven the ip already gets passed. So use that and get rid of __builtin_return_address(0) in these two functions. Signed-off-by: Heiko Carstens Signed-off-by: Ingo Molnar commit ea4bfdf52a5a84492cce881baadc5fab36adeade Author: Christian Borntraeger Date: Tue Oct 28 11:10:22 2008 +0100 [S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE The s390 kernel does not compile if virtio console is enabled, but guest support is disabled: LD .tmp_vmlinux1 arch/s390/kernel/built-in.o: In function `setup_arch': /space/linux-2.5/arch/s390/kernel/setup.c:773: undefined reference to `s390_virtio_console_init' The fix is related to commit 99e65c92f2bbf84f43766a8bf701e36817d62822 Author: Christian Borntraeger Date: Fri Jul 25 15:50:04 2008 +0200 KVM: s390: Fix guest kconfig Which changed the build process to build kvm_virtio.c only if CONFIG_S390_GUEST is set. We must ifdef the prototype in the header file accordingly. Reported-by: Heiko Carstens Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 7f5a8ba6b0297ca941f43f8f5cbf0e5c8c4dd916 Author: Heiko Carstens Date: Tue Oct 28 11:10:21 2008 +0100 [S390] No more 4kb stacks. We got a stack overflow with a small stack configuration on a 32 bit system. It just looks like as 4kb isn't enough and too dangerous. So lets get rid of 4kb stacks on 32 bit. But one thing I completely dislike about the call trace below is that just for debugging or tracing purposes sprintf gets called (cio_start_key): /* process condition code */ sprintf(dbf_txt, "ccode:%d", ccode); CIO_TRACE_EVENT(4, dbf_txt); But maybe its just me who thinks that this could be done better. <4>Kernel stack overflow. <4>Modules linked in: dm_multipath sunrpc bonding qeth_l2 dm_mod qeth ccwgroup vmur <4>CPU: 1 Not tainted 2.6.27-30.x.20081015-s390default #1 <4>Process httpd (pid: 3807, task: 20ae2df8, ksp: 1666fb78) <4>Krnl PSW : 040c0000 8027098a (number+0xe/0x348) <4> R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:0 PM:0 <4>Krnl GPRS: 00d43318 0027097c 1666f277 9666f270 <4> 00000000 00000000 0000000a ffffffff <4> 9666f270 1666f228 1666f277 1666f098 <4> 00000002 80270982 80271016 1666f098 <4>Krnl Code: 8027097e: f0340dd0a7f1 srp 3536(4,%r0),2033(%r10),4 <4> 80270984: 0f00 clcl %r0,%r0 <4> 80270986: a7840001 brc 8,80270988 <4> >8027098a: 18ef lr %r14,%r15 <4> 8027098c: a7faff68 ahi %r15,-152 <4> 80270990: 18bf lr %r11,%r15 <4> 80270992: 18a2 lr %r10,%r2 <4> 80270994: 1893 lr %r9,%r3 Modified calltrace with annotated stackframe size of each function: stackframe size | 0 304 vsnprintf+850 [0x271016] 1 72 sprintf+74 [0x271522] 2 56 cio_start_key+262 [0x2d4c16] 3 56 ccw_device_start_key+222 [0x2dfe92] 4 56 ccw_device_start+40 [0x2dff28] 5 48 raw3215_start_io+104 [0x30b0f8] 6 56 raw3215_write+494 [0x30ba0a] 7 40 con3215_write+68 [0x30bafc] 8 40 __call_console_drivers+146 [0x12b0fa] 9 32 _call_console_drivers+102 [0x12b192] 10 64 release_console_sem+268 [0x12b614] 11 168 vprintk+462 [0x12bca6] 12 72 printk+68 [0x12bfd0] 13 256 __print_symbol+50 [0x15a882] 14 56 __show_trace+162 [0x103d06] 15 32 show_trace+224 [0x103e70] 16 48 show_stack+152 [0x103f20] 17 56 dump_stack+126 [0x104612] 18 96 __alloc_pages_internal+592 [0x175004] 19 80 cache_alloc_refill+776 [0x196f3c] 20 40 __kmalloc+258 [0x1972ae] 21 40 __alloc_skb+94 [0x328086] 22 32 pskb_copy+50 [0x328252] 23 32 skb_realloc_headroom+110 [0x328a72] 24 104 qeth_l2_hard_start_xmit+378 [0x7803bfde] 25 56 dev_hard_start_xmit+450 [0x32ef6e] 26 56 __qdisc_run+390 [0x3425d6] 27 48 dev_queue_xmit+410 [0x331e06] 28 40 ip_finish_output+308 [0x354ac8] 29 56 ip_output+218 [0x355b6e] 30 24 ip_local_out+56 [0x354584] 31 120 ip_queue_xmit+300 [0x355cec] 32 96 tcp_transmit_skb+812 [0x367da8] 33 40 tcp_push_one+158 [0x369fda] 34 112 tcp_sendmsg+852 [0x35d5a0] 35 240 sock_sendmsg+164 [0x32035c] 36 56 kernel_sendmsg+86 [0x32064a] 37 88 sock_no_sendpage+98 [0x322b22] 38 104 tcp_sendpage+70 [0x35cc1e] 39 48 sock_sendpage+74 [0x31eb66] 40 64 pipe_to_sendpage+102 [0x1c4b2e] 41 64 __splice_from_pipe+120 [0x1c5340] 42 72 splice_from_pipe+90 [0x1c57e6] 43 56 generic_splice_sendpage+38 [0x1c5832] 44 48 do_splice_from+104 [0x1c4c38] 45 48 direct_splice_actor+52 [0x1c4c88] 46 80 splice_direct_to_actor+180 [0x1c4f80] 47 72 do_splice_direct+70 [0x1c5112] 48 64 do_sendfile+360 [0x19de18] 49 72 sys_sendfile64+126 [0x19df32] 50 336 sysc_do_restart+18 [0x111a1a] Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 46e7951f9431b5e6bfbeb3044fdb4b522f58101c Author: Heiko Carstens Date: Tue Oct 28 11:10:20 2008 +0100 [S390] Change default IPL method to IPL_VM. allyesconfig and allmodconfig built kernels have a tape IPL record. A the vmreader record makes much more sense, since hardly anybody will ever IPL a kernel from tape. So change the default. As I side effect I can test these kernels without fiddling around with the kernel config ;) Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b3c21e4919c8598c58faaa0a650dc398baddd993 Author: Frank Munzert Date: Tue Oct 28 11:10:19 2008 +0100 [S390] tape: disable interrupts in tape_open and tape_release Get tape device lock with interrupts disabled. Otherwise lockdep will issue a warning similar to: ================================= [ INFO: inconsistent lock state ] 2.6.27 #1 --------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. vol_id/2903 [HC0[0]:SC0[0]:HE1:SE1] takes: (sch->lock){++..}, at: [<000003e00004c7a2>] tape_open+0x42/0x1a4 [tape] {in-hardirq-W} state was registered at: [<000000000007ce5c>] __lock_acquire+0x894/0xa74 [<000000000007d0ce>] lock_acquire+0x92/0xb8 [<0000000000345154>] _spin_lock+0x5c/0x9c [<0000000000202264>] do_IRQ+0x124/0x1f0 [<0000000000026610>] io_return+0x0/0x8 irq event stamp: 847 hardirqs last enabled at (847): [<000000000007aca6>] trace_hardirqs_on+0x2a/0x38 hardirqs last disabled at (846): [<0000000000076ca2>] trace_hardirqs_off+0x2a/0x38 softirqs last enabled at (0): [<000000000004909e>] copy_process+0x43e/0x11f4 softirqs last disabled at (0): [<0000000000000000>] 0x0 other info that might help us debug this: 1 lock held by vol_id/2903: #0: (&bdev->bd_mutex){--..}, at: [<000000000010e0f4>] do_open+0x78/0x358 stack backtrace: CPU: 1 Not tainted 2.6.27 #1}, Process vol_id (pid: 2903, task: 000000003d4c0000, ksp: 000000003d4e3b10) 0400000000000000 000000003d4e3830 0000000000000002 0000000000000000 000000003d4e38d0 000000003d4e3848 000000003d4e3848 00000000000168a8 0000000000000000 000000003d4e3b10 0000000000000000 0000000000000000 000000003d4e3830 000000000000000c 000000003d4e3830 000000003d4e38a0 000000000034aa98 00000000000168a8 000000003d4e3830 000000003d4e3880 Call Trace: ([<000000000001681c>] show_trace+0x138/0x158) [<0000000000016902>] show_stack+0xc6/0xf8 [<00000000000170d4>] dump_stack+0xb0/0xc0 [<0000000000078810>] print_usage_bug+0x1e8/0x228 [<000000000007a71c>] mark_lock+0xb14/0xd24 [<000000000007cd5a>] __lock_acquire+0x792/0xa74 [<000000000007d0ce>] lock_acquire+0x92/0xb8 [<0000000000345154>] _spin_lock+0x5c/0x9c [<000003e00004c7a2>] tape_open+0x42/0x1a4 [tape] [<000003e00005185c>] tapeblock_open+0x98/0xd0 [tape] Signed-off-by: Frank Munzert Signed-off-by: Martin Schwidefsky commit 13f8b7c5e6fa13622592042f3b5aa88ba785cec2 Author: Roel Kluin Date: Tue Oct 28 11:10:18 2008 +0100 [S390] appldata: unsigned ops->size cannot be negative unsigned ops->size cannot be negative Signed-off-by: Roel Kluin Signed-off-by: Martin Schwidefsky commit 7a4a1ccd44c85c7d92b20a361e3854431c6935e0 Author: Frank Munzert Date: Tue Oct 28 11:10:17 2008 +0100 [S390] tape block: complete request with correct locking __blk_end_request must be called with request queue lock held. We need to use blk_end_request rather than __blk_end_request. Signed-off-by: Frank Munzert Signed-off-by: Martin Schwidefsky commit da5aae7036692fa8d03da1b705c76fd750ed9e38 Author: Heiko Carstens Date: Tue Oct 28 11:10:16 2008 +0100 [S390] Fix sysdev class file creation. Use sysdev_class_create_file() to create create sysdev class attributes instead of sysfs_create_file(). Using sysfs_create_file() wasn't a very good idea since the show and store functions have a different amount of parameters for sysfs files and sysdev class files. In particular the pointer to the buffer is the last argument and therefore accesses to random memory regions happened. Still worked surprisingly well until we got a kernel panic. Cc: stable@kernel.org Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 250cf776f74b5932a1977d0489cae9206e2351dd Author: Christian Borntraeger Date: Tue Oct 28 11:10:15 2008 +0100 [S390] pgtables: Fix race in enable_sie vs. page table ops The current enable_sie code sets the mm->context.pgstes bit to tell dup_mm that the new mm should have extended page tables. This bit is also used by the s390 specific page table primitives to decide about the page table layout - which means context.pgstes has two meanings. This can cause any kind of bugs. For example - e.g. shrink_zone can call ptep_clear_flush_young while enable_sie is running. ptep_clear_flush_young will test for context.pgstes. Since enable_sie changed that value of the old struct mm without changing the page table layout ptep_clear_flush_young will do the wrong thing. The solution is to split pgstes into two bits - one for the allocation - one for the current state Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 2c78091405d6f54748b1fac78c45f2a799e3073a Author: Jan Glauber Date: Tue Oct 28 11:10:14 2008 +0100 [S390] qdio: remove incorrect memset Remove the memset since zeroing the string is not needed and use snprintf instead of sprintf. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 7c045aa2c8eb731996b0c5c6552356b8946e6894 Author: Jan Glauber Date: Tue Oct 28 11:10:13 2008 +0100 [S390] qdio: prevent double qdio shutdown in case of I/O errors In case of I/O errors on a qdio subchannel qdio_shutdown may be called twice by the qdio driver and by zfcp. Remove the superfluous shutdown from qdio and let the upper layer driver handle the error condition. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 3f8793e30269cb9ba5975f02faa7ddf75853bde9 Merge: 9e94302... 6bee00d... Author: Russell King Date: Tue Oct 28 09:55:45 2008 +0000 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop commit 1a30603233fdd104aba430fd8f3443160474b6bb Author: Paul Mundt Date: Tue Oct 28 18:50:00 2008 +0900 sh: sh7785lcr: Select uImage as default image target. Signed-off-by: Paul Mundt commit b4d36a254f30e266fb47aec502978f615b8f7ca4 Author: Paul Mundt Date: Tue Oct 28 18:40:19 2008 +0900 sh: Add on-chip RTC support for SH7722. Signed-off-by: Paul Mundt commit 46fec7ac40e452a2ea5e63648d98b6bb2b5898f9 Author: qinghuang feng Date: Tue Oct 28 17:24:28 2008 +0800 lockdep: minor fix for debug_show_all_locks() When we failed to get tasklist_lock eventually (count equals 0), we should only print " ignoring it.\n", and not print " locked it.\n" needlessly. Signed-off-by: Qinghuang Feng Signed-off-by: Ingo Molnar commit 21798a84ab383cdac0e7ee3368e0792b718b867d Author: Frederic Weisbecker Date: Tue Oct 28 09:43:26 2008 +0100 tracing: fix a build error on alpha Impact: build fix on Alpha When tracing is enabled, some arch have included on their but others like alpha or m68k don't. Build error on alpha: kernel/trace/trace.c: In function 'tracing_cpumask_write': kernel/trace/trace.c:2145: error: implicit declaration of function 'raw_local_irq_disable' kernel/trace/trace.c:2162: error: implicit declaration of function 'raw_local_irq_enable' Tested on Alpha through a cross-compiler (should correct a similar issue on m68k). Reported-by: Alexey Dobriyan Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar commit 5ca8c4852fcbbc8a8497c4ee8b2a0a7466f3524c Author: Kuninori Morimoto Date: Tue Oct 28 15:33:48 2008 +0900 SH 7366 needs SCIF_ONLY SH 7366 has compile bug. because there is no SCIF_ONLY for SH 7366. this patch add it. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 545727f32049f6e7269f73a49904e3229192988e Author: Nobuhiro Iwamatsu Date: Mon Oct 27 11:32:27 2008 +0900 gdrom: Fix compile error Return value and argument of block_device_operations.release of gdrom was changed. This patch fix this problem. Signed-off-by: Nobuhiro Iwamatsu Acked-by: Al Viro Signed-off-by: Paul Mundt commit e00afb64239dc764193d48a28bbfba6da2b3b5de Author: Kuninori Morimoto Date: Tue Oct 28 17:36:11 2008 +0900 sh: Provide a sample defconfig for the UL2 (SH7366) board. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 60817c9b31ef7897d60bca2f384cbc316a3fdd8b Author: Shaohua Li Date: Mon Oct 27 13:03:18 2008 -0700 x86, memory hotplug: remove wrong -1 in calling init_memory_mapping() Impact: fix crash with memory hotplug Shuahua Li found: | I just did some experiments on a desktop for memory hotplug and this bug | triggered a crash in my test. | | Yinghai's suggestion also fixed the bug. We don't need to round it, just remove that extra -1 Signed-off-by: Yinghai Signed-off-by: Ingo Molnar commit 8a2fd5f3ab6535035f08d7d0fda90abe73c6d282 Author: Paul Mundt Date: Tue Oct 28 17:19:35 2008 +0900 sh: Fix FPU tuning on toolchains with mismatched multilib targets. Presently there is very little standing in the way of using an SH-4 toolchain for building an SH-2 kernel, and vice versa. Binutils itself has no limitations whatsoever and supports explicit ISA hinting, which we already use with varying degrees of success today. This leaves GCC as the odd one out, due to a rather dubious policy decision by the GCC folks to not include all of the CPU family variants in the default list of multilib targets in GCC4. Despite best efforts to the contrary, libgcc itself already contains awareness of the various CPU types and remains generally usable, allowing it to safely be referenced even on a mismatched target (and indeed, explicit ISA tuning by binutils keeps us honest in terms of ensuring that we do not link incompatible objects in). In order to support this, a couple of changes had to be made. Firstly, the introduction of MAYBE_DECLARE_EXPORT(), which provides a __weak extern reference for libgcc resident routines when finer-grained -m based tuning is not supported by the toolchain. This fixes up the __sdivsi3_i4i and __udivsi3_i4i references when dealing with SH-2 kernels linked with an SH-4 libgcc. Secondly, in case where we are unable to find a suitable match for CPU family tuning but still have a toolchain that defaults to FP instruction generation, a suitable nofpu target must be selected. This is accomplished by selecting the first nofpu multilib target supported by the toolchain, which is also necessary for selecting the proper libgcc to link against. Signed-off-by: Paul Mundt commit 934d9c23b4c7e31840a895ba4b7e88d6413c81f3 Author: NeilBrown Date: Tue Oct 28 17:01:23 2008 +1100 md: destroy partitions and notify udev when md array is stopped. md arrays are not currently destroyed when they are stopped - they remain in /sys/block. Last time I tried this I tripped over locking too much. A consequence of this is that udev doesn't remove anything from /dev. This is rather ugly. As an interim measure until proper device removal can be achieved, make sure all partitions are removed using the BLKRRPART ioctl, and send a KOBJ_CHANGE when an md array is stopped. Signed-off-by: NeilBrown commit 87943acf60898a3efb6b5ee85d4cc789898bf5e8 Author: David Milburn Date: Mon Oct 13 14:38:36 2008 -0500 libata: ahci enclosure management bit mask Enclosure management bit mask definitions. Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit eb40963c835c69681af516388a2a92b57e2f0fe7 Author: David Milburn Date: Thu Oct 16 09:26:19 2008 -0500 libata: ahci enclosure management led sync Synchronize ahci_sw_activity and ahci_sw_activity_blink with ata_port lock. Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit e7c0d217cdaa837d30bc265eddac4d176969fd68 Author: Alan Cox Date: Fri Oct 17 19:08:31 2008 +0100 pata_ninja32: suspend/resume support I had assumed that the standard recovery would be sufficient for this hardware but it isn't. Fix up the other registers on resume as needed. See bug #11735 Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a996031c87e093017c0763326a08896a3a4817f4 Author: Eric Sandeen Date: Tue Oct 28 00:08:17 2008 -0400 delay capable() check in ext4_has_free_blocks() As reported by Eric Paris, the capable() check in ext4_has_free_blocks() sometimes causes SELinux denials. We can rearrange the logic so that we only try to use the root-reserved blocks when necessary, and even then we can move the capable() test to last, to avoid the check most of the time. Signed-off-by: Eric Sandeen Reviewed-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 8c3bf8a01c005385e9be0bc992e10abfb355278c Author: Eric Sandeen Date: Tue Oct 28 00:08:12 2008 -0400 merge ext4_claim_free_blocks & ext4_has_free_blocks Mingming pointed out that ext4_claim_free_blocks & ext4_has_free_blocks are largely cut & pasted; they can be collapsed/merged as follows. Signed-off-by: Eric Sandeen Reviewed-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 6c20ec850360bc6e5c66a787f0523a80450d65ab Author: Theodore Ts'o Date: Tue Oct 28 21:08:20 2008 -0400 jbd2: Call the commit callback before the transaction could get dropped The transaction can potentially get dropped if there are no buffers that need to be written. Make sure we call the commit callback before potentially deciding to drop the transaction. Also avoid dereferencing the commit_transaction pointer in the marker for the same reason. This patch fixes the bug reported by Eric Paris at: http://bugzilla.kernel.org/show_bug.cgi?id=11838 Signed-off-by: "Theodore Ts'o" Acked-by: Eric Sandeen Tested-by: Eric Paris commit 054e5f616b5becdc096b793407dc33fe379749ac Author: Ondrej Zary Date: Sun Oct 26 18:10:19 2008 -0400 libata: Fix LBA48 on pata_it821x RAID volumes. [http://lkml.org/lkml/2008/10/18/82] Signed-off-by: Ondrej Zary Acked-by: Alan Cox Signed-off-by: Jeff Garzik commit 90484ebfc96c5dc5c498ed72cf2d370575db9b76 Author: Tejun Heo Date: Sun Oct 26 15:43:03 2008 +0900 libata: clear saved xfer_mode and ncq_enabled on device detach libata EH saves xfer_mode and ncq_enabled at start to later set DUBIOUS_XFER flag if it has changed. These values need to be cleared on device detach such that hot device swap doesn't accidentally miss DUBIOUS_XFER. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e8b3b5e9f54512bfdb7c154da07ec0408cbd6c56 Author: Tejun Heo Date: Sat Oct 25 14:26:54 2008 +0900 sata_sil24: configure max read request size to 4k Due to request posting limitations, bandwidth of sil3132 is limited to around 120MB/s with the minimum pci-e payload size (128bytes) which is used by most consumer systems. However, write throughput can be slightly (~3%) increased by increasing the max read requeset size. Configure it to 4k which is the maximum supported. This optimization is also done by SIMG's windows driver. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3cd8ddbd86e4ea6f2f6582da217651f048d76130 Author: Randy Dunlap Date: Sun Oct 26 20:19:32 2008 -0700 libata: add missing kernel-doc Fix libata missing kernel-doc: Warning(lin2628-rc2//drivers/ata/libata-core.c:4562): No description found for parameter 'tag' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 4a9c7b3359889399aacb94019bbdfc9f38d4cff7 Author: Tejun Heo Date: Mon Oct 27 19:59:23 2008 +0900 libata: fix device iteration bugs There were several places where only enabled devices should be iterated over but device enabledness wasn't checked. * IDENTIFY data 40 wire check in cable_is_40wire() * xfer_mode/ncq_enabled saving in ata_scsi_error() * DUBIOUS_XFER handling in ata_set_mode() While at it, reformat comments in cable_is_40wire(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c77a036beceabbfd85b366193685cb49f38292bd Author: Mark Nelson Date: Thu Oct 23 14:08:16 2008 +1100 ahci: Add support for Promise PDC42819 Add an appropriate entry for the Promise PDC42819 controller. It has an AHCI mode and so far works correctly with board_ahci. This chip is found on Promise's FastTrak TX2650 (2 port) and TX4650 (4 port) software-based RAID cards (for which there is a binary driver, t3sas) and can be found on some motherboards, for example the MSI K9A2 Platinum, which calls the chip a Promise T3 controller. Although this controller also supports SAS devices, its default bootup mode is AHCI and the binary driver has to do some magic to get the chip into the appropriate mode to drive SAS disks. Seeing as no documentation is provided by Promise, adding this entry to the ahci driver allows the controller to be useful to people as a SATA controller (with no ill effects on the system if a SAS disk is connected - probing of the port just times out with "link online but device misclassified"), without having to resort to using the binary driver. Users who require SAS or the proprietary software raid can get this functionality using the binary driver. Signed-off-by: Mark Nelson Signed-off-by: Jeff Garzik commit ab77163008c596aad9624ceab190d840c0143fa8 Author: Alan Cox Date: Mon Oct 27 15:09:10 2008 +0000 ata: Switch all my stuff to a common address Signed-off-by: Jeff Garzik commit ef2cabf7c6d838eb0ee2b4fb8ef84f7c06ce16d9 Author: Hidehiro Kawai Date: Mon Oct 27 22:53:05 2008 -0400 ext4: fix a bug accessing freed memory in ext4_abort Vegard Nossum reported a bug which accesses freed memory (found via kmemcheck). When journal has been aborted, ext4_put_super() calls ext4_abort() after freeing the journal_t object, and then ext4_abort() accesses it. This patch fix it. Signed-off-by: Hidehiro Kawai Acked-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 44d6f78756560e95903de239e10f8a40a6eae444 Author: Hidehiro Kawai Date: Mon Oct 27 22:51:46 2008 -0400 ext3: fix a bug accessing freed memory in ext3_abort Vegard Nossum reported a bug which accesses freed memory (found via kmemcheck). When journal has been aborted, ext3_put_super() calls ext3_abort() after freeing the journal_t object, and then ext3_abort() accesses it. This patch fix it. Signed-off-by: Hidehiro Kawai Acked-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 9e9430213f85ebdaf40026ec790295420efd0f91 Author: Linus Walleij Date: Fri Oct 24 21:17:50 2008 +0100 [ARM] 5322/1: Fix fastpath issue in mmci.c Fix fastpath issues Since mmci_request() can be called from a non-interrupt context, and does, during kernel init, causing a host of debug messages during boot if you enable spinlock debugging, we need to use the spinlock calls that save IRQ flags and restore them. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit ea2d8b59bc7b770fde03de2bb9b3ee46e8bdc8d5 Author: Randy Dunlap Date: Mon Oct 27 09:47:03 2008 -0700 mac80211.h: fix kernel-doc excesses Fix mac80211.h kernel-doc: it had some extra parameters that were no longer valid and incorrect format for a return value in 2 places. Warning(lin2628-rc2//include/net/mac80211.h:1487): Excess function parameter or struct member 'control' description in 'ieee80211_beacon_get' Warning(lin2628-rc2//include/net/mac80211.h:1596): Excess function parameter or struct member 'control' description in 'ieee80211_get_buffered_bc' Warning(lin2628-rc2//include/net/mac80211.h:1632): Excess function parameter or struct member 'rc4key' description in 'ieee80211_get_tkip_key' Warning(lin2628-rc2//include/net/mac80211.h:1735): Excess function parameter or struct member 'return' description in 'ieee80211_start_tx_ba_session' Warning(lin2628-rc2//include/net/mac80211.h:1775): Excess function parameter or struct member 'return' description in 'ieee80211_stop_tx_ba_session' Signed-off-by: Randy Dunlap Acked-by: Johannes Berg Signed-off-by: John W. Linville commit f2c2e25554991f9c17bcd24028db5e1c50ecb0ad Author: Christian Lamparter Date: Sat Oct 25 16:14:14 2008 +0200 p54: fix build warnings On Saturday 25 October 2008 10:24:10 Johannes Berg wrote: > just FYI in case you haven't seen them. the p54 one looks like a genuine > problem. > > drivers/net/wireless/p54/p54common.c: In function ‘p54_parse_eeprom’: > drivers/net/wireless/p54/p54common.c:325: warning: ‘synth’ may be used uninitialized in this function There you go. Yes, it is a genuine problem, if the device's eeprom is screwed really up. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit bc1b32d6bdd2d6f3fbee9a7c01c9b099f11c579c Author: Elias Oltmanns Date: Fri Oct 24 21:59:18 2008 +0200 ath5k: Reset key cache on interface up, thus fixing resume After a s2ram / resume cycle, resetting the key cache does not work unless it is deferred until after the hardware has been reinitialised by a call to ath5k_hw_reset(). This fixes a regression introduced by "ath5k: fix suspend-related oops on rmmod". Signed-off-by: Elias Oltmanns Signed-off-by: John W. Linville commit 51b94bf0654a14600ff9706f7bc0f7685265f6cd Author: John W. Linville Date: Wed Oct 22 19:41:34 2008 -0400 mac80211: correct warnings in minstrel rate control algorithm Signed-off-by: John W. Linville commit d8b105f900d93bd103c002bf4c923f50f16c5441 Author: Dmitry Baryshkov Date: Wed Oct 22 20:52:55 2008 +0400 RFKILL: fix input layer initialisation Initialise correctly last fields, so tasks can be actually executed. On some architectures the initial jiffies value is not zero, so later all rfkill incorrectly decides that rfkill_*.last is in future. Signed-off-by: Dmitry Baryshkov Signed-off-by: John W. Linville commit 35961627d3e7a4093eb307d782541700e9addec6 Author: Christian Lamparter Date: Wed Oct 22 14:19:56 2008 +0200 p54: fix misbehavings when firmware can't be found This patch fixes a double-free error in p54pci ( http://bugzilla.kernel.org/show_bug.cgi?id=11782 ) Trying to free already-free IRQ 10 Pid: 108, comm: pccardd Not tainted 2.6.27-05577-g0cfd810-dirty #1 Call Trace:  [] free_irq+0xad/0xb9  [] dma_generic_alloc_coherent+0x0/0xd7  [] p54p_stop+0x4a/0x1fa  [] dma_generic_alloc_coherent+0x0/0xd7  [] p54p_probe+0x23e/0x302 Tested-by: Sean Young Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 753dcfeecc0e293dbe6f3d59643741af9e610f4f Author: Peter Korsgaard Date: Fri Oct 24 09:08:27 2008 +0200 dm9601: runtime mac address change support Implement set_mac_address for runtime mac address change. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 07b5f6a6fd0ce47390f7fbec966cd5c70127e597 Author: Sven Hartge Date: Thu Oct 23 13:03:44 2008 +0000 via-velocity: use driver string instead of dev->name before register_netdev() This patch corrects a message bug in the via-velocity driver which bothered me for some time. The messages printed during device init look like the following: [ 8.486422] eth%d: set value of parameter Wake On Lan options to 0 ^^! [ 8.487340] eth0: VIA Networking Velocity Family Gigabit Ethernet Adapter Note the unresolved format string. dev->name is unavailable before register_netdev, so use dev_driver_string(&pdev->dev), which is also consistent with other drivers. "char *devname" parameters had to be converted to "const char *devname" to be consistent with dev_driver_string return value. Signed-off-by: Sven Hartge Signed-off-by: Jeff Garzik commit 404b12c10d2f4d77649a193af2ec69f77b852926 Author: Jeff Garzik Date: Mon Oct 27 15:06:51 2008 -0400 drivers/net/wan/syncppp: Fix unused-var warnings Fix !CONFIG_INET warnings. Spotted, and original patch authored by: Manish Katiyar Signed-off-by: Jeff Garzik commit e65b95915d6ac8cd86152cfac762af8fc5fb3ff4 Author: Yevgeny Petrilin Date: Sun Oct 26 17:13:24 2008 +0200 mlx4: Setting the correct offset for default mac address Signed-off-by: Yevgeny Petrilin Signed-off-by: Jeff Garzik commit 9de14eb59d0b28a2566344a961d716886fa85776 Author: Huang Weiyi Date: Sun Oct 26 23:05:42 2008 +0800 mlx4_en: remove duplicated #include Removed duplicated #include in drivers/net/mlx4/en_main.c. Signed-off-by: Huang Weiyi Signed-off-by: Jeff Garzik commit c778e11d686dd4bde9efe12d8135a9bcbfef17ef Author: Josh Boyer Date: Fri Oct 24 09:53:14 2008 -0400 ibm_newemac: Fix typo in flow control config option The recent build fix for ibm_newemac has a typo in the config option #ifdef used for disabling flow control. This corrects it to the proper Kconfig option name. Reported-by: Christoph Hellwig Signed-off-by: Josh Boyer Signed-off-by: Jeff Garzik commit 3fd09c45bfbcf77949ed6db36e67c1681424fedb Author: Thomas Klein Date: Mon Oct 27 10:38:46 2008 +0100 ehea: Detect 16GB hugepages for firmware restriction All kernel memory which is used for kernel/hardware data transfer must be registered with firmware using "memory regions". 16GB hugepages may not be part of a memory region due to firmware restrictions. This patch modifies the walk_memory_resource callback fn to filter hugepages and add only standard memory to the busmap which is later on used for MR registration. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 74d5e8acd95ae934194303138a43b60005fcfad6 Author: FUJITA Tomonori Date: Thu Oct 23 18:01:13 2008 +0900 dmfe: check pci_alloc_consistent errors We need to check the address that pci_alloc_consistent() returns since it might fail. Signed-off-by: FUJITA Tomonori Signed-off-by: Jeff Garzik commit 2d488c2f514a6c5248a0773c78345626abdc1818 Author: Ursula Braun Date: Fri Oct 24 11:16:55 2008 +0200 qeth: avoid skb_under_panic for malformatted inbound data To make the qeth driver more robust in case of malformatted inbound packets due to hardware problems, an additional check for OSN-card-type is added for OSN-type packets. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit cc181282fb2fa1af6d532f1333dd42af4814ff17 Author: Frank Blaschka Date: Fri Oct 24 11:16:54 2008 +0200 qeth: remove unnecessary support ckeck in sysfs route6 Removing this check improves usability because you do not have to set the device online to initially set ipv6 routing option. Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit e1f03ae8029cb8046ef3031e66d74430730c2727 Author: Frank Blaschka Date: Fri Oct 24 11:16:53 2008 +0200 qeth: fix offset error in non prealloc header path For the non preallocated qeth header code path we should not change the header length. Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit 0f5623c9ebfc6576c5682ab3b335c57812f6c87e Author: Ursula Braun Date: Fri Oct 24 11:16:52 2008 +0200 qeth: remove non-recover-thread checkings IP-threads have been removed from the qeth driver. Only the recover-thread is left over. This makes checkings for non-recover threads superfluous. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit 49fdf6785fd660e18a1eb4588928f47e9fa29a9a Merge: b70a6b2... 43a49cb... Author: Linus Torvalds Date: Mon Oct 27 11:41:51 2008 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: libata: fix NCQ devices behind port multipliers scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map commit 43a49cbdf31e812c0d8f553d433b09b421f5d52c Author: Jens Axboe Date: Mon Oct 27 19:23:06 2008 +0100 libata: fix NCQ devices behind port multipliers For devices behind sata port multipliers, we have to make sure that they share a tag map since all tags for that PMP must be unique. Signed-off-by: Jens Axboe commit 3070f69b66b7ab2f02d8a2500edae07039c38508 Author: Jens Axboe Date: Mon Oct 27 19:20:59 2008 +0100 scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map Right now callers have to check whether scsi_host->bqt is already set up, it's much cleaner to just have scsi_init_shared_tag_map() does this check on its own. Signed-off-by: Jens Axboe commit 3afa39493de510c33c56ddc76e6e1af7f87c5392 Author: Yinghai Lu Date: Sat Oct 25 22:58:21 2008 -0700 x86: keep the /proc/meminfo page count correct Impact: get correct page count in /proc/meminfo found page count in /proc/meminfo is nor correct on 1G system in VirtualBox 2.0.4 # cat /proc/meminfo MemTotal: 1017508 kB MemFree: 822700 kB Buffers: 1456 kB Cached: 26632 kB SwapCached: 0 kB ... Hugepagesize: 2048 kB DirectMap4k: 4032 kB DirectMap2M: 18446744073709549568 kB with this patch get: ... DirectMap4k: 4032 kB DirectMap2M: 1044480 kB which is consistent to kernel_page_tables ---[ Low Kernel Mapping ]--- 0xffff880000000000-0xffff880000001000 4K RW PCD GLB x pte 0xffff880000001000-0xffff88000009f000 632K RW GLB x pte 0xffff88000009f000-0xffff8800000a0000 4K RW PCD GLB x pte 0xffff8800000a0000-0xffff880000200000 1408K RW GLB x pte 0xffff880000200000-0xffff88003fe00000 1020M RW PSE GLB x pmd 0xffff88003fe00000-0xffff88003fff0000 1984K RW GLB NX pte 0xffff88003fff0000-0xffff880040000000 64K pte 0xffff880040000000-0xffff888000000000 511G pud 0xffff888000000000-0xffffc20000000000 58880G pgd Signed-off-by: Yinghai Lu Acked-by: Suresh Siddha Signed-off-by: Ingo Molnar commit 4078e359c4688541a0093fde0dff35dc7190c4f5 Author: Jiri Kosina Date: Mon Oct 27 17:41:58 2008 +0100 sched: fix documentation reference for sched_min_granularity_ns Impact: documentation fix sched-design-CFS.txt wrongly references sched_granularity_ns sysctl, as its name in fact is sched_min_granularity_ns. Signed-off-by: Jiri Kosina Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit b70a6b27ed4cbb9ea7a4e1abc080ed65692ecb9b Merge: 1d63e72... 3a63913... Author: Linus Torvalds Date: Mon Oct 27 09:54:23 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (33 commits) MIPS: lemote/lm2e: Added io_map_base to pci controller MIPS: TXx9: Make firmware parameter passing more robust MIPS: Markeins: Remove unnecessary define and cleanup comments, etc. MIPS: Markeins: Extract ll_emma2rh_* functions MIPS: Markeins: Remove runtime debug prints MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base MIPS: EMMA2RH: Remove emma2rh_sw_irq_base MIPS: EMMA2RH: Remove emma2rh_irq_base global variable MIPS: EMMA2RH: Remove emma2rh_sync on read operation MIPS: EMMA: Move to dir MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/ MIPS: EMMA: Kconfig reorganization MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors MIPS: RB532: Disable the right device MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling MIPS: Fix KGDB build error INPUT: sgi_btns: Add license specification MIPS: IP22: ip22-int.c header file weeding. ... commit 1d63e726408dfdb3e10ed8f00c383b30ebb333d3 Merge: 31390d0... cd1f70fd... Author: Linus Torvalds Date: Mon Oct 27 09:37:16 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fw-sbp2: fix races firewire: fw-sbp2: delay first login to avoid retries firewire: fw-ohci: initialization failure path fixes firewire: fw-ohci: don't leak dma memory on module removal firewire: fix struct fw_node memory leak firewire: Survive more than 256 bus resets commit 31390d0fde1ac9cf47002729660ffd7cd2ae1d75 Merge: 6634160... 0a9b863... Author: Linus Torvalds Date: Mon Oct 27 09:36:33 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) ALSA: hda - Restore default pin configs for realtek codecs sound: use a common working email address pci: use pci_ioremap_bar() in sound/ commit 3a63913f607832a2629545467e715a40ec930c32 Author: Zhang Le Date: Mon Oct 27 23:33:24 2008 +0000 MIPS: lemote/lm2e: Added io_map_base to pci controller Signed-off-by: Zhang Le Signed-off-by: Ralf Baechle commit 97b0511ce125b0cb95d73b198c1bdbb3cebc4de2 Author: Geert Uytterhoeven Date: Mon Oct 27 15:25:49 2008 +0100 MIPS: TXx9: Make firmware parameter passing more robust When booting Linux on a txx9 board with VxWorks boot loader, it crashes in prom_getenv(), as VxWorks doesn't pass firmware parameters in a0-a3 (in my case, the actual leftover values in these registers were 0x80002000, 0x80001fe0, 0x2000, and 0x20). Make the parsing of argc, argv, and envp a bit more robust by checking if argc is a number below CKSEG0, and argv/envp point to CKSEG0. Signed-off-by: Geert Uytterhoeven Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d1a8e2a6da5bea09452495748891a4ea9e42035e Author: Shinya Kuribayashi Date: Fri Oct 24 01:36:33 2008 +0900 MIPS: Markeins: Remove unnecessary define and cleanup comments, etc. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 49618d652b2fe9c63808c7a2cc7089aa594cf521 Author: Shinya Kuribayashi Date: Fri Oct 24 01:35:59 2008 +0900 MIPS: Markeins: Extract ll_emma2rh_* functions These functions are completely ineffective. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit a9c2aa17a8b8b7a813d31e66da5d31cfdd006f4b Author: Shinya Kuribayashi Date: Fri Oct 24 01:33:10 2008 +0900 MIPS: Markeins: Remove runtime debug prints Remove runtime db_* macros as we don't need them any more. In general, such helpers are useful for initial porting, but once approved, they are not indispensable. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 9ae9fd79af28d6488e97311a3b60379b59ff4c90 Author: Shinya Kuribayashi Date: Fri Oct 24 01:32:40 2008 +0900 MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c Current EMMA2RH irq code is mess. Before cleaning it up, gather them in one place as a first step. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit fcb3cfe7f087fb27c35be911791883fb725055b1 Author: Shinya Kuribayashi Date: Fri Oct 24 01:32:11 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 68ed1ca9120506b2a0f80e4542deea24f89081ab Author: Shinya Kuribayashi Date: Fri Oct 24 01:31:43 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_sw_irq_base Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 9b6c04bc9726edf2655dd69d2e40c0ae4f07e525 Author: Shinya Kuribayashi Date: Fri Oct 24 01:31:16 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_irq_base global variable Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 27bd804582d9a45cad8304e703c9de65ddd67bc5 Author: Shinya Kuribayashi Date: Fri Oct 24 01:30:48 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_sync on read operation It's totally a waste of CPU cycles. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit d91f2cbe698cf70b50099343dac1ec8061bfd045 Author: Shinya Kuribayashi Date: Fri Oct 24 01:30:20 2008 +0900 MIPS: EMMA: Move to dir We'll put all EMMA related headers there in the future. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit f27655e34171b0ae9ea5a0aadae894e817f0f875 Author: Shinya Kuribayashi Date: Fri Oct 24 01:29:16 2008 +0900 MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/ git mv arch/mips/{emma2rh,emma} and fixups Makefiles. We'll put all NEC EMMA series based machines there in the future. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit cd741b604b94a4d5bebf2672626ffec7de44652c Author: Shinya Kuribayashi Date: Fri Oct 24 06:00:01 2008 +0900 MIPS: EMMA: Kconfig reorganization - Move EMMA related stuff into arch/mips/emma/Kconfig - Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively - Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 542c1020ac1cbc2f50934086ad893384a2cbd233 Author: Shinya Kuribayashi Date: Fri Oct 24 01:27:57 2008 +0900 MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors We already have sufficient infrastructure to support VR5500 and VR5500A series processors. Here's a Makefile support to make it selectable by ports, and enable it for NEC EMMA2RH Markeins board. This patch also fixes a confused target help, and adds 1Gb PageMask bits supported by VR5500 and its variants. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit bc4c4e832a203f66959e5eb2ecc56b0b9525173e Author: Phil Sutter Date: Mon Oct 27 02:29:57 2008 +0100 MIPS: RB532: Disable the right device Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit edb6310aaa0dfc3da303a4ba6dff9dce3fbaa8d3 Author: Daniel Laird Date: Mon Jun 16 15:49:21 2008 +0100 MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel The following patch add support for the NXP PNX833x SOC. More specifically it adds support for the STB222/5 variant. It fixes the vectored interrupt issue. Signed-off-by: daniel.j.laird Signed-off-by: Jason Wessel Signed-off-by: Ralf Baechle commit 537fa37c8606793b9998c35de0abfcb7d549a3f2 Author: Geert Uytterhoeven Date: Thu Oct 23 16:43:13 2008 +0200 MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling Fix a typo in the comment for the TOSHIBA_RBTX4939 config option Signed-off-by: Geert Uytterhoeven Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f6a3176a18b724154e7beede0e10da56e47abe2b Author: Yoichi Yuasa Date: Sat Oct 25 17:30:35 2008 +0900 MIPS: Fix KGDB build error In file included from include/linux/ptrace.h:49, from arch/mips/kernel/kgdb.c:25: /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:123: error: expected declaration specifiers or '...' before '__s64' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:124: error: expected declaration specifiers or '...' before '__s64' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:126: error: expected declaration specifiers or '...' before '__u32' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:127: error: expected declaration specifiers or '...' before '__u32' make[1]: *** [arch/mips/kernel/kgdb.o] Error 1 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 4c2bdcdc62e7a07bd0786fd2048e4ac97ae74e6e Author: Dmitri Vorobiev Date: Sat Oct 25 01:46:57 2008 +0300 INPUT: sgi_btns: Add license specification The SGI Volume Button interface driver uses GPL-only symbols platform_driver_unregister and platform_driver_register, but lacks license specification. Thus, when compiled as a module, this driver cannot be installed. This patch fixes this by adding the MODULE_LICENSE() specification. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 2f123e503dccde75550a0384982d5070d41b8a52 Author: Ralf Baechle Date: Sat Oct 25 15:51:48 2008 +0100 MIPS: IP22: ip22-int.c header file weeding. Signed-off-by: Ralf Baechle commit 14823ccbf8c3209a84a544e846feaf886cb59be9 Author: Dmitri Vorobiev Date: Sat Oct 25 01:46:56 2008 +0300 MIPS: IP22: Small cleanups The following functions disable_local1_irq() disable_local2_irq() disable_local3_irq() are needlessly defined global, so make them static. While at it, fix a whitespace error in the same file. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 1ba5a1767416cfa4fa37096e160e764c56e1460a Author: Atsushi Nemoto Date: Tue Oct 21 00:01:06 2008 +0900 MIPS: RBTX4939: Add smc91x support Add smc91x platform device to RBTX4939 board and some hacks for big endian. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bc89b2bdefa5f56133d0b19a220880d4ada62560 Author: Atsushi Nemoto Date: Mon Oct 20 23:28:50 2008 +0900 MIPS: TXx9: 7 segment LED support Add sysfs interface for 7 segment LED and implement access routine for RBTX4939. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f591eb1e6896e26675e91a319cc93f3800dbaad4 Author: Manuel Lauss Date: Tue Oct 21 08:59:14 2008 +0200 MIPS: Alchemy: Wire up SD controller on DB/PB1200 boards. Add au1xmmc platform data for PB1200/DB1200 boards and wire up the 2 SD controllers for them. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit fa36b04386422951a7c73f9210403d1a2eaffe92 Author: Florian Fainelli Date: Fri Oct 24 19:53:55 2008 +0200 MIPS: RB532: Set gpio interrupt status and level for CompactFlash This patch sets the correct interrupt status and level in order to get the CompactFlash adapter working. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 052ac71c4b85e5ce7e70d4f9b3555caa647d884a Author: Adrian Bunk Date: Sun Oct 12 16:01:35 2008 +0300 MIPS: RB532: Fix build error mips/pci/fixup-rc32434.c must #include This patch fixes the following compile error caused by commit 606a083b1e1a357cb66454e4581b80f1a67d8368 (MIPS: RB532: Cleanup the headers again): <-- snip --> ... CC arch/mips/pci/fixup-rc32434.o arch/mips/pci/fixup-rc32434.c: In function 'pcibios_map_irq': arch/mips/pci/fixup-rc32434.c:46: error: 'GROUP4_IRQ_BASE' undeclared (first use in this function) arch/mips/pci/fixup-rc32434.c:46: error: (Each undeclared identifier is reported only once arch/mips/pci/fixup-rc32434.c:46: error: for each function it appears in.) make[2]: *** [arch/mips/pci/fixup-rc32434.o] Error 1 <-- snip --> A virtually identical patch was also submitted by Yoichi Yuasa . Signed-off-by: Adrian Bunk Acked-by: Florian Fainelli Signed-off-by: Ralf Baechle commit c944013518cc3ba407057e9ee910d0258c0a47dd Author: David Daney Date: Fri Oct 24 09:31:13 2008 -0700 MIPS: Fix KGDB build error is exported to userland so can't include , so replace the C99 types with their basic C type equivalents. Bug originally reported and initial patch by Yoichi Yuasa . Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit fb498e2570eedc6c9c3d165e370624dfc3aed97b Author: Atsushi Nemoto Date: Sat Oct 25 01:17:23 2008 +0900 MIPS: Set ENOSYS to errno on illegal system call number for syscall(2) Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bda8229bdd087167f463ad5e74299987924f8137 Author: Atsushi Nemoto Date: Sat Oct 25 01:17:22 2008 +0900 MIPS: Set positive error number to errno on illegal_syscall Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 7920c4d658ff2b0f7b8acf3bd7c700875c2bc163 Author: Ralf Baechle Date: Sat Oct 18 13:23:10 2008 +0100 MIPS: SMP: Don't reenable interrupts in stop_this_cpu; use WAIT instruction. Noticed by Anirban Sinha ; patch by me. Signed-off-by: Ralf Baechle commit f67ae98352284d7ac1e03f3a872e33c68ea35a5b Author: David Daney Date: Fri Oct 17 17:48:53 2008 -0700 MIPS: Don't unmap the memory for dma_sync*. We were getting away with this for so long only because the only platform with a non-empty plat_unmap_dma_mem() doesn't call dma_sync_sg_for_cpu() and dma_sync_sg_for_device() from its commonly used drivers. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit b517531ce53794f2a2eae1fff1d1216b9db4da9f Author: Zhaolei Date: Fri Oct 17 19:12:35 2008 +0800 MIPS: Fix debugfs_create_*'s error checking method for mips/kernel/ debugfs_create_*() returns NULL on error. Make its callers return -ENODEV on error. Signed-off-by: Zhao Lei Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit ecab1f4479abb88d739bc1aac5545e8399fbad66 Author: Zhaolei Date: Fri Oct 17 19:12:30 2008 +0800 MIPS: Fix debugfs_create_*'s error checking method for arch/mips/math-emu/ debugfs_create_*() returns NULL on error. Make its caller debugfs_fpuemu return -ENODEV on error. Signed-off-by: Zhao Lei Signed-off-by: Ralf Baechle commit 0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 Merge: bfd4e66... c3e5203... e044c39... 2f1e593... 2f5ad54... Author: Takashi Iwai Date: Mon Oct 27 17:08:11 2008 +0100 Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus commit c3e5203bed1999df716e3c7119f6749523eb952f Author: Cliff Cai Date: Mon Oct 27 17:09:25 2008 +0800 ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) - Setting the TFS pin selector for SPORT 0 based on whether the selected port id F or G. If the port is F then no conflict should exist for the TFS. When Port G is selected and EMAC then there is a conflict between the PHY interrupt line and TFS. Current settings prevent the conflict by ignoring the TFS pin when Port G is selected. This allows both ssm2602 using Port G and EMAC concurrently. - some code cleanup Signed-off-by: Cliff Cai Signed-off-by: Bryan Wu Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit e044c39ae258678d6ebb09fccb2a0fdf7ec51847 Author: Takashi Iwai Date: Mon Oct 27 16:56:24 2008 +0100 ALSA: hda - Restore default pin configs for realtek codecs Some machines have broken BIOS resume that doesn't restore the default pin configuration properly, which results in a wrong detection of HP pin. This causes a silent speaker output due to missing HP detection. Related bug: Novell bug#406101 https://bugzilla.novell.com/show_bug.cgi?id=406101 This patch fixes the issue by saving/restoring the default pin configs by the driver itself. Signed-off-by: Takashi Iwai commit 8115f3f0c939c5db0fe3c6c6c58911fd3a205b1e Author: Steven Rostedt Date: Fri Oct 24 09:12:17 2008 -0400 ftrace: use a real variable for ftrace_nop in x86 Impact: avoid section mismatch warning, clean up The dynamic ftrace determines which nop is safe to use at start up. When it finds a safe nop for patching, it sets a pointer called ftrace_nop to point to the code. All call sites are then patched to this nop. Later, when tracing is turned on, this ftrace_nop variable is again used to compare the location to make sure it is a nop before we update it to an mcount call. If this fails just once, a warning is printed and ftrace is disabled. Rakib Mullick noted that the code that sets up the nop is a .init section where as the nop itself is in the .text section. This is needed because the nop is used later on after boot up. The problem is that the test of the nop jumps back to the setup code and causes a "section mismatch" warning. Rakib first recommended to convert the nop to .init.text, but as stated above, this would fail since that text is used later. The real solution is to extend Rabik's patch, and to make the ftrace_nop into an array, and just save the code from the assembly to this array. Now the section can stay as an init section, and we have a nop to use later on. Reported-by: Rakib Mullick Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit ea31e72d753e5817a97de552f152d0cb55c7defc Author: Frederic Weisbecker Date: Wed Oct 22 19:26:23 2008 +0200 tracing/ftrace: make boot tracer select the sched_switch tracer Impact: build fix If the boot tracer is selected but not the sched_switch, there will be a build failure: kernel/built-in.o: In function `boot_trace_init': trace_boot.c:(.text+0x5ee38): undefined reference to `sched_switch_trace' kernel/built-in.o: In function `disable_boot_trace': (.text+0x5eee1): undefined reference to `tracing_stop_cmdline_record' kernel/built-in.o: In function `enable_boot_trace': (.text+0x5ef11): undefined reference to `tracing_start_cmdline_record' This patch fixes it. Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar commit f66af459a931f25807e1df7915b2b66bb5978d82 Author: Frederic Weisbecker Date: Wed Oct 22 19:14:55 2008 +0200 tracepoint: check if the probe has been registered Impact: fix kernel crash that can trigger during tracing If we try to remove a probe that has not been already registered, the tracepoint_entry_remove_probe() function will dereference a NULL pointer. Check the probe before removing it to avoid crashes. Signed-off-by: Frederic Weisbecker Acked-by: Mathieu Desnoyers Acked-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 6634160abfdbac39bd5ebda516b15b078a0f598e Merge: 526719b... 8b5f12d... Author: Linus Torvalds Date: Mon Oct 27 08:41:13 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: syncookies: fix inclusion of tcp options in syn-ack libertas: free sk_buff with kfree_skb btsdio: free sk_buff with kfree_skb Phonet: do not reply to indication reset packets Phonet: include generic link-layer header size in MAX_PHONET_HEADER commit 526719ba51e7d7bd31f7af9ab04b015b70096685 Author: Alan Cox Date: Mon Oct 27 15:19:48 2008 +0000 Switch to a valid email address... Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 77122d0b5d1fb2276b1fe7bce6366f22b2f96606 Author: Alan Cox Date: Mon Oct 27 15:10:23 2008 +0000 Tidy up addresses in random drivers Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b9b54aa2a60dcd9c06b76f6610e1b466bc93e3cd Author: Eric Miao Date: Mon Oct 27 17:48:50 2008 +0800 leds: da903x: fix the building failure of incomplete type of 'work' The leds-da903x LED driver was missing the proper #include of linux/workqueue.h, but happened to compile on ARM due to implied includes through other header files. We do need the explict include on other architectures (reported at least for x86-64). Reported-tested-and-acked-by: Jean Delvare Signed-off-by: Eric Miao Signed-off-by: Linus Torvalds commit 2f1e593d4209d0194f9639c5d11aa91171435963 Author: Alan Cox Date: Mon Oct 27 15:21:19 2008 +0000 sound: use a common working email address Signed-off-by: Alan Cox Signed-off-by: Takashi Iwai commit b170060c6ccd719eebb53b10c98df2a4e6968f28 Author: Jiri Slaby Date: Mon Oct 27 12:16:16 2008 +0100 HID: sync on deleted io_retry timer in usbhid driver When suspending, make sure that the timer is not running any more. Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a Author: Jiri Slaby Date: Mon Oct 27 12:16:15 2008 +0100 HID: fix oops during suspend of unbound HID devices Usbhid structure is allocated on start invoked only from probe of some driver. When there is no driver, the structure is null and causes null-dereference oopses. Fix it by allocating the structure on probe and disconnect of the device itself. Also make sure we won't race between start and resume or stop and suspend respectively. References: http://bugzilla.kernel.org/show_bug.cgi?id=11827 Signed-off-by: Jiri Slaby Cc: Johannes Berg Cc: Andreas Schwab Signed-off-by: Jiri Kosina commit ef020ab0109aa5cd6eac2e93519b7641c9862828 Author: Cliff Wickman Date: Thu Oct 23 17:54:05 2008 -0500 x86/uv: memory allocation at initialization Impact: on SGI UV platforms, fix boot crash UV initialization is currently called too late to call alloc_bootmem_pages(). The current sequence is: start_kernel() mem_init() free_all_bootmem() <--- discard of bootmem rest_init() kernel_init() smp_prepare_cpus() native_smp_prepare_cpus() uv_system_init() <--- uses alloc_bootmem_pages() It should be calling kmalloc(). Signed-off-by: Cliff Wickman Signed-off-by: Ingo Molnar commit 9f32d21c981bb638d0991ce5675a20337312066b Author: Chris Lalancette Date: Thu Oct 23 17:40:25 2008 -0700 xen: fix Xen domU boot with batched mprotect Impact: fix guest kernel boot crash on certain configs Recent i686 2.6.27 kernels with a certain amount of memory (between 736 and 855MB) have a problem booting under a hypervisor that supports batched mprotect (this includes the RHEL-5 Xen hypervisor as well as any 3.3 or later Xen hypervisor). The problem ends up being that xen_ptep_modify_prot_commit() is using virt_to_machine to calculate which pfn to update. However, this only works for pages that are in the p2m list, and the pages coming from change_pte_range() in mm/mprotect.c are kmap_atomic pages. Because of this, we can run into the situation where the lookup in the p2m table returns an INVALID_MFN, which we then try to pass to the hypervisor, which then (correctly) denies the request to a totally bogus pfn. The right thing to do is to use arbitrary_virt_to_machine, so that we can be sure we are modifying the right pfn. This unfortunately introduces a performance penalty because of a full page-table-walk, but we can avoid that penalty for pages in the p2m list by checking if virt_addr_valid is true, and if so, just doing the lookup in the p2m table. The attached patch implements this, and allows my 2.6.27 i686 based guest with 768MB of memory to boot on a RHEL-5 hypervisor again. Thanks to Jeremy for the suggestions about how to fix this particular issue. Signed-off-by: Chris Lalancette Signed-off-by: Jeremy Fitzhardinge Cc: Chris Lalancette Signed-off-by: Ingo Molnar commit 5209f08dc8e5f520ca81b87fa9a7142f58a109f4 Author: Jonas Bonn Date: Sat Oct 25 11:49:20 2008 +0200 asm-generic: define DIE_OOPS in asm-generic Impact: build fix DIE_OOPS is now used in the generic trace handling code so it needs to be defined for all architectures. Define it in asm-generic so that it's available to all by default and doesn't cause build errors for architectures that rely on the generic implementation. Signed-off-by: Jonas Bonn Acked-by: Steven Rostedt Signed-off-by: Ingo Molnar commit e2862c9470beb842d3f1c1965b03a2112114c160 Author: Stephen Rothwell Date: Mon Oct 27 17:43:28 2008 +1100 trace: fix printk warning for u64 A powerpc ppc64_defconfig build produces these warnings: kernel/trace/ring_buffer.c: In function 'rb_add_time_stamp': kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64' kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64' kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64' Just cast the u64s to unsigned long long like we do everywhere else. Signed-off-by: Stephen Rothwell Acked-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 4944dd62de21230af039eda7cd218e9a09021d11 Merge: f17845e... 0173a32... Author: Ingo Molnar Date: Mon Oct 27 10:50:54 2008 +0100 Merge commit 'v2.6.28-rc2' into tracing/urgent commit 8b5f12d04b2e93842f3dda01f029842047bf3f81 Author: Florian Westphal Date: Sun Oct 26 23:10:12 2008 -0700 syncookies: fix inclusion of tcp options in syn-ack David Miller noticed that commit 33ad798c924b4a1afad3593f2796d465040aadd5 '(tcp: options clean up') did not move the req->cookie_ts check. This essentially disabled commit 4dfc2817025965a2fc78a18c50f540736a6b5c24 '[Syncookies]: Add support for TCP options via timestamps.'. This restores the original logic. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit b700a98c70401c2a48e509b91b47f58a883806bc Author: Sergio Luis Date: Sun Oct 26 23:09:27 2008 -0700 libertas: free sk_buff with kfree_skb free sk_buff with kfree_skb, instead of kree Signed-off-by: Sergio Luis Signed-off-by: David S. Miller commit cbfd24a75f98fe731547d3bc995f3a1f1fed6b20 Author: Sergio Luis Date: Sun Oct 26 23:08:48 2008 -0700 btsdio: free sk_buff with kfree_skb free sk_buff with kfree_skb, instead of kree Signed-off-by: Sergio Luis Signed-off-by: David S. Miller commit c3a90c788b743303c4d824780a3a7271693fb64a Author: Remi Denis-Courmont Date: Sun Oct 26 23:07:25 2008 -0700 Phonet: do not reply to indication reset packets This fixes a potential error packet loop. Signed-off-by: Remi Denis-Courmont Signed-off-by: David S. Miller commit e214a8cc7a81f20ed7cb4f6373cf15048556bbac Author: Remi Denis-Courmont Date: Sun Oct 26 23:06:31 2008 -0700 Phonet: include generic link-layer header size in MAX_PHONET_HEADER This fixes an OOPS in hard_header if a Phonet address is assigned to a non-Phonet network interface. Signed-off-by: Remi Denis-Courmont Signed-off-by: David S. Miller commit 2a88b6e81589b1d064e03db066feaaa58f6a2d13 Author: Paul Mundt Date: Fri Oct 24 14:30:51 2008 +0900 sh: oprofile: Fix up the SH7750 performance counter name. Rather than varying this on a subtype level, we use the counter type as a generic identifier. This simplifies logic in the userspace tools where no fundamental difference exists across the various subtypes. Signed-off-by: Paul Mundt commit f8d56f1771e4867acc461146764b4feeb5245669 Merge: 3d6eadc... 92850bb... Author: Linus Torvalds Date: Sun Oct 26 16:42:18 2008 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: allow extended partitions on md devices. md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state md: use sysfs_notify_dirent to notify changes to md/array_state commit 3d6eadcb5008beca1b289983ffd7771d1e947bac Merge: a483ab1... 2a0bd75... Author: Linus Torvalds Date: Sun Oct 26 16:40:59 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - add support for Elantech touchpads Input: i8042 - add Blue FB5601 to noloop exception table commit a483ab1dddf86a0e8924e94cf838eed602602b39 Merge: eba966a... 9c36645... Author: Linus Torvalds Date: Sun Oct 26 16:37:37 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: Make WM8400 depend on I2C until SPI is submitted mfd: add missing Kconfig entry for da903x commit eba966a4e780199e31e8fd1d21bc9d187b1c9eaf Merge: ecc96e7... ae5d82c... Author: Linus Torvalds Date: Sun Oct 26 16:35:41 2008 -0700 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: uwb: build UWB before USB/WUSB commit ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 Merge: a1a739c... cc6e0bb... Author: Linus Torvalds Date: Sun Oct 26 16:34:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Add support for Sony Vaio VGX-TP1E HID: fix lock imbalance in hiddev HID: fix lock imbalance in hidraw HID: fix hidbus/appletouch device binding regression HID: add hid_type to general hid struct HID: quirk for OLED devices present in ASUS G50/G70/G71 HID: Remove "default m" for Thrustmaster and Zeroplus HID: fix hidraw_exit section mismatch HID: add support for another Gyration remote control Revert "HID: Invert HWHEEL mappings for some Logitech mice" commit a1a739c56ad031b8bf8b3804f568ac88899f8dd7 Author: Randy Dunlap Date: Sat Oct 25 17:24:36 2008 -0700 docbooks: fix fatal filename errors Fix docbook fatal errors (file location changed): docproc: lin2628-rc1/include/asm-x86/io_32.h: No such file or directory make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1 docproc: lin2628-rc1/include/asm-x86/atomic_32.h: No such file or directory make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1 docproc: lin2628-rc1/include/asm-x86/mca_dma.h: No such file or directory make[1]: *** [Documentation/DocBook/mcabook.xml] Error 1 Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 890c78c2d681a8dc89c78eb9177990cad3a77dc3 Author: Randy Dunlap Date: Sat Oct 25 17:06:43 2008 -0700 kernel-doc: allow more whitespace in macros Allow macros that are annotated with kernel-doc to contain whitespace between the '#' and "define". It's valid and being used, so allow it. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 7eea5b897eb6bbb79d7e6e398f4fbb61fcee57c7 Merge: 0173a32... 9fb3c5c... Author: Linus Torvalds Date: Sun Oct 26 16:29:12 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: leds-hp-disk: fix build warning ACPI: Oops in ACPI with git latest ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y. toshiba_acpi: always call input_sync() after input_report_switch() ACPI: Always report a sync event after a lid state change ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined i7300_idle: Cleanup based review comments i7300_idle: Disable ioat channel only on platforms where ile driver can load commit cd1f70fdb4823c97328a1f151f328eb36fafd579 Author: Jay Fenlason Date: Fri Oct 24 15:26:20 2008 -0400 firewire: fw-sbp2: fix races 1: There is a small race between queue_delayed_work() and its corresponding kref_get(). Do the kref_get first, and _put it again if the queue_delayed_work() failed, so there is no chance of the kref going to zero while the work is scheduled. 2: An SBP2_LOGOUT_REQUEST could be sent out with a login_id full of garbage. Initialize it to an invalid value so we can tell if we ever got a valid login_id. 3: The node ID and generation may have changed but the new values may not yet have been recorded in lu and tgt when the final logout is attempted. Use the latest values from the device in sbp2_release_target(). Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 0dcfeb7e3c8695c5aa3677dda8efb9bef2e7e64d Author: Stefan Richter Date: Wed Oct 22 00:28:36 2008 +0200 firewire: fw-sbp2: delay first login to avoid retries This optimizes firewire-sbp2's device probe for the case that the local node and the SBP-2 node were discovered at the same time. In this case, fw-core's bus management work and fw-sbp2's login and SCSI probe work are scheduled in parallel (in the globally shared workqueue and in fw-sbp2's workqueue, respectively). The bus reset from fw-core may then disturb and extremely delay the login and SCSI probe because the latter fails with several command timeouts and retries and has to be retried from scratch. We avoid this particular situation of sbp2_login() and fw_card_bm_work() running in parallel by delaying the first sbp2_login() a little bit. This is meant to be a short-term fix for https://bugzilla.redhat.com/show_bug.cgi?id=466679. In the long run, the SCSI probe, i.e. fw-sbp2's call of __scsi_add_device(), should be parallelized with sbp2_reconnect(). Problem reported and fix tested and confirmed by Alex Kanavin. Signed-off-by: Stefan Richter commit 7007a0765e33bf89182e069e35ec6009fa54f610 Author: Stefan Richter Date: Sun Oct 26 09:50:31 2008 +0100 firewire: fw-ohci: initialization failure path fixes Fix leaks when pci_probe fails. Simplify error log strings. Signed-off-by: Stefan Richter commit a55709ba9d27053471f9fca8ee76b41ecefc14cd Author: Jay Fenlason Date: Wed Oct 22 15:59:42 2008 -0400 firewire: fw-ohci: don't leak dma memory on module removal The transmit and receive context dma memory was not being freed on module removal. Neither was the config rom memory. Fix that. The ab->next assignment is pure paranoia. Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 77e557191701afa55ae7320d42ad6458a2ad292e Author: Jay Fenlason Date: Thu Oct 16 18:00:15 2008 -0400 firewire: fix struct fw_node memory leak With the bus_resets patch applied, it is easy to see this memory leak by repeatedly resetting the firewire bus while running slabtop in another window. Just watch kmalloc-32 grow and grow... Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307 Author: Jay Fenlason Date: Thu Oct 16 15:51:59 2008 -0400 firewire: Survive more than 256 bus resets The "color" is used during the topology building after a bus reset, hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card it is stored in an int. When the value wraps in one struct, but not the other, disaster strikes. Signed-off-by: Jay Fenlason Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922. Signed-off-by: Stefan Richter commit 9fb3c5ca3dabe06758c35f790c68e273ed749e19 Merge: 438f8de... f371be6... Author: Len Brown Date: Sat Oct 25 04:07:44 2008 -0400 Merge branch 'i7300_idle' into release commit 438f8de46bc261b35d84771ae9992cfff3ff4dd8 Author: Len Brown Date: Sat Oct 25 03:52:16 2008 -0400 leds-hp-disk: fix build warning drivers/leds/leds-hp-disk.c:59: warning: passing argument 4 of ‘acpi_evaluate_integer’ from incompatible pointer type Signed-off-by: Len Brown commit f8123381bae8d581d81f24b55719db3d9a6a262c Author: Rafael J. Wysocki Date: Fri Oct 24 21:50:31 2008 +0200 ACPI: Oops in ACPI with git latest ACPI Warning (nseval-0168): Insufficient arguments - method [_OSC] needs 5, found 4 [20080926] ACPI Warning (nspredef-0252): \_SB_.PCI0._OSC: Parameter count mismatch - ASL declared 5, expected 4 [20080926] ACPI Error (nspredef-0163): \_SB_.PCI0._OSC: Missing expected return value [20080926] BUG: unable to handle kernel NULL pointer dereference at 00000000 IP: [] acpi_run_osc+0xa1/0x170 Signed-off-by: Rafael J. Wysocki Tested-by: James Bottomley Signed-off-by: Len Brown commit 92daa7b53b76984565dfdfda5d9c679884121fb2 Author: Rafael J. Wysocki Date: Thu Oct 23 21:46:43 2008 +0200 ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit cab08969188e2da09923fe9c4a99ec9b934b0708 Author: Len Brown Date: Fri Oct 24 15:39:47 2008 -0400 toshiba_acpi: always call input_sync() after input_report_switch() Signed-off-by: Len Brown commit df316e939100e789b3c5d4d102619ccf5834bd00 Author: Guillem Jover Date: Fri Oct 24 00:28:33 2008 +0300 ACPI: Always report a sync event after a lid state change Currently not always an EV_SYN event is reported to userland after the EV_SW SW_LID event has been sent. This is easy to verify by using “input-events” from input-utils and just closing and opening the lid. Signed-off-by: Guillem Jover Signed-off-by: Len Brown commit 16be87ea170ae6cfaa9f47f79d14f7577d8cb420 Author: Miao Xie Date: Fri Oct 24 17:22:04 2008 +0800 ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c When trying to build 2.6.28-rc1 on ia64, make aborts with: CC drivers/acpi/processor_perflib.o drivers/acpi/processor_perflib.c:41:28: error: asm/cpufeature.h: No such file or directory drivers/acpi/processor_perflib.c: In function ‘acpi_processor_get_performance_info’: drivers/acpi/processor_perflib.c:364: error: implicit declaration of function ‘boot_cpu_has’ drivers/acpi/processor_perflib.c:364: error: ‘X86_FEATURE_EST’ undeclared (first use in this function) drivers/acpi/processor_perflib.c:364: error: (Each undeclared identifier is reported only once drivers/acpi/processor_perflib.c:364: error: for each function it appears in.) make[2]: *** [drivers/acpi/processor_perflib.o] Error 1 make[1]: *** [drivers/acpi] Error 2 make: *** [drivers] Error 2 this patch fix it. Signed-off-by: Miao Xie Acked-by: Thomas Renninger Signed-off-by: Len Brown commit 3b15e581981b3ad35809f56d8131d5c19b6da1bd Author: Fenghua Yu Date: Thu Oct 23 16:51:00 2008 -0700 x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI On Thu, Oct 23, 2008 at 04:09:52PM -0700, Alexander Beregalov wrote: > arch/x86/kernel/built-in.o: In function `iommu_setup': > pci-dma.c:(.init.text+0x36ad): undefined reference to `forbid_dac' > pci-dma.c:(.init.text+0x36cc): undefined reference to `forbid_dac' > pci-dma.c:(.init.text+0x3711): undefined reference to `forbid_dac This patch partially reverts a patch to add IOMMU support to ia64. The forbid_dac variable was incorrectly moved to quirks.c, which isn't built when PCI is disabled. Tested-by: "Alexander Beregalov" Acked-by: FUJITA Tomonori Signed-off-by: Fenghua Yu Signed-off-by: Jesse Barnes commit 6bee00dbbcb1e9feb0510e9a7104b4af00adc574 Author: Dan Williams Date: Fri Oct 24 10:21:45 2008 -0700 [ARM] xsc3: revert writethrough memory-type encoding change Commit 40df2d1d "[ARM] Update Xscale and Xscale3 PTE mappings" was fingered by git-bisect for a boot failure on iop13xx. The change made L_PTE_MT_WRITETHROUGH mappings L2-uncacheable. Russell points out that this mapping is used for the vector page. Given the regression, and the fact this page is used often, restore the old behaviour. Signed-off-by: Dan Williams commit f371be6352cdde3df2253b76acb979480e93ce4f Author: Venki Pallipadi Date: Thu Oct 23 15:39:06 2008 -0700 i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined When I7300_idle driver is not configured, there is a compile time warning about IDLE_IOAT_CHANNEL not defined. Fix it. Reported-by: Suresh Siddha Reported-by: Arjan van de Ven Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 33093e186c8f80b443fafb1d347a140bdd2b86c6 Author: Venki Pallipadi Date: Wed Oct 22 16:51:03 2008 -0700 i7300_idle: Cleanup based review comments Cleanup of i7300 idle driver based on review comments from Randy Dunlap, Andi Kleen and Len Brown. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 3ad0b02e4c1d5feba44b8ff48dccd1ba61a826b0 Author: Venki Pallipadi Date: Wed Oct 22 16:34:52 2008 -0700 i7300_idle: Disable ioat channel only on platforms where ile driver can load Based on input from Andi Kleen: share the platform detection code with ioat_dma and disable the channel in dma engine only for specific platforms. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 9c366452e0b2df06f3ce0aabc6a53c94c595cd00 Author: Mark Brown Date: Fri Oct 24 17:16:11 2008 +0200 mfd: Make WM8400 depend on I2C until SPI is submitted Otherwise we could build in WM8400 but not I2C. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 8e2eaabfd9f7d375a1bb202e644ce2dcc0659592 Author: Samuel Ortiz Date: Fri Oct 24 17:10:05 2008 +0200 mfd: add missing Kconfig entry for da903x This one was accidentally left out during the rc1 mfd merge. Signed-off-by: Samuel Ortiz commit ae5d82cb8d600989338bbda5ea38f5c0ff47175a Author: David Vrabel Date: Fri Oct 24 16:46:22 2008 +0100 uwb: build UWB before USB/WUSB The WHCI-HCD driver in drivers/usb/host/ depends on the umc driver in drivers/uwb/. Signed-off-by: David Vrabel commit f17845e5d97ead8fbdadfd40039e058ec7cf4a42 Author: Ingo Molnar Date: Fri Oct 24 12:47:10 2008 +0200 ftrace: warning in kernel/trace/ftrace.c this warning: kernel/trace/ftrace.c:189: warning: ‘frozen_record_count’ defined but not used triggers because frozen_record_count is only used in the KCONFIG_MARKERS case. Move the variable it there. Alas, this frozen-record facility seems to have little use. The frozen_record_count variable is not used by anything, nor the flags. So this section might need a bit of dead-code-removal care as well. Signed-off-by: Ingo Molnar commit 3f3a490480d8ab96e0fe30a41f80f14e6a0c579d Author: Peter Zijlstra Date: Fri Oct 24 11:06:16 2008 +0200 sched: virtual time buddy preemption Since we moved wakeup preemption back to virtual time, it makes sense to move the buddy stuff back as well. The purpose of the buddy scheduling is to allow a quickly scheduling pair of tasks to run away from the group as far as a regular busy task would be allowed under wakeup preemption. This has the advantage that the pair can ping-pong for a while, enjoying cache-hotness. Without buddy scheduling other tasks would interleave destroying the cache. Also, it saves a word in cfs_rq. Signed-off-by: Peter Zijlstra Acked-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 464b75273f64be7c81fee975bd6ca9593df3427b Author: Peter Zijlstra Date: Fri Oct 24 11:06:15 2008 +0200 sched: re-instate vruntime based wakeup preemption The advantage is that vruntime based wakeup preemption has a better conceptual model. Here wakeup_gran = 0 means: preempt when 'fair'. Therefore wakeup_gran is the granularity of unfairness we allow in order to make progress. Signed-off-by: Peter Zijlstra Acked-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 0d13033bc9257fe65c1aa25e84568b1608da0901 Author: Mike Galbraith Date: Fri Oct 24 11:06:14 2008 +0200 sched: weaken sync hint Mysql+oltp and pgsql+oltp peaks are still shifted right. The below puts the peaks back to 1 client/server pair per core. Use the avg_overlap information to weaken the sync hint. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 1af5f730fc1bf7c62ec9fb2d307206e18bf40a69 Author: Peter Zijlstra Date: Fri Oct 24 11:06:13 2008 +0200 sched: more accurate min_vruntime accounting Mike noticed the current min_vruntime tracking can go wrong and skip the current task. If the only remaining task in the tree is a nice 19 task with huge vruntime, new tasks will be inserted too far to the right too, causing some interactibity issues. min_vruntime can only change due to the leftmost entry disappearing (dequeue_entity()), or by the leftmost entry being incremented past the next entry, which elects a new leftmost (__update_curr()) Due to the current entry not being part of the actual tree, we have to compare the leftmost tree entry with the current entry, and take the leftmost of these two. So create a update_min_vruntime() function that takes computes the leftmost vruntime in the system (either tree of current) and increases the cfs_rq->min_vruntime if the computed value is larger than the previously found min_vruntime. And call this from the two sites we've identified that can change min_vruntime. Reported-by: Mike Galbraith Signed-off-by: Peter Zijlstra Acked-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 01c8c57d668d94f1036d9ab11a22aa24ca16a35d Author: Peter Zijlstra Date: Fri Oct 24 11:06:12 2008 +0200 sched: fix a find_busiest_group buglet In one of the group load balancer patches: commit 408ed066b11cf9ee4536573b4269ee3613bd735e Author: Peter Zijlstra Date: Fri Jun 27 13:41:28 2008 +0200 Subject: sched: hierarchical load vs find_busiest_group The following change: - if (max_load - this_load + SCHED_LOAD_SCALE_FUZZ >= + if (max_load - this_load + 2*busiest_load_per_task >= busiest_load_per_task * imbn) { made the condition always true, because imbn is [1,2]. Therefore, remove the 2*, and give the it a fair chance. Signed-off-by: Peter Zijlstra Acked-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 Merge: 4ce72a2... 57f8f7b... Author: Ingo Molnar Date: Fri Oct 24 12:48:46 2008 +0200 Merge commit 'v2.6.28-rc1' into sched/urgent commit af4c293ffcdd76fc97469beb7d8861662232d92e Author: Arjan van de Ven Date: Sun Sep 28 16:21:43 2008 -0700 [WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog Use the newly introduced pci_ioremap_bar() function in drivers/watchdog. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Signed-off-by: Wim Van Sebroeck commit 03967c5267b0e7312d1d55dc814d94cf190ca573 Author: FUJITA Tomonori Date: Thu Oct 23 23:14:29 2008 +0900 x86: restore the old swiotlb alloc_coherent behavior This restores the old swiotlb alloc_coherent behavior (before the alloc_coherent rewrite): http://lkml.org/lkml/2008/8/12/200 The old alloc_coherent avoids GFP_DMA allocation first and if the allocated address is not fit for the device's coherent_dma_mask, then dma_alloc_coherent does GFP_DMA allocation. If it fails, alloc_coherent calls swiotlb_alloc_coherent (in short, we rarely used swiotlb_alloc_coherent). After the alloc_coherent rewrite, dma_alloc_coherent (include/asm-x86/dma-mapping.h) directly calls swiotlb_alloc_coherent. It means that we possibly can't handle a device having dma_masks > 24bit < 32bits since swiotlb_alloc_coherent doesn't have the above GFP_DMA retry mechanism. This patch fixes x86's swiotlb alloc_coherent to use the GFP_DMA retry mechanism, which dma_generic_alloc_coherent() provides now (pci-nommu.c and GART IOMMU driver also use dma_generic_alloc_coherent). Signed-off-by: FUJITA Tomonori Signed-off-by: Ingo Molnar commit 75bebb7f0c2a709812cccb4d3151a21b012c5cad Author: FUJITA Tomonori Date: Thu Oct 23 20:46:55 2008 +0900 x86: use GFP_DMA for 24bit coherent_dma_mask dma_alloc_coherent (include/asm-x86/dma-mapping.h) avoids GFP_DMA allocation first and if the allocated address is not fit for the device's coherent_dma_mask, then dma_alloc_coherent does GFP_DMA allocation. This is because dma_alloc_coherent avoids precious GFP_DMA zone if possible. This is also how the old dma_alloc_coherent (arch/x86/kernel/pci-dma.c) works. However, if the coherent_dma_mask of a device is 24bit, there is no point to go into the above GFP_DMA retry mechanism. We had better use GFP_DMA in the first place. Signed-off-by: FUJITA Tomonori Tested-by: Takashi Iwai Signed-off-by: Ingo Molnar commit a2b89b596c5a0b288adac84b17bdda6bde8d144e Author: FUJITA Tomonori Date: Thu Oct 23 18:42:03 2008 +0900 swiotlb: remove panic for alloc_coherent failure swiotlb_alloc_coherent calls panic() when allocated swiotlb pages is not fit for a device's dma mask. However, alloc_coherent failure is not a disaster at all. AFAIK, none of other x86 and IA64 IOMMU implementations don't crash in case of alloc_coherent failure. There are some drivers that don't check alloc_coherent failure but not many (about ten and I've already started to fix some of them). alloc_coherent returns NULL in case of failure so it's likely that these guilty drivers crash immediately. So swiotlb doesn't need to call panic() just for them. Reported-by: Takashi Iwai Signed-off-by: FUJITA Tomonori Tested-by: Takashi Iwai Signed-off-by: Ingo Molnar commit ff3c536291ce96ef6f45704cd37eaed71127dd42 Author: Isaku Yamahata Date: Tue Oct 14 17:50:44 2008 -0700 xen: compilation fix of drivers/xen/events.c on IA64 use set_xen_guest_handle() instead of direct assigning. > linux-2.6/drivers/xen/events.c: In function 'xen_poll_irq': > linux-2.6/drivers/xen/events.c:757: error: incompatible types in assignment > make[4]: *** [drivers/xen/events.o] Error 1 Signed-off-by: Isaku Yamahata Signed-off-by: Jeremy Fitzhardinge Cc: Isaku Yamahata Signed-off-by: Ingo Molnar commit 75909fd619d15400e7c6d0fc3af09838ee8b166e Author: Isaku Yamahata Date: Tue Oct 14 17:50:41 2008 -0700 xen: portability clean up and some minor clean up for xencomm.c clean up of xencomm.c. is_phys_contiguous() is arch dependent function that depends on how virtual memory are laid out. So split out the function into arch specific code. Signed-off-by: Isaku Yamahata Signed-off-by: Jeremy Fitzhardinge Cc: Isaku Yamahata Signed-off-by: Ingo Molnar Cc: "Luck, Tony" commit ed6e5e507e4752c3fb1090d0601f46e7a78c860e Author: Jeremy Fitzhardinge Date: Tue Oct 14 17:50:40 2008 -0700 xen: don't reload cr3 on suspend It isn't necessary, and it makes the code needlessly non-portable. Signed-off-by: Jeremy Fitzhardinge Cc: Isaku Yamahata Signed-off-by: Ingo Molnar commit bea92112415635ecb7e681355834413c7c048f67 Author: Paul Mundt Date: Wed Oct 22 19:31:11 2008 +0900 kernel/resource: fix reserve_region_with_split() section mismatch Impact: cleanup, small kernel text size reduction, no functionality changed reserve_region_with_split() calls in to __reserve_region_with_split(), which is an __init function. The only caller of reserve_region_with_split() is an __init function, so make it __init too. Signed-off-by: Paul Mundt Signed-off-by: Ingo Molnar commit acff181d3574244e651913df77332e897b88bff4 Author: roel kluin Date: Tue Oct 21 19:49:09 2008 -0400 printk: remove unused code from kernel/printk.c both log_buf_copy() and log_buf_len are unused. Signed-off-by: Ingo Molnar commit 66b0de3569b00f61978782b9f97aa4803dbec0fb Author: Ingo Molnar Date: Thu Oct 23 16:11:03 2008 +0200 ftrace: fix build failure fix: kernel/trace/ftrace.c: In function 'ftrace_release': kernel/trace/ftrace.c:271: error: implicit declaration of function 'ftrace_release_hash' release_hash is not needed without dftraced. Signed-off-by: Ingo Molnar commit 15adc048986f6b54b6044f2b6fc4b48f49413e2f Author: Steven Rostedt Date: Thu Oct 23 09:33:08 2008 -0400 ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file The entire file of ftrace.c in the arch code needs to be marked as notrace. It is much cleaner to do this from the Makefile with CFLAGS_REMOVE_ftrace.o. [ powerpc already had this in its Makefile. ] Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 08f5ac906d2c0faf96d608c54a0b03177376da8d Author: Steven Rostedt Date: Thu Oct 23 09:33:07 2008 -0400 ftrace: remove ftrace hash The ftrace hash was used by the ftrace_daemon code. The record ip function would place the calling address (ip) into the hash. The daemon would later read the hash and modify that code. The hash complicates the code. This patch removes it. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 4d296c24326783bff1282ac72f310d8bac8df413 Author: Steven Rostedt Date: Thu Oct 23 09:33:06 2008 -0400 ftrace: remove mcount set The arch dependent function ftrace_mcount_set was only used by the daemon start up code. This patch removes it. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit cb7be3b2fc2cf089ee52b16f0fd9ebb29e9944e1 Author: Steven Rostedt Date: Thu Oct 23 09:33:05 2008 -0400 ftrace: remove daemon The ftrace daemon is complex and error prone. This patch strips it out of the code. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 07c4cc1cdaa08fcb6c0275dd7be49eae37260169 Author: Steven Rostedt Date: Thu Oct 23 09:33:04 2008 -0400 ftrace: disable dynamic ftrace for all archs that use daemon The ftrace daemon is complex and can cause nasty races if something goes wrong. Since it affects all of the kernel, this patch disables dynamic ftrace from any arch that depends on the daemon. Until the archs are ported over to the new MCOUNT_RECORD method, I am disabling dynamic ftrace from them. Note: I am leaving in the arch//kernel/ftrace.c code alone since that can be used when the arch is ported to MCOUNT_RECORD. To port the arch to MCOUNT_RECORD, the scripts/recordmcount.pl needs to be updated. I will make that easier to do for 2.6.29. For 28, we will keep the archs disabled. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 6912896e994ddaf06cc0f6d3f2098bc4b59bdd84 Author: Steven Rostedt Date: Thu Oct 23 09:33:03 2008 -0400 ftrace: add ftrace warn on to disable ftrace Add ftrace warn on to disable ftrace as well as report a warning. [ Thanks to Andrew Morton for suggesting using the WARN_ON return value ] Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 81adbdc029ecc416d56563e7f159100181dd711d Author: Steven Rostedt Date: Thu Oct 23 09:33:02 2008 -0400 ftrace: only have ftrace_kill atomic When an anomaly is detected, we need a way to completely disable ftrace. Right now we have two functions: ftrace_kill and ftrace_kill_atomic. The ftrace_kill tries to do it in a "nice" way by converting everything back to a nop. The "nice" way is dangerous itself, so this patch removes it and only has the "atomic" version, which is all that is needed. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit ab9a0918cbf0fa8883301838df8dbc8fc085ff50 Author: Steven Rostedt Date: Thu Oct 23 09:33:01 2008 -0400 ftrace: use probe_kernel Andrew Morton suggested using the proper API for reading and writing kernel areas that might fault. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 76aefee57657428fb77cbd8624119c1a440bee44 Author: Steven Rostedt Date: Thu Oct 23 09:33:00 2008 -0400 ftrace: comment arch ftrace code Add comments to explain what is happening in the x86 arch ftrace code. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 593eb8a2d63e95772a5f22d746f18a997c5ee463 Author: Steven Rostedt Date: Thu Oct 23 09:32:59 2008 -0400 ftrace: return error on failed modified text. Have the ftrace_modify_code return error values: -EFAULT on error of reading the address -EINVAL if what is read does not match what it expected -EPERM if the write fails to update after a successful match. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 34698bcbdf7b0629d6c873b5da7c63073fb45361 Author: Steven Rostedt Date: Thu Oct 23 09:32:58 2008 -0400 ftrace: dynamic ftrace process only text section The text section stays in memory without ever leaving. With the exception of modules, but modules know how to handle that case. With the dynamic ftrace tracer, we need to make sure that it does not try to modify code that no longer exists. The only safe section is .text. This patch changes the recordmcount script to only record the mcount calls in the .text sections. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit dce9d18adde74b8e36b9e4a8a49ddf066bad0b3b Author: Steven Rostedt Date: Thu Oct 23 09:32:57 2008 -0400 ftrace: handle generic arch calls The recordmcount script requires that the actual arch is passed in. This works well when ARCH=i386 or ARCH=x86_64 but does not handle the case of ARCH=x86. This patch adds a parameter to the function to pass in the number of bits of the architecture. So that it can determine if x86 should be run for x86_64 or i386 archs. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit cc6e0bbb47f02fd36cd55b3189c0c79079096ab8 Author: Jiri Kosina Date: Thu Oct 23 12:58:38 2008 +0200 HID: Add support for Sony Vaio VGX-TP1E The Sony Vaio VGX-TP1E multimedia PC has a wireless keyboard with a touchpad. The mouse pointer is wrongly declared as constant non-data variable, which make HID code to completely ignore all the "Pointer" usages. Fix the report descriptor before it enters the parser to contain touchpad pointer description that is correctly parsable (declaring data rather than constant). Reported-by: Stefan Hundhammer Signed-off-by: Jiri Kosina commit eb9910894d7857c273e049b297fd6251e5ecc43e Author: Jiri Slaby Date: Thu Oct 23 01:47:34 2008 +0200 HID: fix lock imbalance in hiddev Don't forget to unlock_kernel() in hiddev_ioctl_usage(). Added in 7961df16819085b8a357720d89d0239036e6af2a (HID: Switch hiddev to unlocked_ioctl). Corresponing sparse warning: drivers/hid/usbhid/hiddev.c:515:10: warning: context imbalance in 'hiddev_ioctl_usage': wrong count at exit drivers/hid/usbhid/hiddev.c:515:10: context 'kernel_lock': wanted 0, got 1 Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 0f2c5945a917e776ccd394f0e1924e9502c2795f Author: Jiri Slaby Date: Thu Oct 23 01:47:30 2008 +0200 HID: fix lock imbalance in hidraw Add omitted unlock_kernel() to hidraw_ioctl(). Added in 979c407e3b89b606e810fa494ef316896eadbfad (HID: Push down BKL into ioctl handler in hidraw). Corresponing sparse warning: drivers/hid/hidraw.c:267:9: warning: context imbalance in 'hidraw_ioctl': wrong count at exit drivers/hid/hidraw.c:267:9: context 'kernel_lock': wanted 0, got 1 Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 6ae2a0765ab764da11cc305058ee5333810228f4 Author: Steven Rostedt Date: Mon Oct 13 10:22:06 2008 -0400 ring-buffer: fix free page The pages of a buffer was originally pointing to the page struct, it now points to the page address. The freeing of the page still uses the page frame free "__free_page" instead of the correct free_page to the address. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 06d1cd267ca0a2a76beb9a762465572dd3d0cce6 Author: Alan Jenkins Date: Tue Oct 14 14:19:15 2008 +0100 tracing/fastboot: fix row order in bootgraph.pl When bootgraph.pl parses a file, it gives one row for each initcall's pid. But they are displayed in random (perl hash) order. Let's sort the pids by the start time of their first initcall instead. This helps trace module initcalls, where each has a separate pid. bootgraph.pl will show module initcalls during the initramfs; it may also be adapted to show subsequent module initcalls. Signed-off-by: Alan Jenkins Acked-by: Frédéric Weisbecker Signed-off-by: Ingo Molnar commit 2a813f8cd8ce91d588a595c5709502dece3af289 Author: Alan Jenkins Date: Tue Oct 14 14:18:07 2008 +0100 tracing/fastboot: fix bootgraph.pl to run with "use strict" As a perl novice, I would prefer to have the benefit of the interpreters' wisdom. It turns out there were already some warnings, so let's fix them. Signed-off-by: Alan Jenkins Acked-by: Frédéric Weisbecker Signed-off-by: Ingo Molnar commit b4d8e4736c94e78fd846dca0c95a3a0710582584 Author: Jiri Slaby Date: Wed Oct 22 14:47:18 2008 +0200 HID: fix hidbus/appletouch device binding regression The appletouch mouse devices are grabbed by the hid bus and not released even if apple driver says ENODEV (as expected) -- these are composite USB devices, for which we only ignore the mouse interface. This is currently not handled by hidbus code properly. Move the ignoring one level upper to forbid the hid layer to grab the device. Reported-by: Justin Mattock Reported-by: Steven Noonan Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit a73a63701f8f23e70674b3c5e367a0a726c18468 Author: Jiri Slaby Date: Wed Oct 22 14:45:11 2008 +0200 HID: add hid_type to general hid struct Add type to the hid structure to distinguish to which device type (now only mouse) we are talking to. Needed for per device type ignore list support. Note: this patch leaves the type as unknown for bluetooth devices, there is not support for this in the hidp code. Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 4ce72a2c063a7fa8e42a9435440ae3364115a58d Author: Li Zefan Date: Wed Oct 22 15:25:26 2008 +0800 sched: add CONFIG_SMP consistency a patch from Henrik Austad did this: >> Do not declare select_task_rq as part of sched_class when CONFIG_SMP is >> not set. Peter observed: > While a proper cleanup, could you do it by re-arranging the methods so > as to not create an additional ifdef? Do not declare select_task_rq and some other methods as part of sched_class when CONFIG_SMP is not set. Also gather those methods to avoid CONFIG_SMP mess. Idea-by: Henrik Austad Signed-off-by: Li Zefan Acked-by: Peter Zijlstra Acked-by: Henrik Austad Signed-off-by: Ingo Molnar commit 17d80fd07d35ae1d231b3378ee4f00ace54f9d31 Author: Peter Zijlstra Date: Tue Oct 21 16:31:18 2008 +0200 tracing: create tracers menu We seem to have plenty tracers, lets create a menu and not clutter the already cluttered debug menu more. Signed-off-by: Peter Zijlstra Acked-by: Frédéric Weisbecker Acked-by: Steven Rostedt Signed-off-by: Ingo Molnar commit debfcaf93ed500a051489db6646d71f29fe86a68 Merge: 2515ddc... 81520a1... Author: Ingo Molnar Date: Wed Oct 22 09:08:14 2008 +0200 Merge branch 'tracing/ftrace' into tracing/urgent commit 3786fc710c32b61464c322e5cd0c3d1d34ae72d0 Author: roel kluin Date: Tue Oct 21 19:49:09 2008 -0400 irq: make variable static This variable is only used in the source file, so make it static. Signed-off-by: Roel Kluin Signed-off-by: Ingo Molnar commit 2f5ad54ea6e2e38156bfb889964deee991f3087a Author: Arjan van de Ven Date: Sun Sep 28 16:20:09 2008 -0700 pci: use pci_ioremap_bar() in sound/ Use the newly introduced pci_ioremap_bar() function in sound/. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Signed-off-by: Takashi Iwai commit 92850bbd71228730c80efd491e7427650188d359 Author: NeilBrown Date: Tue Oct 21 13:25:32 2008 +1100 md: allow extended partitions on md devices. The new extended partition support provides a much nicer was to have partitions on md devices that the 'mdp' alternate major. We cannot really get rid of 'mdp' at this time, but we can enable extended partitions as that will probably make life easier for sysadmins. Signed-off-by: NeilBrown commit 3c0ee63a64a20351ed6c16ec797e1f8c850741ea Author: NeilBrown Date: Tue Oct 21 13:25:28 2008 +1100 md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state The 'state' file for a device reports, for example, when the device has failed. Changes should be reported to userspace ASAP without the possibility of blocking on low-memory. sysfs_notify does have that possibility (as it takes a mutex which can be held across a kmalloc) so use sysfs_notify_dirent instead. Signed-off-by: NeilBrown commit b62b75905d571c29262a6c38cf9e5f089c203871 Author: NeilBrown Date: Tue Oct 21 13:25:21 2008 +1100 md: use sysfs_notify_dirent to notify changes to md/array_state Now that we have sysfs_notify_dirent, use it to notify changes to md/array_state. As sysfs_notify_dirent can be called in atomic context, we can remove the delayed notify and the MD_NOTIFY_ARRAY_STATE flag. Signed-off-by: NeilBrown commit 81520a1b0649d0701205b818714a8c1e1cfbbb5b Author: Steven Rostedt Date: Mon Oct 6 21:24:18 2008 -0400 ftrace: stack tracer only record when on stack The stack trace API does not record if the stack is not on the current task's stack. That is, if the stack is the interrupt stack or NMI stack, the output does not show. Also, the size of those stacks are not consistent with the size of the thread stack, this makes the calculation of the stack size usually bogus. This all confuses the stack tracer. I unfortunately do not have time to fix all these problems, but this patch does record the worst stack when the stack pointer is on the tasks stack (instead of bogus numbers). The patch simply returns if the stack pointer is not on the task's stack. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 3ce83aea86bf46fd1bff59d2e6d16f48fdce22fc Author: Steven Rostedt Date: Mon Oct 6 19:06:13 2008 -0400 ftrace: rename the ftrace tracer to function To avoid further confusion between the ftrace infrastructure and the function tracer. This patch renames the "ftrace" function tracer to "function". Now in available_tracers, instead of "ftrace" there will be "function". This makes more sense, since people will not know exactly what the "ftrace" tracer does. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 606576ce816603d9fe1fb453a88bc6eea16ca709 Author: Steven Rostedt Date: Mon Oct 6 19:06:12 2008 -0400 ftrace: rename FTRACE to FUNCTION_TRACER Due to confusion between the ftrace infrastructure and the gcc profiling tracer "ftrace", this patch renames the config options from FTRACE to FUNCTION_TRACER. The other two names that are offspring from FTRACE DYNAMIC_FTRACE and FTRACE_MCOUNT_RECORD will stay the same. This patch was generated mostly by script, and partially by hand. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit c2db8054c1eaf99983d8deee347876b01c26c2cf Author: Steven Rostedt Date: Mon Oct 6 19:06:11 2008 -0400 ftrace: fix depends A lot of tracers have HAVE_FTRACE as a dependent config where it really should not. The HAVE_FTRACE is a misnomer (soon to be fixed) and describes if the architecture has the function tracer (mcount) implemented. The ftrace infrastructure is implemented in all archs. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit bd95b88d9e51fcbf392a7e90338a8fcc3499cbd6 Author: Steven Rostedt Date: Thu Oct 16 09:31:27 2008 -0400 ftrace: release functions from hash The x86 architecture uses a static recording of mcount caller locations and is not affected by this patch. For architectures still using the dynamic ftrace daemon, this patch is critical. It removes the race between the recording of a function that calls mcount, the unloading of a module, and the ftrace daemon updating the call sites. This patch adds the releasing of the hash functions that the daemon uses to update the mcount call sites. When a module is unloaded, not only are the replaced call site table update, but now so is the hash recorded functions that the ftrace daemon will use. Again, architectures that implement MCOUNT_RECORD are not affected by this (which currently only x86 has). Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit c513867561eeb07d24a0bdda1a18a8f91921a301 Author: Steven Rostedt Date: Tue Oct 14 18:08:48 2008 -0400 ftrace: do not enclose logic in WARN_ON In ftrace, logic is defined in the WARN_ON_ONCE, which can become a nop with some configs. This patch fixes it. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit ac2d98998c32fcdc8d8919b7a4536a7945fd0422 Author: Jiri Kosina Date: Mon Oct 20 12:37:43 2008 +0200 HID: quirk for OLED devices present in ASUS G50/G70/G71 The new revision of OLED device (0x0b05/0x175b) found in ASUS G50/G70/G71 should be ignored the same way we currently do for 0x1726, so that asus_oled driver can make use of the device. Reported-by: Costin Grigoras Signed-off-by: Jiri Kosina commit 550cb3c3c1fa48171c6358b8641bd01119f5386f Author: Andi Kleen Date: Sun Oct 19 20:34:31 2008 +0200 HID: Remove "default m" for Thrustmaster and Zeroplus No reason at all to make these obscure drivers default m Signed-off-by: Andi Kleen Signed-off-by: Jiri Kosina commit 3e10e879a8c334a5927d800a3663a24d562cfa31 Merge: 98d9c66... 0cfd810... Author: Ingo Molnar Date: Sun Oct 19 19:04:47 2008 +0200 Merge branch 'linus' into tracing-v28-for-linus-v3 Conflicts: init/main.c kernel/module.c scripts/bootgraph.pl commit 5cb02ff3489d710c73b4a21bb804feedeacce116 Author: Alan Cox Date: Sun Oct 5 17:39:16 2008 +0100 fdomain_cs: Sort out modules with duplicate description The PCMCIA one provides its own description so in PCMCIA mode we should use that. Signed-off-by: Alan Cox Signed-off-by: Dominik Brodowski commit 7bbfd39bb9a5623cb8e0bcc54aee9b43d9ee97b9 Author: Alan Cox Date: Sun Oct 5 17:35:59 2008 +0100 pcmcia: Whine harder about use of EXCLUSIVE The exclusive IRQ line support is a legacy and any remaining drivers that cannot share interrupts need tidying up so whine harder about them. Signed-off-by: Alan Cox Signed-off-by: Dominik Brodowski commit aafcf998c333a2a29e12093437eef32a60a8018d Author: Alan Cox Date: Sun Oct 5 17:35:41 2008 +0100 pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted Switch more drivers to dynamic sharing after checking their IRQ handlers use dev_id and are robust Signed-off-by: Alan Cox Acked-by: Marcel Holtmann Signed-off-by: Dominik Brodowski commit 140ae3eb6feb6ae96ba1ff073049beb985ea00e8 Author: Jiri Slaby Date: Fri Oct 17 18:04:48 2008 +0200 HID: fix hidraw_exit section mismatch hidraw_exit() marked as __exit is called from __init function from HID core. Remove the section placement from that function. Reported-by: Geert Uytterhoeven Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 1e093206734568e780c2717da1c89b97e9471954 Author: Jiri Kosina Date: Fri Oct 17 11:52:23 2008 +0200 HID: add support for another Gyration remote control There is a slightly different Gyration remote control, which requires the quirks we already have in place for the 0x0002 PID, plus KEY_MEDIA mapping is different. Reported-by: Marc Randolph Signed-off-by: Jiri Kosina commit 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a Author: Dan Nicholson Date: Fri Oct 17 11:29:46 2008 +0200 Revert "HID: Invert HWHEEL mappings for some Logitech mice" This reverts commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f. It turned out to be correct in the first place: a positive value should be sent when the wheel is moved to the right, and a negative value when moved to the left. This is the behavior expected by the Xorg evdev driver. I must have had a remapping somewhere else in my system when originally testing this. Testing on another system shows that the unpatched kernel is correct. Here is a bug report from Mandriva that brought the problem to my attention: https://qa.mandriva.com/show_bug.cgi?id=44309#c19 Signed-off-by: Dan Nicholson Signed-off-by: Jiri Kosina commit 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 Author: Arjan Opmeer Date: Thu Oct 16 22:10:19 2008 -0400 Input: psmouse - add support for Elantech touchpads This is version 5 of the driver. Relative mode support has been dropped (users wishing to use touchpad in relative mode can use standard PS/2 protocol emulation done in hardware). The driver supports both original version of Elantech protocol and the newer one used by touchpads installed in EeePC. Signed-off-by: Arjan Opmeer Signed-off-by: Dmitry Torokhov commit 2c6f2cb83b239b7d45da9246cafd27ee615ee35b Author: Stefan Bader Date: Thu Oct 16 22:00:56 2008 -0400 Input: i8042 - add Blue FB5601 to noloop exception table Signed-off-by: Stefan Bader Signed-off-by: Dmitry Torokhov commit 15c73aaa44e09222e9cccaa9f80e29f7f5351f2b Author: Paul Mundt Date: Thu Oct 2 19:47:12 2008 +0900 serial: sh-sci: Kill off all of the SCI/SCIF special casing. This was added at a time when the compiler did a less than stellar job of optimizing out dead code. These days this tends to be less of a concern, so kill it all off. Signed-off-by: Paul Mundt