Commit graph

506,942 commits

Author SHA1 Message Date
Hiep Cao Minh
3dd3b1cf06 ARM: shmobile: r8a7790: add QSPI support
Adds support for QSPI on the r8a7790.

Signed-off-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:13 +09:00
Valentine Barshak
65779cb40f ARM: shmobile: r8a7790: Add USBHS clock support
This adds USBHS clock support.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:13 +09:00
Kuninori Morimoto
ac0ddd9d0b ARM: shmobile: r8a7779: add SDHI clock support for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:12 +09:00
Kuninori Morimoto
67c01c3e0f ARM: shmobile: r8a7778: add SDHI clock support for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:12 +09:00
Kuninori Morimoto
ecf2b14fb9 ARM: shmobile: r8a7778: add MMCIF clock support for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:11 +09:00
Magnus Damm
091b258c32 ARM: shmobile: Select GPIO in case of the r7s72100 SoC
The r7s72100 contains GPIO controllers so make sure the GPIO
subsystem can be built by selecting ARCH_WANT_OPTIONAL_GPIOLIB.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:10 +09:00
Kuninori Morimoto
1a936a3856 ARM: shmobile: r8a73a4: don't use named irq for DMAEngine
sh-dma-engine driver doesn't care irq name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:10 +09:00
Magnus Damm
93ff916305 ARM: shmobile: r8a7791 GPIO platform device support
Add GPIO controller platform devices for the r8a7791 SoC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:09 +09:00
Magnus Damm
cc3a17d799 ARM: shmobile: Select GPIO in case of the r8a7791 SoC
Make it possible to build GPIO on r8a7791.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:09 +09:00
Magnus Damm
35040127be ARM: shmobile: r8a7791 PFC platform device support
Add a platform device for the r8a7791 PFC device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:08 +09:00
Magnus Damm
e08d287afb ARM: shmobile: Select IRQC in case of the r8a7791 SoC
The r8a7791 contains IRQC hardware so make sure
the driver gets built by selecting RENESAS_IRQC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:08 +09:00
Kuninori Morimoto
b918b68123 ARM: shmobile: r8a7779: add I2C clock for DT
10e8d4f6dd
(ARM: mach-shmobile: r8a7779: Minimal setup using DT)
added I2C driver for DT, but it didn't add clock.
This patch adds missing clock for I2C

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:07 +09:00
Kuninori Morimoto
10ef80fa22 ARM: shmobile: r8a7778: add I2C clock for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:07 +09:00
Dan Williams
85726def1e dma: fix build breakage in s3c24xx-dma
This driver missed the dma unmap conversion.  Replace
s3c24xx_dma_unmap_buffers with dma_descriptor_unmap.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2013-12-04 11:24:30 +05:30
Russell King - ARM Linux
89116bf962 Fix pl08x warnings
drivers/dma/amba-pl08x.c: In function 'pl08x_desc_free':
drivers/dma/amba-pl08x.c:1173:2: warning: passing argument 1 of 'dma_descriptor_unmap' from incompatible pointer type
include/linux/dmaengine.h:476:91: note: expected 'struct dma_async_tx_descriptor *' but argument is of type 'struct pl08x_txd *'

Fixes: d38a8c622a ("dmaengine: prepare for generic 'unmap' data")
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2013-12-04 11:22:05 +05:30
Jingoo Han
7d2dddda5c virtio: pci: remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2013-12-04 14:20:26 +10:30
Joe Perches
74e22fac88 module.h: Remove unnecessary semicolon
[All 8 callers already have semicolons. -- RR]

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2013-12-04 14:09:46 +10:30
Felipe Contreras
88a88b320a params: improve standard definitions
We are repeating the functionality of kstrtol in param_set_long, and the
same for kstrtoint. We can get rid of the extra code by using the right
functions.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2013-12-04 14:09:46 +10:30
James Solner
160e01aca3 Add Documentation/module-signing.txt file
This patch adds the Documentation/module-signing.txt file that is
currently missing from the Documentation directory. The init/Kconfig
file references the Documentation/module-signing.txt file to explain
how kernel module signing works. This patch supplies this documentation.

The initial version of this patch provided old documentation
that was a mixture of the old RHEL style GPG signing.

Version 1: Updated the documentation to described the current
           implementation using x509 certificate signing.

Version 2: fixes grammar/spelling mistakes and removes
           trailing whitespaces.

Version 3, fixes grammar/spelling mistakes.

Version 4: Include updates from David Howells and fixes for
           spelling mistakes.

Signed-off-by: James Solner <solner@alcatel-lucent.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2013-12-04 14:09:45 +10:30
Eryu Guan
5946d08937 ext4: check for overlapping extents in ext4_valid_extent_entries()
A corrupted ext4 may have out of order leaf extents, i.e.

extent: lblk 0--1023, len 1024, pblk 9217, flags: LEAF UNINIT
extent: lblk 1000--2047, len 1024, pblk 10241, flags: LEAF UNINIT
             ^^^^ overlap with previous extent

Reading such extent could hit BUG_ON() in ext4_es_cache_extent().

	BUG_ON(end < lblk);

The problem is that __read_extent_tree_block() tries to cache holes as
well but assumes 'lblk' is greater than 'prev' and passes underflowed
length to ext4_es_cache_extent(). Fix it by checking for overlapping
extents in ext4_valid_extent_entries().

I hit this when fuzz testing ext4, and am able to reproduce it by
modifying the on-disk extent by hand.

