aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-11ARM: dts: omap5-uevm: Use reset-gpios for hsusb2/3_resetRoger Quadros1-24/+2
We no longer need to model the RESET line as a regulator since the USB phy-nop driver accepts "reset-gpios" property. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: omap4-panda: Use reset-gpios for hsusb1_resetRoger Quadros1-17/+1
We no longer need to model the RESET line as a regulator since the USB phy-nop driver accepts "reset-gpios" property. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: omap3-beagle: Use reset-gpios for hsusb2_resetRoger Quadros1-12/+1
We no longer need to model the RESET line as a regulator since the USB phy-nop driver accepts "reset-gpios" property. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: add ethernet alias's for am33xxDan Murphy1-0/+2
Set the alias for ethernet0 and ethernet1 so that uBoot can set the MAC address appropriately. Currently u-boot cannot find the alias and there for does not set the MAC address. Signed-off-by: Dan Murphy <[email protected]> Tested-by: Mugunthan V N <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: DRA7: Add TPS659038 PMIC nodesKeerthy1-0/+112
Add DT nodes for TPS659038 PMIC on DRA7 boards. It is based on top of: http://comments.gmane.org/gmane.linux.ports.arm.omap/102459. Documentation: - Documentation/devicetree/bindings/mfd/palmas.txt - Documentation/devicetree/bindings/regulator/palmas-pmic.txt Boot Tested on DRA7 d1 Board. Signed-off-by: Keerthy <[email protected]> Acked-by: Nishanth Menon <[email protected]> [[email protected]: Fix indentation and changelog] Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: omap3-devkit8000: fix a typo in GMPC nodeAaro Koskinen1-1/+1
"gpmc,sync-clki-ps" is not defined/documented, it should be "gpmc,sync-clk-ps" instead. Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: don't redefine OCP bus and device nodesJavier Martinez Canillas3-317/+311
The On Chip Peripherals (OCP) device node is a simplified representation of the AM33XX SoC interconnect. An OCP dev node is already defined in the am33xx.dtsi Device Tree source file included by am33xx based boards so there is no need to redefine this on each board DT file. Also, the OCP and IP modules directly connected to it are SoC internal details that is better to keep outside of board files. Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: use pinmux node defined in included fileJavier Martinez Canillas3-365/+365
am33xx boards DTS include the am33xx.dtsi Device Tree source file that already define a pinmux device node for the AM33XX SoC Pin Multiplex. Redefining this for each board makes the Device Tree files harder to modify and maintain so let's just use what is already defined in the included .dtsi file. Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggersKoen Kooi1-0/+2
This matches the vendor 3.8.x configuration that is shipping with the boards. The LED layout is now: USR0: heartbeat USR1: mmc0 (micro-SD slot) USR2: cpu0 USR3: mmc1 (eMMC) The cpu0 triggers was put in between the mmc triggers to make is easier to see where the disk activity is. Signed-off-by: Koen Kooi <[email protected]> Tested-by: Kevin Hilman <[email protected]> Reviewed-by: Nishanth Menon <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: am335x-bone-common: switch mmc1 to 4-bit modeKoen Kooi1-0/+1
The micro-SD slot hooks up all four data pins so lets' use them. Signed-off-by: Koen Kooi <[email protected]> Tested-by: Kevin Hilman <[email protected]> Reviewed-by: Nishanth Menon <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: am335x-boneblack: add eMMC DT entryKoen Kooi2-0/+35
The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC cape. Signed-off-by: Koen Kooi <[email protected]> Tested-by: Kevin Hilman <[email protected]> Reviewed-by: Nishanth Menon <[email protected]> [[email protected]: Fix traling spaces and useless comments] Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: am335x-bone: add CD for mmc1Alexander Holler2-1/+14
This enables the use of MMC cards even when no card was inserted at boot. Signed-off-by: Alexander Holler <[email protected]> Signed-off-by: Koen Kooi <[email protected]> Tested-by: Kevin Hilman <[email protected]> Reviewed-by: Nishanth Menon <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: Add MMC support and documentationMatt Porter5-1/+88
Adds AM33XX MMC support for am335x-bone, am335x-evm and am335x-evmsk boards. Also added is the DMA binding definitions based on the generic DMA request binding. Additional changes made to DTS: * Interrupt, reg and compatible properties added * ti,needs-special-hs-handling added Signed-off-by: Matt Porter <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: Add SPI DMA supportMatt Porter1-0/+10
Adds DMA resources to the AM33XX SPI nodes. Signed-off-by: Matt Porter <[email protected]> Signed-off-by: Joel A Fernandes <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-11ARM: dts: AM33XX: Add EDMA supportMatt Porter1-0/+12
Adds AM33XX EDMA support to the am33xx.dtsi as documented in Documentation/devicetree/bindings/dma/ti-edma.txt [Joel Fernandes <[email protected]>] Drop DT entries that are non-hardware-description as discussed in [1] [1] https://patchwork.kernel.org/patch/2226761/ Signed-off-by: Matt Porter <[email protected]> Signed-off-by: Joel A Fernandes <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: OMAP5: add palmas-usb nodeFelipe Balbi2-1/+13
Without this node, there will be no palmas driver to notify dwc3 that a cable has been connected and, without that, dwc3 will never initialize. Signed-off-by: Felipe Balbi <[email protected]> [[email protected]: added dt properties for enabling vbus/id interrupts and fixed vbus-supply value after SMPS10 is modeled as 2 regulators] Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-beagle: Make USB host pin naming consistentRoger Quadros1-12/+12
Use a common naming scheme "mode0name.modename flags" for the USB host pins to be consistent. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Add devicetree for gta04 board.Marek Belisko2-0/+169
This adds devicetree for gta04 (Openmoko next generation board) with necessary support for mmc, usb, leds and button. Signed-off-by: Marek Belisko <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM4372: add few nodesAfzal Mohammed1-0/+343
Populate uarts, timers, rtc, wdt, gpio, i2c, spi, cpsw & pwm nodes. Reason for adding these nodes early - hwmod code required address space of peripherals corresponding to these nodes (as address space details are removed from hwmod database). uart0, timers - 1 & 2 and synctimer were already present, so here the remaining uarts & timers are added. All properties as per the existing binding has been added for uart, timer, rtc, wdt & gpio. Even though that was not the current scope of work, felt adding those would reduce or require no effort later to get these peripherals working. For i2c, spi, cpsw & pwm - only the properties that were sure to be correct has been added (main intention is to make hwmod happy and avoid any later modification to here added properties). While at it add "ti,hwmod" property to already existing nodes. Signed-off-by: Afzal Mohammed <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM4372: cpu(s) node per latest bindingAfzal Mohammed1-0/+4
Update AM4372 cpu node to the latest cpus/cpu bindings for ARM. Signed-off-by: Afzal Mohammed <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm boardR Sricharan4-1/+767
Add minimal device tree source needed for DRA7 based SoCs. Also add a board dts file for the dra7-evm (based on dra752) which contains 1.5G of memory with 1G interleaved and 512MB non-interleaved. Also added in the board file are pin configuration details for i2c, mcspi and uart devices on board. Signed-off-by: R Sricharan <[email protected]> Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Sourav Poddar <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate ↵Ruslan Bilovol3-40/+40
dtsi file The OMAP4 SoC family uses specially-designed PMIC (power management IC) companion chip for power management needs: TWL6030/TWL6032. Therefore there is a typical connection of PMIC to OMAP4 so we can move it into separate .dtsi file and do not duplicate over board-specific files. Tested on OMAP4 SDP board and Pandaboard ES2. Signed-off-by: Ruslan Bilovol <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP5 DTS fileLee Jones1-2/+2
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP4 DTS fileLee Jones1-1/+1
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3430 SDP DTS fileLee Jones1-11/+11
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 DTS fileLee Jones1-1/+1
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 IGEP0030 DTS fileLee Jones1-4/+4
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 IGEP0020 DTS fileLee Jones1-4/+4
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP2420 H4 DTS fileLee Jones1-3/+3
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap5-uevm: Split SMPS10 in two nodesKishon Vijay Abraham I1-2/+11
SMPS10 has two outputs OUT1 and OUT2. Hence SMPS10 is modeled as two regulators. The DT node is split to reflect it. Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM33xx: Correct gpio #interrupt-cells propertyLars Poeschel1-4/+4
Following commit ff5c9059 and therefore other omap platforms using the gpio-omap driver correct the #interrupt-cells property on am33xx too. The omap gpio binding documentaion also states that the #interrupt-cells property should be 2. Signed-off-by: Lars Poeschel <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM33XX: Add PMU supportAlexandre Belloni1-0/+5
ARM Performance Monitor Units are available on the am33xx, add the support in the dtsi. Tested with perf and oprofile on a regular beaglebone. Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep0030: add mux conf for GPIO LEDJavier Martinez Canillas1-0/+9
The IGEP COM MOdule has a GPIO LED connected to OMAP pins. Configure this pin as output GPIO. Signed-off-by: Javier Martinez Canillas <[email protected]> Tested-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep0020: add mux conf for GPIO LEDsJavier Martinez Canillas1-0/+11
The IGEPv2 has a number of GPIO LED connected to OMAP pins. Configure these pins as output GPIO. Signed-off-by: Javier Martinez Canillas <[email protected]> Tested-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep: add pinmux node for GPIO LED configurationJavier Martinez Canillas1-0/+2
IGEP boards have a number of LED connected to OMAP or TWL GPIO lines. The actual wiring is different on each board so each board DT has need to configure the mux correctly. Even though it works with the current DT, the kernel complains with: [2.305023] leds-gpio leds.18: pins are not configured from the driver Add an empty pinmux_leds_pins pinctrl child node so boards can override with the correct mux configuration and not depend on default values for the GPIO LEDs to work. Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: N900: Add device treePavel Machek2-0/+93
This adds device tree with necessary support to boot with functional video (on both emulator and real N900 device). Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-06Linux 3.12-rc4Linus Torvalds1-1/+1
2013-10-06net: Update the sysctl permissions handler to test effective uid/gidEric W. Biederman1-2/+2
Modify the code to use current_euid(), and in_egroup_p, as in done in fs/proc/proc_sysctl.c:test_perm() Cc: [email protected] Reviewed-by: Eric Sandeen <[email protected]> Reported-by: Eric Sandeen <[email protected]> Signed-off-by: "Eric W. Biederman" <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2013-10-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds8-25/+67
Pull SCSI target fixes from Nicholas Bellinger: "Here are the outstanding target fixes queued up for v3.12-rc4 code. The highlights include: - Make vhost/scsi tag percpu_ida_alloc() use GFP_ATOMIC - Allow sess_cmd_map allocation failure fallback to use vzalloc - Fix COMPARE_AND_WRITE se_cmd->data_length bug with FILEIO backends - Fixes for COMPARE_AND_WRITE callback recursive failure OOPs + non zero scsi_status bug - Make iscsi-target do acknowledgement tag release from RX context - Setup iscsi-target with extra (cmdsn_depth / 2) percpu_ida tags Also included is a iscsi-target patch CC'ed for v3.10+ that avoids legacy wait_for_task=true release during fast-past StatSN acknowledgement, and two other SRP target related patches that address long-standing issues that are CC'ed for v3.3+. Extra thanks to Thomas Glanzmann for his testing feedback with COMPARE_AND_WRITE + EXTENDED_COPY VAAI logic" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: iscsi-target; Allow an extra tag_num / 2 number of percpu_ida tags iscsi-target: Perform release of acknowledged tags from RX context iscsi-target: Only perform wait_for_tasks when performing shutdown target: Fail on non zero scsi_status in compare_and_write_callback target: Fix recursive COMPARE_AND_WRITE callback failure target: Reset data_length for COMPARE_AND_WRITE to NoLB * block_size ib_srpt: always set response for task management target: Fall back to vzalloc upon ->sess_cmd_map kzalloc failure vhost/scsi: Use GFP_ATOMIC with percpu_ida_alloc for obtaining tag ib_srpt: Destroy cm_id before destroying QP. target: Fix xop->dbl assignment in target_xcopy_parse_segdesc_02
2013-10-06Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds3-17/+17
Pull slave-dmaengine fixes from Vinod Koul: "Here is the slave dmanegine fixes. We have the fix for deadlock issue on imx-dma by Michael and Josh's edma config fix along with author change" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: imx-dma: fix callback path in tasklet dmaengine: imx-dma: fix lockdep issue between irqhandler and tasklet dmaengine: imx-dma: fix slow path issue in prep_dma_cyclic dma/Kconfig: Make TI_EDMA select TI_PRIV_EDMA edma: Update author email address
2013-10-05Merge branch 'for-linus' of ↵Linus Torvalds6-17/+39
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This is a small collection of fixes, including a regression fix from Liu Bo that solves rare crashes with compression on. I've merged my for-linus up to 3.12-rc3 because the top commit is only meant for 3.12. The rest of the fixes are also available in my master branch on top of my last 3.11 based pull" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: Fix crash due to not allocating integrity data for a bioset Btrfs: fix a use-after-free bug in btrfs_dev_replace_finishing Btrfs: eliminate races in worker stopping code Btrfs: fix crash of compressed writes Btrfs: fix transid verify errors when recovering log tree
2013-10-05Merge tag 'gpio-v3.12-2' of ↵Linus Torvalds1-57/+101
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio Pull GPIO fixes from Linus Walleij: "Two patches for the OMAP driver, dealing with setting up IRQs properly on the device tree boot path" * tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio/omap: auto-setup a GPIO when used as an IRQ gpio/omap: maintain GPIO and IRQ usage separately
2013-10-05Merge tag 'usb-3.12-rc4' of ↵Linus Torvalds8-13/+29
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB fixes from Greg KH: "Here are none fixes for various USB driver problems. The majority are gadget/musb fixes, but there are some new device ids in here as well" * tag 'usb-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: chipidea: add Intel Clovertrail pci id usb: gadget: s3c-hsotg: fix can_write limit for non-periodic endpoints usb: gadget: f_fs: fix error handling usb: musb: dsps: do not bind to "musb-hdrc" USB: serial: option: Ignore card reader interface on Huawei E1750 usb: musb: gadget: fix otg active status flag usb: phy: gpio-vbus: fix deferred probe from __init usb: gadget: pxa25x_udc: fix deferred probe from __init usb: musb: fix otg default state
2013-10-05Merge tag 'tty-3.12-rc4' of ↵Linus Torvalds2-20/+27
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty fixes from Greg KH: "Here are two tty driver fixes for 3.12-rc4. One fixes the reported regression in the n_tty code that a number of people found recently, and the other one fixes an issue with xen consoles that broke in 3.10" * tag 'tty-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: xen/hvc: allow xenboot console to be used again tty: Fix pty master read() after slave closes
2013-10-05Merge tag 'staging-3.12-rc4' of ↵Linus Torvalds4-28/+21
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging fixes from Greg KH: "Here are 4 tiny staging and iio driver fixes for 3.12-rc4. Nothing major, just some small fixes for reported issues" * tag 'staging-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice iio:magnetometer: Bugfix magnetometer default output registers iio: Remove debugfs entries in iio_device_unregister() iio: amplifiers: ad8366: Remove regulator_put
2013-10-05btrfs: Fix crash due to not allocating integrity data for a biosetDarrick J. Wong1-0/+8
When btrfs creates a bioset, we must also allocate the integrity data pool. Otherwise btrfs will crash when it tries to submit a bio to a checksumming disk: BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 IP: [<ffffffff8111e28a>] mempool_alloc+0x4a/0x150 PGD 2305e4067 PUD 23063d067 PMD 0 Oops: 0000 [#1] PREEMPT SMP Modules linked in: btrfs scsi_debug xfs ext4 jbd2 ext3 jbd mbcache sch_fq_codel eeprom lpc_ich mfd_core nfsd exportfs auth_rpcgss af_packet raid6_pq xor zlib_deflate libcrc32c [last unloaded: scsi_debug] CPU: 1 PID: 4486 Comm: mount Not tainted 3.12.0-rc1-mcsum #2 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 task: ffff8802451c9720 ti: ffff880230698000 task.ti: ffff880230698000 RIP: 0010:[<ffffffff8111e28a>] [<ffffffff8111e28a>] mempool_alloc+0x4a/0x150 RSP: 0018:ffff880230699688 EFLAGS: 00010286 RAX: 0000000000000001 RBX: 0000000000000000 RCX: 00000000005f8445 RDX: 0000000000000001 RSI: 0000000000000010 RDI: 0000000000000000 RBP: ffff8802306996f8 R08: 0000000000011200 R09: 0000000000000008 R10: 0000000000000020 R11: ffff88009d6e8000 R12: 0000000000011210 R13: 0000000000000030 R14: ffff8802306996b8 R15: ffff8802451c9720 FS: 00007f25b8a16800(0000) GS:ffff88024fc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000018 CR3: 0000000230576000 CR4: 00000000000007e0 Stack: ffff8802451c9720 0000000000000002 ffffffff81a97100 0000000000281250 ffffffff81a96480 ffff88024fc99150 ffff880228d18200 0000000000000000 0000000000000000 0000000000000040 ffff880230e8c2e8 ffff8802459dc900 Call Trace: [<ffffffff811b2208>] bio_integrity_alloc+0x48/0x1b0 [<ffffffff811b26fc>] bio_integrity_prep+0xac/0x360 [<ffffffff8111e298>] ? mempool_alloc+0x58/0x150 [<ffffffffa03e8041>] ? alloc_extent_state+0x31/0x110 [btrfs] [<ffffffff81241579>] blk_queue_bio+0x1c9/0x460 [<ffffffff8123e58a>] generic_make_request+0xca/0x100 [<ffffffff8123e639>] submit_bio+0x79/0x160 [<ffffffffa03f865e>] btrfs_map_bio+0x48e/0x5b0 [btrfs] [<ffffffffa03c821a>] btree_submit_bio_hook+0xda/0x110 [btrfs] [<ffffffffa03e7eba>] submit_one_bio+0x6a/0xa0 [btrfs] [<ffffffffa03ef450>] read_extent_buffer_pages+0x250/0x310 [btrfs] [<ffffffff8125eef6>] ? __radix_tree_preload+0x66/0xf0 [<ffffffff8125f1c5>] ? radix_tree_insert+0x95/0x260 [<ffffffffa03c66f6>] btree_read_extent_buffer_pages.constprop.128+0xb6/0x120 [btrfs] [<ffffffffa03c8c1a>] read_tree_block+0x3a/0x60 [btrfs] [<ffffffffa03caefd>] open_ctree+0x139d/0x2030 [btrfs] [<ffffffffa03a282a>] btrfs_mount+0x53a/0x7d0 [btrfs] [<ffffffff8113ab0b>] ? pcpu_alloc+0x8eb/0x9f0 [<ffffffff81167305>] ? __kmalloc_track_caller+0x35/0x1e0 [<ffffffff81176ba0>] mount_fs+0x20/0xd0 [<ffffffff81191096>] vfs_kern_mount+0x76/0x120 [<ffffffff81193320>] do_mount+0x200/0xa40 [<ffffffff81135cdb>] ? strndup_user+0x5b/0x80 [<ffffffff81193bf0>] SyS_mount+0x90/0xe0 [<ffffffff8156d31d>] system_call_fastpath+0x1a/0x1f Code: 4c 8d 75 a8 4c 89 6d e8 45 89 e0 4c 8d 6f 30 48 89 5d d8 41 83 e0 af 48 89 fb 49 83 c6 18 4c 89 7d f8 65 4c 8b 3c 25 c0 b8 00 00 <48> 8b 73 18 44 89 c7 44 89 45 98 ff 53 20 48 85 c0 48 89 c2 74 RIP [<ffffffff8111e28a>] mempool_alloc+0x4a/0x150 RSP <ffff880230699688> CR2: 0000000000000018 ---[ end trace 7a96042017ed21e2 ]--- Signed-off-by: Darrick J. Wong <[email protected]> Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2013-10-05Merge branch 'for-linus' into for-linus-3.12Chris Mason6-17/+31
2013-10-04Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds10-115/+74
Pull CIFS fixes from Steve French: "Small set of cifs fixes. Most important is Jeff's fix that works around disconnection problems which can be caused by simultaneous use of user space tools (starting a long running smbclient backup then doing a cifs kernel mount) or multiple cifs mounts through a NAT, and Jim's fix to deal with reexport of cifs share. I expect to send two more cifs fixes next week (being tested now) - fixes to address an SMB2 unmount hang when server dies and a fix for cifs symlink handling of Windows "NFS" symlinks" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: [CIFS] update cifs.ko version [CIFS] Remove ext2 flags that have been moved to fs.h [CIFS] Provide sane values for nlink cifs: stop trying to use virtual circuits CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them
2013-10-04Merge tag 'pci-v3.12-fixes-1' of ↵Linus Torvalds1-1/+6
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull PCI fix from Bjorn Helgaas: "We merged what was intended to be an MMCONFIG cleanup, but in fact, for systems without _CBA (which is almost everything), it broke extended config space for domain 0 and it broke all config space for other domains. This reverts the change" * tag 'pci-v3.12-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero"
2013-10-04Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero"Bjorn Helgaas1-1/+6
This reverts commit 07f9b61c3915e8eb156cb4461b3946736356ad02. 07f9b61c was intended to be a cleanup that didn't change anything, but in fact, for systems without _CBA (which is almost everything), it broke extended config space for domain 0 and all config space for other domains. Reference: http://lkml.kernel.org/r/[email protected] Reported-by: Hedi Berriche <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>