Also add the check for (ee_block + len - 1) in ext4_valid_extent() to
make sure the value is not overflow.

Ran xfstests on patched ext4 and no regression.

Cc: Lukáš Czerner <lczerner@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
2013-12-03 21:22:21 -05:00
Michael Opdenacker
644ff181da drivers/cdrom/gdrom.c: remove deprecated IRQF_DISABLED
Remove the IRQF_DISABLED flag from drivers/cdrom/gdrom.c.

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 19:22:17 -07:00
Christoph Lameter
ca6673b02e block: Replace __this_cpu_ptr with raw_cpu_ptr
__this_cpu_ptr is being phased out.

Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 19:19:41 -07:00
Mike Snitzer
8d30726912 dm cache: increment bi_remaining when bi_end_io is restored
Move the bio->bi_remaining increment into dm_unhook_bio() so the
overwrite_endio() handler works as expected.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 19:16:04 -07:00
Chris Mason
c0778e2534
Btrfs: update the MAINTAINERS file
Josef and I have new email addresses

Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
2013-12-03 20:56:13 -05:00
H. Peter Anvin
5551a34e5a x86-64, build: Always pass in -mno-sse
Always pass in the -mno-sse argument, regardless if
-preferred-stack-boundary is supported.  We never want to generate SSE
instructions in the kernel unless we *really* know what we're doing.

According to H. J. Lu, any version of gcc new enough that we support
it at all should handle the -mno-sse option, so just add it
unconditionally.

Reported-by: Kevin B. Smith <kevin.b.smith@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: H. J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/n/tip-j21wzqv790q834n7yc6g80j1@git.kernel.org
Cc: <stable@vger.kernel.org> # build fix only
2013-12-03 17:40:22 -08:00
Olof Johansson
f07c71aeee mvebu defconfig changes for v3.14
- mvebu: add GPIO LEDs
  - kirkwood: enable HIGHMEM
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6l7AAoJEP45WPkGe8ZnGxQP/j9hiE8/4BAdJIY4axrIyyZH
 mV/l/oz8XnGpv3WLzwwxU2/VmU6D3SFUA217IQ9ZT+4pZGPNTAJS3EWkR3aRpVS7
 bIRqf1Wv/l5LDKP8EAuXRhMt8vGRQcORARbgt4dDEIzXVO197hc8RYlOqF7sNmyX
 lX1ZW8Zhf1PT8wAyBL9Zn9hiv+H2sDkN45wWacYZuweE4aZGcsbXRsFlUBM7M2l2
 aDOjLE78Y04BxQVsStlFgqqjII4pXVDd9AuykUHB+gW1Z5pjOJpV9OkpYvoL2s/d
 Gb4CegEUNV/TXlklEhutyWi3GCsZgjWRbRkthusqwPwQHjKt07OA1n9rUYH2FKqc
 Fnwc/hS4Z0sPnI9H/UOrc5tv2OSGE3n2+CJXohD41Ol2dsU7QdpfUmDuM1zBr65f
 hFEPCYnPp5+vryUl01jpG+55zV8kAloyjDvDaADbGZGgY8TH5pKRgYb6mVsJeCn9
 PjqBBWe9wz4ZSz0nVv6A0b7QNvzJEn3Rsz8F8zqIL1iDfOP5tJIFdcSqIiNTGYYX
 zsGMsRUMXvL87mnLBM9Me5RI7WpLep1Iie7FsyEhgQ57RFey5gwfske8dpYgGcox
 6+OMbYON/3W+XQPqZWgPA1oECqqHBWCyjUkyDJWHHWgW7IgW+qcStZTVJPzgFsHW
 niHQUfOZhQBP5XZ5YPJt
 =37Ms
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper:
mvebu defconfig changes for v3.14

 - mvebu: add GPIO LEDs
 - kirkwood: enable HIGHMEM

* tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: enable HIGHMEM in defconfig
  ARM: mvebu: config: Add GPIO connected LEDs support to defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 17:12:56 -08:00
Olof Johansson
5c74822588 mvebu driver changes for v3.14
- mvebu-mbus:
     - remove potential forever loop
     - remove deprecated comment
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6frAAoJEP45WPkGe8ZnlOcP/1Kd4778tvP9rKWkOYEsIFIB
 +uC/aDKKhQDLOgh19Hp2/ePIN5XWIZKBN7B7JrPaxJJ8QJpOur8EAFexVmFX767H
 6pV51xQQJToePeQi1/kLUTmj8COBMz2B1HzXQVSwQz4PiQFx7N5w4x4QZ3GD+mh2
 y5vg3a3GkDo6UHxscEjGUxjnj0m9zIPc12eHNSkfdHPuSG5xwpuu47oSZ7BSHVv9
 56p64zkwV4TwwfumyDf8HBOIy3Y8Di+fQUVWkuDEJDBIpMW2teyUjGBZUUXxtDL7
 j1xAf05URgnNjeeBmuuSead5sjVjqeW9xozUoSCBwRpfh5f6wGLfrU0+n/aKL5Mc
 vZ7DEIxww1F21YsDN/aYZA1+oAIjuXsuUVgoG1lqF7PFL8fnBR5M0aQUPj23Hc5T
 LfKEX8CrM3HyE/Ol2/q+Cj1sSHcw/3ewTAO/Nzp0/Aq1eC/eIlhXOKpcBCCFWOzq
 YRzxOJh/P+yu/NrS2hMZUG5BOKxavSCOqI/7Kt81b94hPCOo9/Tg61JoJXPOqh/m
 zt4b/LUVhvgbf5f0oqDTwa6aKVlsEmL4dtYta94Yw9Xsh7xVzUgsdtxrhIw43IPA
 fUVMN3ELESrARl+82wNSXqHY2siC4984TPOToEl1kPPbSzgbvmzq4hoPRHUe1A8X
 ByTMdM/dmh0q33ftExFs
 =tNyU
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-drivers-3.14' of git://git.infradead.org/linux-mvebu into next/drivers

From Jason Cooper:
mvebu driver changes for v3.14

 - mvebu-mbus:
    - remove potential forever loop
    - remove deprecated comment

* tag 'mvebu-drivers-3.14' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: Remove deprecated comment
  bus: mvebu-mbus: potential forever loop in mvebu_mbus_init()

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 17:10:38 -08:00
Olof Johansson
25e9cd462b mvebu DT changes for v3.14
- mvebu:
     - remove unneeded OS-specific properties from led nodes
     - add NAND controller to Armada boards
     - add sata leds to readynas 104
     - add gpio-poweroff to readynas duo v2
 
  - kirkwood:
     - comment cleanup in sheevaplug files
     - default pinctrl for sdio
     - sdio in guruplug is non-removable
 
  - orion5x:
     - typo fix
 
  - dove:
     - typo fix
     - add PMU interrupt controller and RTC interrupt via same
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6WGAAoJEP45WPkGe8Znj3AP/1OZ7ukVZYS51ut3biDaEwJz
 yWtzPMLV6PeHXOn+r/IecwoysRez1T7ReUPYOh/GaApPbFxAXKVnN4HbfsEZKXOC
 f45lKgNujF2LOlg+Uzj+7W6wjWPlKWK12vGqP5jeJHff4FYZiK6wKFqvG5ThtICg
 wgn6aSoMEkGZTIRkTP9CC0uYFjqiy7RY+8k7Kxp/y3iQmD2+evPAl9CpwY9PoPb5
 q2cnoXhLi6kmQV7pnoeI2JotuTKbdlqnhVT6GfFBeoGNs9pJvQz6j36MMltP2BFU
 V0JRv4kZWtzqy1SAgHRLk9r+Cl6JYYrBbAdwFDU/64xyKvCFEwWuuGxVl/etc4Gm
 hDXoGKQOxuSj89BEkIP6SYKO508ZU4bnvqi4vvUdbXRzaXx6aJV8I7m9OnWbsu6g
 VDLvVTkDsc0EM7rdFWdgM7hZGaY94dLjd20NhOkS4rYch5w24vhTd1RHV6ZU5D/8
 AZkUgMFY03kmEyXD973OW+SN3aywJCa8UfPqNfeRgUJDD4Q+vL8KfgdZ0N4NI5uo
 SeX8I2UvldPk355He3zVuVbxm4DOIY6LPJcChiuk0BHPRHV6wRRxQ5z+N+aW5l+O
 hLZ/9DAtA9iFuL5EDdwZvzU5zl2KsR5uFnIcU5IUsaq6k0yFRUkzLsKmt0LrgyHK
 EIs/bQXOHTW76Au1GLuR
 =j87K
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu into next/dt

From Jason Cooper:
mvebu DT changes for v3.14

 - mvebu:
    - remove unneeded OS-specific properties from led nodes
    - add NAND controller to Armada boards
    - add sata leds to readynas 104
    - add gpio-poweroff to readynas duo v2

 - kirkwood:
    - comment cleanup in sheevaplug files
    - default pinctrl for sdio
    - sdio in guruplug is non-removable

 - orion5x:
    - typo fix

 - dove:
    - typo fix
    - add PMU interrupt controller and RTC interrupt via same

* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: Dove: Add RTC interrupt via PMU interrupt controller.
  ARM: Dove: Add DT node for PMU interrupt controller.
  ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
  ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
  ARM: kirkwood: mark guruplug sdio as non-removable
  ARM: kirkwood: provide pinctrl default to sdio nodes
  ARM: dove: Fix typo in device_type property of phy node
  ARM: orion5x: Fix typo in device_type property of phy node
  ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
  ARM: mvebu: Enable NAND controller in Armada XP GP board
  ARM: mvebu: Add support for NAND controller in Armada 370/XP
  ARM: kirkwood: Cleanup comments in Sheevaplug dts files
  ARM: mvebu: dts: remove unneeded linux,default-state from led nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 17:07:28 -08:00
Olof Johansson
6316756922 mvebu soc changes for v3.14
- orion:
     - remove IRQF_DISABLED
     - directly include some .h files
 
  - mvebu:
     - remove some sparse warnings
 
  - orion5x:
     - include cleanup
     - warning removal for C=1
 
  - kirkwood:
     - remove legacy clock workarounds
     - stop rpinting a TCLK value of 0 for DT boards
 
  - dove:
     - warning removal for C=1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6KPAAoJEP45WPkGe8Zn7EQP/jrxv9Gjq/LZrUBNxMZyEedZ
 zvc7DgVAwH/TptH4kHyitnpOkcdY7gTTDmaL1r/Ch/MiGCDcb/5Q6AJ1AKJAezH1
 DJLkfBOrvvM8DMogIeBKzLCUMn+0z8vXUbiPBEo2mnbxCwq0leK+iFa1Uo0XzV5w
 i1kb15qYupCXs9u6oDnlJhh6Snx8UQXxJMdBSiG4W/A8h4yu7f1Zg3IrZ5sJfqyF
 wMwSNZ7JRIBXxh3lFVGJiACMx/SI3NEoAumDwHA8wm80uPqM0xjAS0ngRYlRWiqb
 h9RiRvw+ve1cQSUJvsV6dd2hvgoQT5WyK7QJpFljBfYFLttfesOQ0nIqpWMuTknT
 WO9GlmBdCC89fMYAIK0OAM4z0PxgLf+QVT8bEd0TnM7Qkt89QCbhT5DIzLKgZg68
 ShBOG8XXRU/Y4GozZUYglpSvhPhDag8IeM5eScObf1IkULJCeKanUrxqnRRkbDyK
 yXewlvvPzM3po6OOesK9au2zOjakzEcULS/ek0T0kvpICRrLL/LlKANstB+IfhfI
 /ly9WCOrquhyR+Rhl481soN0i4P8RjmkVURJV23UwzbCaMgIfg+GzqYfq/P9DS2t
 H9vwuI92ooVe5xQUvcitQf9XOj21yMP5ngDRZOiBv+8RYvQkCeOwFQjo+8Wrj+Bp
 earewiaYW2kXvkivdp6v
 =ZqNz
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into next/cleanup

From Jason Cooper:
mvebu soc changes for v3.14

 - orion:
    - remove IRQF_DISABLED
    - directly include some .h files

 - mvebu:
    - remove some sparse warnings

 - orion5x:
    - include cleanup
    - warning removal for C=1

 - kirkwood:
    - remove legacy clock workarounds
    - stop rpinting a TCLK value of 0 for DT boards

 - dove:
    - warning removal for C=1

* tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: fix some sparse warnings
  ARM: kirkwood: stop printk TCLK value at boot for DT boards
  ARM: orion5x: drop unused include from common.c
  ARM: Dove: Fix compiler warnings with C=1 builds
  ARM: Orion5x: Fix warnings when using C=1.
  ARM: Orion: Add missing includes
  ARM: kirkwood: remove lagacy clk workarounds
  arm: plat-orion: remove deprecated IRQF_DISABLED

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 16:54:28 -08:00
Olof Johansson
38e67641b9 Renesas ARM based SoC defconfig updates for v3.14
* Add Genmai defconfig
   - The board was added in v3.13 but the defconfig missed the cut
 * Enable AUTO_ZRELADDR for kzm9d board
 * Enable HPB-DMAC, PACKET, VFP on bockw and marzen boards
 * Do not disable INOTIFY_USER on bockw or marzen boards
 * Do not enable CONFIG_DEVTMPFS on bockw or marzen boards
 * Do not enable CONFIG_SMC911X on marzen
   - That hardware does not exist on the marzen board
 * Do not set command line on bockw or marzen boards
   - This is handled in the DTS
 * Enable REGULATOR on bockw board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSlwcCAAoJENfPZGlqN0++tbYQALAR+F92QUtJug2S4k2WSs7x
 KUPBUG8bDGTXWvfgHyWH0nyBOfnDmxRS/gzFNXvykKjQGncGQLoPCzvaJQUZTTwQ
 LRGKgxMJ85nuGNE+3CcFSOI7FaH+2A5I6FZ4LP2IqhguWT9H0HVWdGifFHSgkoeA
 oPkoZ8X148nrMmXE43V3cRA6OZozjf9alo2NrSyAdINw0gNkhVT+wHyIPnmyBt9j
 QyIyRHKMfDGfdL8u5A1yjDkfwpJqGhJxwGKGCkPwx+KaycctDKv3SAfygPeKchXP
 v8A7i78VeAUsjZTVHJoqYcpX6B1fm5nFQ8DntQyVDjv5uunNNlRPKWT8OFP//wSL
 nhDyWEM5IB7jijZMS2qguIW9VX0FV6MqA+VKj4j5Zf2EO442CP6sKuU77OeIwtXx
 lOidxjkwiYUpqGfX3i0gpdq0lWU/bTF4Q2EFQzKwKfNp6xoFb/5Op4NY5UvxZSrP
 vSAWW2uHzTfLvmJUXFwvbe0Bcte0pWblXAwyjY+jH1AvQn7h/5I68d60Q44wvRPH
 WLTikN1xKYM6kVRH2WJgNKvu5jFhyvNIi2QT4RvtFpbn6OUnSjTmerozYgCQPeYD
 AuYB0Z/jfQYySYhd1nmaxE/oax/IYBlkcU5z9WhOL0idEFnbN9lckikeOGWJc8ne
 kghMrhz9UzTwtRID1nSV
 =PYhW
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM based SoC defconfig updates for v3.14

* Add Genmai defconfig
  - The board was added in v3.13 but the defconfig missed the cut
* Enable AUTO_ZRELADDR for kzm9d board
* Enable HPB-DMAC, PACKET, VFP on bockw and marzen boards
* Do not disable INOTIFY_USER on bockw or marzen boards
* Do not enable CONFIG_DEVTMPFS on bockw or marzen boards
* Do not enable CONFIG_SMC911X on marzen
  - That hardware does not exist on the marzen board
* Do not set command line on bockw or marzen boards
  - This is handled in the DTS
* Enable REGULATOR on bockw board

* tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig
  ARM: shmobile: bockw: enable HPB-DMAC in defconfig
  ARM: shmobile: marzen: enable HPB-DMAC in defconfig
  ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig
  ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
  ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
  ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
  ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
  ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
  ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
  ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
  ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
  ARM: shmobile: marzen: Do not set command line in defconfig
  ARM: shmobile: bockw: Do not set command line in defconfig
  ARM: shmobile: bockw: enable CONFIG_REGULATOR
  ARM: shmobile: Genmai defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 16:52:33 -08:00
Olof Johansson
6ecf49bc03 Renesas ARM based SoC cleanups for v3.14
* Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
   sh7372 and sh73a0 SoCs.
 * Tidy up camera-rcar header for r8a7779 SoC
 * Tidy up registration of VIN on r8a7779 SoC
 * Tidy up PFC registration on r8a7790 SoC
 * Correct typo in clocks for r8a7790 SoC
 * Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
 * Don't use named resources for MMCIF and SDHI on ape6evm board
 * Don't use named resources for MMCIF on lager board
 * Tidy up device registration on lager board
 * Tidy up headers for bockw board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSlwO4AAoJENfPZGlqN0++NHwP/04gSfdK7Pwz8euoS0rimysQ
 cs30CQooxSBuuMrasfyNDhjmRdYNqZinGFd3B7Ir7d/EPveGpQZIUKd30rnQKjvP
 OT7RYGY356I0Fgcq3pWYt7E1VJTPsmSIW+7WHAJ6Jc5VwGaWJLE8j43+KV6CZrhz
 MjtuL8aNuxJYLGuIPcFw30x1Pp+6tJUmiaQYIGs8+KoKXceYFvDF26s27zpsk5I2
 EDJWfZRi0lUjlGtN+Uc0UU3SFbMzSyKPakAGQxmUSaBVQiEfbQwMf5TNSZAnaqV0
 HOrMjp2gCO5pM04aTwpKG8me+HDkoSvee828wJShmlnE0x8BEWAB03VNnNciDY6r
 aFZN0HnSR2ARgUKtdYhXiAEGKtJkRJ7nZ4/KSlt4Lv6tQlgc8Oh1ewklvSJ2zHWR
 6njmZP8caHQ43+xeRoamIYOv+5zkIyBOx0sxQQqXZ32fyGbR3Cj8dnR5F30NN0+q
 vwiMVSZ9IrpQK9BUPY4KGvtWNo8fLa2QUPrvrzUUob+FCfO+quBfB4PU3xlV9/B1
 sO0RqDgEswLfr9/HLVEupxusxAkTMS1/4eYq3PGmwg9skHj9ymWvZCaYTI1iVW/D
 uSl6ZisFtBJD8//J7qK8u4fhcWYzDVymOPzT2/hh2kg93h/AMwUenAKJgsmnLvm4
 kiiiELRMlU9gOzjsCfug
 =v12l
 -----END PGP SIGNATURE-----

Merge tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

From Simon Horman:

Renesas ARM based SoC cleanups for v3.14

* Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
  sh7372 and sh73a0 SoCs.
* Tidy up camera-rcar header for r8a7779 SoC
* Tidy up registration of VIN on r8a7779 SoC
* Tidy up PFC registration on r8a7790 SoC
* Correct typo in clocks for r8a7790 SoC
* Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
* Don't use named resources for MMCIF and SDHI on ape6evm board
* Don't use named resources for MMCIF on lager board
* Tidy up device registration on lager board
* Tidy up headers for bockw board

* tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh7372: tidyup clock table order
  ARM: shmobile: r7s72100: tidyup clock table order
  ARM: shmobile: sh73a0: tidyup clock table order
  ARM: shmobile: r8a7779: cleanup registration of sh_eth
  ARM: shmobile: r8a7790: Correct typo in clocks
  ARM: shmobile: r8a7779: camera-rcar header cleanup
  ARM: shmobile: Add r8a7790_register_pfc() function
  ARM: shmobile: Cosmetic update of Lager DT Reference
  ARM: shmobile: r8a7779: cleanup registration of VIN
  ARM: shmobile: bockw: header cleanup
  ARM: shmobile: sh73a0: don't use named resource for IPMMU
  ARM: shmobile: sh73a0: don't use named resource for I2C
  ARM: shmobile: sh73a0: don't use named resource for TMU
  ARM: shmobile: lager: don't use named resource for MMCIF
  ARM: shmobile: ape6evm: don't use named resource for SDHI
  ARM: shmobile: ape6evm: don't use named resource for MMCIF

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 16:50:52 -08:00
Olof Johansson
dab719392a Ux500 device tree patches for v3.14, take one:
- Fix up tc3589x bindings so this chip works again.
 
 - Remove SSP platform devices, as we now boot from device tree
   exclusively.
 
 - Delete surplus AB8500/DB8500 platform data, not obtained from
   the device tree.
 
 - Add DMA config for the MSP devices.
 
 - A series of 21 patches moving pin control config for the
   on-chip Nomadik pin controller from the board file
   to the device tree, step by step.
 
 - Two patches to the STE DMA40 driver regarding the high-prio
   DMA channel so this can be moved to the device tree. Both have
   Vinod's ACK.
 
 - Decommission of the non-device tree boot path for the timer
   initialization code.
 
 - Deletion of the non-devicetree probe path from the MTU timer
   driver, as all platforms using it are now using device tree.
   This has Daniel Lezcano's ACK.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSlQIFAAoJEEEQszewGV1zaaoP/iUClda7fps7dhBZMHOaDr48
 DAe9yBaUoGBgyjOd0QUUP4/P5PxsXQVCM13gdaITt+R4eg8XYxG3jLNxopMfGKYV
 bifbXqEd4wf0t8yUYCzhdfAeWchzSph3W2C7I2hW09b9nhJ+RWgXdzcO061E9Tbj
 BbZ4aS7IR3HfXzQ/zdMBtlbNXkWtn++HXCjC5Z0t0FKqSL7X8LKZrr3GEHZ6vfnB
 sI5/bTK3AfXt7h2wsu4z/IZK89Ttt9AATNhxajW2Pptkuggc+/KfRRDyYeZFBT70
 9KIRsF3NXSsOhOYcRNbWjNU2S8OtC7UyKMB5+y07cYU53ehaiEH8tUMait1cphlc
 kFJAqKXY87I85E6WTEgv1s4Q8H3rQzVc/IjT3LODFbuM3MeTrsrnbKDeFCOqqpJC
 4Ggq6VBXhn7G2srcM5KBYZcZhmq86qhmo0/vUOqaYcdmgdD7KJyewLNafYf5W+DX
 JxVlnzpdWsAhihUV3oBeJybM0YGvE1wa855ZqbsAZ8nrLTBoTD+zi30mIhXrQwQp
 v54ywGa0JtjpTLY6EZG2Rptq4qOUVUbkuNSv+3BYgVTqxCcCqXOu+tuzGk2O1jTh
 8/2biKCCrdbSWCmbMZDi7jlkO5ywqcn2Brav5KyZ+bCwITRybfoxeOv6f8DCT741
 bwx00XNaYVO/H+Vptd+h
 =w9pg
 -----END PGP SIGNATURE-----

Merge tag 'ux500-devicetree-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:

Ux500 device tree patches for v3.14, take one:

- Fix up tc3589x bindings so this chip works again.

- Remove SSP platform devices, as we now boot from device tree
  exclusively.

- Delete surplus AB8500/DB8500 platform data, not obtained from
  the device tree.

- Add DMA config for the MSP devices.

- A series of 21 patches moving pin control config for the
  on-chip Nomadik pin controller from the board file
  to the device tree, step by step.

- Two patches to the STE DMA40 driver regarding the high-prio
  DMA channel so this can be moved to the device tree. Both have
  Vinod's ACK.

- Decommission of the non-device tree boot path for the timer
  initialization code.

- Deletion of the non-devicetree probe path from the MTU timer
  driver, as all platforms using it are now using device tree.
  This has Daniel Lezcano's ACK.

* tag 'ux500-devicetree-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (39 commits)
  ARM: ux500: decomission custom SMP TWD timer init
  clksrc: delete nomadik MTU non-DT boot path
  ARM: ux500: decomission the non-DT MTU init sequence
  dma: ste_dma40: Parse flags property for new 'high priority channel' request
  dma: ste_dma40: Expand DT binding to accept 'high-priority channel' flag
  ARM: ux500: Remove checking for DT during timer init
  ARM: ux500: Clean-up legacy extern prototype
  ARM: ux500: Remove unused call to register AMBA devices
  ARM: ux500: Clean-up non-DT IRQ initialisation
  pinctrl: nomadik: decomission non-DT boot path
  pinctrl: nomadik: move platform data handling into driver
  ARM: ux500: get rid of unused header
  ARM: ux500: delete Nomadik pinctrl AUXDATA
  ARM: ux500: delete remnant pin config macros
  ARM: ux500: move snowball pin configs to device tree
  ARM: ux500: move snowball LED pin control to device tree
  ARM: ux500: convert Snowball SPI pin reference
  ARM: ux500: move snowball ethernet config to device tree
  ARM: ux500: move HREFv60plus pin configs to device tree
  ARM: ux500: move final HREFv60 LCD pins to device tree
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 16:45:24 -08:00
Junho Ryu
4e8d213980 ext4: fix use-after-free in ext4_mb_new_blocks
ext4_mb_put_pa should hold pa->pa_lock before accessing pa->pa_count.
While ext4_mb_use_preallocated checks pa->pa_deleted first and then
increments pa->count later, ext4_mb_put_pa decrements pa->pa_count
before holding pa->pa_lock and then sets pa->pa_deleted.

* Free sequence
ext4_mb_put_pa (1):		atomic_dec_and_test pa->pa_count
ext4_mb_put_pa (2):		lock pa->pa_lock
ext4_mb_put_pa (3):			check pa->pa_deleted
ext4_mb_put_pa (4):			set pa->pa_deleted=1
ext4_mb_put_pa (5):		unlock pa->pa_lock
ext4_mb_put_pa (6):		remove pa from a list
ext4_mb_pa_callback:		free pa

* Use sequence
ext4_mb_use_preallocated (1):	iterate over preallocation
ext4_mb_use_preallocated (2):	lock pa->pa_lock
ext4_mb_use_preallocated (3):		check pa->pa_deleted
ext4_mb_use_preallocated (4):		increase pa->pa_count
ext4_mb_use_preallocated (5):	unlock pa->pa_lock
ext4_mb_release_context:	access pa

* Use-after-free sequence
[initial status]		<pa->pa_deleted = 0, pa_count = 1>
ext4_mb_use_preallocated (1):	iterate over preallocation
ext4_mb_use_preallocated (2):	lock pa->pa_lock
ext4_mb_use_preallocated (3):		check pa->pa_deleted
ext4_mb_put_pa (1):		atomic_dec_and_test pa->pa_count
[pa_count decremented]		<pa->pa_deleted = 0, pa_count = 0>
ext4_mb_use_preallocated (4):		increase pa->pa_count
[pa_count incremented]		<pa->pa_deleted = 0, pa_count = 1>
ext4_mb_use_preallocated (5):	unlock pa->pa_lock
ext4_mb_put_pa (2):		lock pa->pa_lock
ext4_mb_put_pa (3):			check pa->pa_deleted
ext4_mb_put_pa (4):			set pa->pa_deleted=1
[race condition!]		<pa->pa_deleted = 1, pa_count = 1>
ext4_mb_put_pa (5):		unlock pa->pa_lock
ext4_mb_put_pa (6):		remove pa from a list
ext4_mb_pa_callback:		free pa
ext4_mb_release_context:	access pa

AddressSanitizer has detected use-after-free in ext4_mb_new_blocks
Bug report: http://goo.gl/rG1On3

Signed-off-by: Junho Ryu <jayr@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
2013-12-03 18:10:28 -05:00
Helge Deller
a16ab68ee9 parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
Signed-off-by: Helge Deller <deller@gmx.de>
2013-12-03 23:23:35 +01:00
Dinh Nguyen
a5c6e87a7b arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
Some of the clocks that were designated gate-clk do not have a gate, so
change those clocks to be of periph-clk type.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 14:19:53 -08:00
Dinh Nguyen
725dd7eb17 arm: socfpga: Enable ARM_TWD for socfpga
Update Kconfig to enable TWD.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 14:19:48 -08:00
Ville Syrjälä
5ae68b4132 drm/i915: Skip clock checks on BDW
We don't have clock state readout support for DDI, so skip the pipe
config clock checks on all DDI platforms.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-12-03 23:15:47 +01:00
Chris Wilson
edd5b13313 drm/i915: Do not clobber config status after a forced restore of hw state
We call intel_modeset_setup_hw_state() along two paths, driver
load/resume and after a lid event notification. During initialisation of
the driver, it is imperative that we reset the config state. This
correctly sets up the initial connector statuses and prepares the
hardware for a thorough probing. However, during a lid event, we only
want to undo the damage caused by the bios by resetting our last known
mode. In this cirumstance, we do not want to clobber our desired state.

In order to try and keep sanity between the config state and our own
tracking, do the drm_mode_config_reset() first along the load/resume
paths before reading out the hw state and apply any definite known
corrections.

v2: "As discussed on irc I don't think we should force the connector
state to anything here: Imo connector->status should reflect what we
believe to be the true output connection state, whereas connector->encoder
reflects whether this connector is wired up to a pipe. And since we no
longer reject modeset on disconnected connectors and never nuked the pipe
if the connector gets disconnected there's no reason for that - such policy
is userspace's job.

This regression has been introduced in

commit 2e9388923e
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Oct 11 20:08:24 2012 +0200

    drm/i915/crt: explicitly set up HOTPLUG_BITS on resume"
so sayeth Daniel.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: stable@vger.kernel.org (v3.8 and later)
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-12-03 23:15:46 +01:00
Ville Syrjälä
0274766428 drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
Some lower level things get angry if we don't have modeset locks
during intel_modeset_setup_hw_state(). Actually the resume and
lid_notify codepaths alreday hold the locks, but the init codepath
doesn't, so fix that.

Note: This slipped through since we only disable pipes if the
plane/pipe linking doesn't match. Which is only relevant on older
gen3 mobile machines, if the BIOS fails to set up our preferred
linking.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Tested-and-reported-by: Paul Bolle <pebolle@tiscali.nl>
[danvet: Add note now that I could confirm my theory with the log
files Paul Bolle provided.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-12-03 23:14:26 +01:00
David S. Miller
988bf4f01e Merge branch 'cxgb4'
Hariprasad Shenai says:

====================
Fixes T5 adapter init, due to incorrect FW version check

This patch series fixes, Chelsio T5 adapter initialization failure due to
incorrect firmware version check. This patch series modifies the firmware
flashing mechanism for T4/T5 adapter.

The patch series moves chip type from struct adapter to struct adapter_params.
It changes the references of chip type in cxgb4 and cxgb4vf drivers such that
build failure is avoided.

Patch 3/3 is dependent on patch 1/3
Patch 2/3 is also dependent on patch 1/3

We would like to request this patch series to get merged via David Miller's
'net' tree.

We have included all the maintainers of respective drivers. Kindly review the
change and let us know in case of any review comments.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-03 16:55:49 -05:00
Hariprasad Shenai
16e47624e7 cxgb4: Add new scheme to update T4/T5 firmware
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-03 16:55:40 -05:00
Hariprasad Shenai
70ee366689 cxgb4vf: added much cleaner implementation of is_t4()
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-03 16:55:40 -05:00
Hariprasad Shenai
d14807dd8e cxgb4: Much cleaner implementation of is_t4()/is_t5()
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-03 16:55:40 -05:00
Kent Overstreet
bc1e79acc1 block: fixup for generic bio chaining
btrfs bits got lost in the rebase

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 14:30:00 -07:00
Kent Overstreet
2b8221e181 block: Really silence spurious compiler warnings
The uninitialized_var() macro appears to not work on structs...
Get rid of it, and manually initialize instead.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 14:29:09 -07:00
Greg Kroah-Hartman
55ef003e4a Second round of IIO fixes for the 3.13 cycle.
2 fixes here.
 
 * The gp2ap020a00f is a simple missing kconfig dependency.
 
 * The hid sensors hub fix is a work around for an issue introduced by hardware
 changes due to a certain large software vendor having an 'interesting'
 interpretation of the specification and hence indexing some arrays from 1
 rather than 0.  The fix takes advantage of the logical min and max reading
 facilities introduced by the precursor patch to figure out whether we have
 a 0 indexed or 1 indexed device and to adjust appropriately.  It also
 drops a previous kconfig option that allowed this issue to be worked around
 at build time.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSnkM1AAoJEFSFNJnE9BaIV/0P/26YRyWfInekegDN9nviEMno
 bBZIQy1iuiZOSqw78XdiN4NBfK3Vy4F/cx+yGkr2fVa6NV/B6p3iL0+Pv4HiZSqs
 VY4TlNs5el7GD399+nOatgCAM6NXvkSE9rOAEdNWgWUupy/XVRx6nCpghRltnmu3
 mSZCywSnHuCCj2TG9Q/FVjMp3GR3GboSnF09Q/8Xxt7HNj2poxAuYCcMGl9SYgDw
 gfaKsmGZk488H5CA2FjIWQ5/5vOTCxoPr5MgTjqfpLD2tB5+ZsdMmDacsEa31nZS
 RHKzLDvYuAlBeaeR/FUeB5S6YgZpB0MulNsF2z2ms99mSmmjWTr1qun5cdMIh9su
 OBKtmew9MnXWlP6yxSVNTvmPbGHSzzb9x2grvptPN6x/08Qk/Sv0qJcmb267Vr0u
 EwqjSqIDdMOTfhlltpWeIF3+6bHj7RTrVfXvNi+plAKx1gp8/2pYZAp05eNHO6tD
 ITyOCiL7O1KNcG5si+EI5EdCqWj9Dmdul16gHFafPohDJWiCNo/aLhb3jQKZWZyA
 JnM6DENEmdicHeYuQKaBV95ptLdzAU9POapJzMMMQVNY5RS6DnHPBVCAuqrkdzAo
 57FT5dewm6FI2+k+ckawtUgyf56nCzsbEHo3iFaHn0ElxWJeR8/Acn/jR6Agm1AN
 DGNgavLLU3kFN9lHjPk3
 =BgVg
 -----END PGP SIGNATURE-----

Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

Second round of IIO fixes for the 3.13 cycle.

2 fixes here.

* The gp2ap020a00f is a simple missing kconfig dependency.

* The hid sensors hub fix is a work around for an issue introduced by hardware
changes due to a certain large software vendor having an 'interesting'
interpretation of the specification and hence indexing some arrays from 1
rather than 0.  The fix takes advantage of the logical min and max reading
facilities introduced by the precursor patch to figure out whether we have
a 0 indexed or 1 indexed device and to adjust appropriately.  It also
drops a previous kconfig option that allowed this issue to be worked around
at build time.
2013-12-03 13:24:58 -08:00
Jeff Moyer
959a35f13e blk-mq: fix dereference of rq->mq_ctx if allocation fails
If __GFP_WAIT isn't set and we fail allocating, when we go
to drop the reference on the ctx, we will attempt to dereference
the NULL rq. Fix that.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2013-12-03 14:24:28 -07:00
Konrad Rzeszutek Wilk
813e8e3d6a cpuidle: Check for dev before deregistering it.
If not, we could end up in the unfortunate situation where
we dereference a NULL pointer b/c we have cpuidle disabled.

This is the case when booting under Xen (which uses the
ACPI P/C states but disables the CPU idle driver) - and can
be easily reproduced when booting with cpuidle.off=1.

BUG: unable to handle kernel NULL pointer dereference at           (null)
IP: [<ffffffff8156db4a>] cpuidle_unregister_device+0x2a/0x90
.. snip..
Call Trace:
 [<ffffffff813b15b4>] acpi_processor_power_exit+0x3c/0x5c
 [<ffffffff813af0a9>] acpi_processor_stop+0x61/0xb6
 [<ffffffff814215bf>] __device_release_driver+0fffff81421653>] device_release_driver+0x23/0x30
 [<ffffffff81420ed8>] bus_remove_device+0x108/0x180
 [<ffffffff8141d9d9>] device_del+0x129/0x1c0
 [<ffffffff813cb4b0>] ? unregister_xenbus_watch+0x1f0/0x1f0
 [<ffffffff8141da8e>] device_unregister+0x1e/0x60
 [<ffffffff814243e9>] unregister_cpu+0x39/0x60
 [<ffffffff81019e03>] arch_unregister_cpu+0x23/0x30
 [<ffffffff813c3c51>] handle_vcpu_hotplug_event+0xc1/0xe0
 [<ffffffff813cb4f5>] xenwatch_thread+0x45/0x120
 [<ffffffff810af010>] ? abort_exclusive_wait+0xb0/0xb0
 [<ffffffff8108ec42>] kthread+0xd2/0xf0
 [<ffffffff8108eb70>] ? kthread_create_on_node+0x180/0x180
 [<ffffffff816ce17c>] ret_from_fork+0x7c/0xb0
 [<ffffffff8108eb70>] ? kthread_create_on_node+0x180/0x180

This problem also appears in 3.12 and could be a candidate for backport.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2013-12-03 22:05:22 +01:00
Olof Johansson
f39918eec7 ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
Enable MMC/SD on the Broadcom mobile platforms, and increase the block
minors from the default 8 to 16 (since the Broadcom board by default
has root on the 8th partition).

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: stable@vger.kernel.org # v3.12
2013-12-03 12:39:14 -08:00
Olof Johansson
610ffd58db ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
This enables a few more options on the sunxi defconfigs such that I can
use nfsroot to boot them (there is no local storage support yet). It
also enables PRINTK_TIME and tmpfs since it's a common distro requirement.

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-03 12:39:13 -08:00