Commit Graph

533375 Commits

Author SHA1 Message Date
Alexandre Belloni
80d352de65 ARM: at91/defconfig: at91_dt: remove ARM_AT91_ETHER
CONFIG_ARM_AT91_ETHER doesn't exist anymore, both drivers have been merged
in the macb driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-13 12:06:57 +02:00
Josh Wu
5bfb1e4113 ARM: at91/defconfig: at91_dt: enable DRM hlcdc support
This patch adds drm atmel lcdc, simple panel and backlight options.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-13 12:06:44 +02:00
Olof Johansson
d304f99c9c Merge tag 'sunxi-defconfig-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig
Allwinner defconfig changes for 4.3

Two patches that enable various Allwinner related drivers drivers both in
sunxi_defconfig and in multi_v7_defconfig

* tag 'sunxi-defconfig-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
  ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-06 10:12:52 +02:00
Olof Johansson
1ff2b94d15 Merge tag 'mvebu-config-4.3-2' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu config changes for v4.3 (part #2)

Improve dt support for orion5x

* tag 'mvebu-config-4.3-2' of git://git.infradead.org/linux-mvebu:
  ARM: defconfig: orion5x: add DT support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-05 11:11:51 +02:00
Olof Johansson
e06b2d8621 Merge tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.3

* Enable KS8851 for QCOM SoCs in qcom defconfig

* tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm:
  ARM: qcom_defconfig: Enable options for KS8851 ethernet

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-05 10:46:31 +02:00
Josh Wu
d323c85ce5 ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
Add Atmel-isi and ov2640 driver in defconfig

Signed-off-by: Josh Wu <josh.wu@atmel.com>
[nicolas.ferre@atmel.com: make SOC_CAMERA_OV2640 selected as a module]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-05 10:40:47 +02:00
Olof Johansson
141a7bab29 Merge tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Second Round of Renesas ARM Based SoC Defconfig Updates for v4.3

* Enable fixed voltage regulator in shmobile_defconfig

* tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-08-05 10:35:54 +02:00
Chen-Yu Tsai
8faf3554cb ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
Enable drivers for Allwinner P2WI, PWM, cryptodev (Security System) and
sun6i DMA engine. Also enable EXTCON as PHY_SUN4I_USB depends on it.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-07-31 20:01:24 +02:00
Chen-Yu Tsai
2a46dd6c0c ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE
Enable sun6i DMA engine, sun6i P2WI, PWM, and crypto engine (Security
System) drivers by default. EXTCON is needed by the updated sun4i USB
PHY driver.

While at it, enable FHANDLE, which is needed by systemd and newer
versions of udev. Also enable CGROUPS for systemd.

And get rid of POWER_RESET, as the sun6i power reset driver has been
removed in favor of proper sun6i watchdog support.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-07-31 19:00:55 +02:00
Simon Horman
4055a722d2 ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
This is selected by MACH_MARZEN which is enabled in shmobile_defconfig,
however, MACH_MARZEN is going away along with the board code it enables.

Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-07-28 09:27:00 +09:00
Fabio Estevam
27e50c9708 ARM: multi_v7_defconfig: Select MX6UL and MX7D
Let MX6UL and MX7D SoCs be selected by default.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 21:17:27 +02:00
Olof Johansson
0e83c71cbd Merge tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/defconfig
Merge "CSR prima2_defconfig fixes for 4.2" from Barry Song:

enable SiRFSoC device drivers in CSR prima2_defconfig

make savedefconfig at first, then enable
1. sdhci driver
2. onkey
3. rtc
4. hwspinlock
for prima2_defconfig

* tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: prima2_defconfig: enable build for hwspinlock
  ARM: prima2_defconfig: enable build for RTC
  ARM: prima2_defconfig: enable build for misc input
  ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
  ARM: prima2_defconfig: fix the outdated defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 20:44:20 +02:00
Barry Song
764c222555 ARM: prima2_defconfig: enable build for hwspinlock
This patch enables hardware spinlock driver for CSRatlas7 platforms.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
2015-07-28 04:41:20 +08:00
Barry Song
3cbedb8847 ARM: prima2_defconfig: enable build for RTC
This patch enables RTC_CLASS and RTC driver for SiRFSoC platforms.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
2015-07-28 04:41:20 +08:00
Barry Song
9dd105430a ARM: prima2_defconfig: enable build for misc input
we need INPUT_MISC to enable INPUT_SIRFSOC_ONKEY which is the onkey
driver for SiRFSoC platforms.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
2015-07-28 04:41:19 +08:00
Barry Song
de124e8742 ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
this patch enables the MMC/SDHCI driver for SiRFSoC platforms.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
2015-07-28 04:41:19 +08:00
Barry Song
79302812c1 ARM: prima2_defconfig: fix the outdated defconfig
this patch is againest v4.2-rc1, by doing:

 $ make ARCH=arm prima2_defconfig
 $ make ARCH=arm savedefconfig
 $ cp defconfig arch/arm/configs/prima2_defconfig

Signed-off-by: Barry Song <Baohua.Song@csr.com>
2015-07-28 04:41:19 +08:00
Olof Johansson
97de17fde7 Merge tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.3

* Remove marzen_defconfig
* shmobile_defconfig and multi_v7_defconfig
  - Enable DPCM Sound Card
  - Enable r8a7793/gose platform

* tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove marzen_defconfig
  ARM: multi_v7_defconfig: add Renesas DPCM Sound Card
  ARM: shmobile: defconfig: add Renesas DPCM Sound Card
  ARM: multi_v7_defconfig: Enable shmobile r8a7793/gose platform
  ARM: shmobile: Enable gose board in multiplatform defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:35:39 +02:00
Olof Johansson
3888c381d8 Merge tag 'sti-defconfig-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/defconfig
STi defconfig for v4.3, round 1

Highlights:
-----------
 - Enable support ST's PWM driver in multi_v7
 - Enable support PWM regulator in multi_v7

* tag 'sti-defconfig-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
  ARM: multi_v7_defconfig: Enable support for PWM Regulators
  ARM: multi_v7_defconfig: Enable ST's PWM driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:22:59 +02:00
Roger Shimizu
9e07b491bc ARM: defconfig: orion5x: add DT support
- add 2 DT device entries
- enable CONFIG_ARM_ATAG_DTB_COMPAT

Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-07-25 16:21:06 +02:00
Stephen Boyd
142f2610d5 ARM: qcom_defconfig: Enable options for KS8851 ethernet
Enable the RPM and RPM regulator drivers as well as the KS8851
ethernet driver so that ethernet works on MSM8960 CDP.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-07-24 14:51:32 -05:00
Olof Johansson
f1d28f0b39 Merge tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "defconfig changes for v4.3" from Tony Lindgren:

Few defconfig changes for omap2plus_defconfig to enable
SPI NOR, CPTS, touchscreen and ADC used on am335x, am437x
and ra7 devices.

* tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
  ARM: omap2plus_defconfig: enable support for TI CPTS
  ARM: omap2plus_defconfig: enable support for TI touchscreen
  ARM: omap2plus_defconfig: enable support for TI ADC

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-22 16:28:37 -07:00
Lee Jones
5ecd29ac5e ARM: multi_v7_defconfig: Enable support for PWM Regulators
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-07-22 14:29:45 +02:00
Lee Jones
eb592bc2f3 ARM: multi_v7_defconfig: Enable ST's PWM driver
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-07-22 14:16:33 +02:00
Olof Johansson
ea7b44b6e9 Merge tag 'ep93xx-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/defconfig
Merge "EP93xx defconfig changes" from Linus Walleij:

This updates the EP93xx defconfig to use NO_HZ and high
resolution timers, and to by default enable and compile
all board variants now that we can have a single kernel,
and enable all EP93xx-specific drivers that sit in various
sites across the kernel.

* tag 'ep93xx-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: ep93xx: add framebuffer to the defconfig
  ARM: ep93xx: add DMA engine to the defconfig
  ARM: ep93xx: add GPIO I2C to defconfig
  ARM: ep93xx: add LEDs and triggers to defconfig
  ARM: ep93xx: enable SIM.ONE MMC/SD hardware
  ARM: ep93xx: enable all boards in the EP93xx defconfig
  ARM: ep93xx: activate NO_HZ and high-res timers

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-17 10:23:08 -07:00
Olof Johansson
30e714c18c Merge tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "ARM: mvebu: config changes for v4.3" from Gregory Clement:

mvebu config changes for v4.3 (part #1)

update mvebu_v7_defconfig with features needed for Armada 388 GP

* tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update mvebu_v7_defconfig with features needed for Armada 388 GP

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-17 10:09:14 -07:00
Linus Walleij
b471e7f2ec ARM: ep93xx: add framebuffer to the defconfig
The EP93xx SoC has a framebuffer driver, let's add this to the
defconfig so we can have graphics working out of the box.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:38 +02:00
Linus Walleij
0466b0cc6e ARM: ep93xx: add DMA engine to the defconfig
Several boards can make use of the DMA engine on the EP93xx
so let's enable this by default in the defconfig.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:38 +02:00
Linus Walleij
d74485eb90 ARM: ep93xx: add GPIO I2C to defconfig
Some of the EP93xx boards have I2C devices on bit-banged GPIO
I2C, so add this to the defconfig.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:37 +02:00
Linus Walleij
4abdd63925 ARM: ep93xx: add LEDs and triggers to defconfig
The EP93xx has two designated LEDs (not always connected): a
green and a red one. These are registered in the core, so let's
enable the driver and some triggers.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:37 +02:00
Linus Walleij
7dc2753b70 ARM: ep93xx: enable SIM.ONE MMC/SD hardware
The SIM.ONE has a MMC card connected to the SPI host. This card
usually hosts an EXT4 root file system. Enable these options in
the defconfig so the default ompiled kernel will work
out-of-the-box.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:36 +02:00
Linus Walleij
8430f7f9d7 ARM: ep93xx: enable all boards in the EP93xx defconfig
With PATCH_PHYS_TO_VIRT we can support all EP93xx variants
in a single image, so enable all board variants in the defconfig
for simplicity and build coverage.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:36 +02:00
Linus Walleij
3484550d62 ARM: ep93xx: activate NO_HZ and high-res timers
Let's set the EP93xx to NO_HZ mode and activate the high-res
timers now that we have GENERIC_CLOCKEVENTS.

Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-17 11:52:35 +02:00
Magnus Damm
821e79cb56 ARM: shmobile: Remove marzen_defconfig
Now when the Marzen legacy board code is removed also
get rid of the marzen_defconfig file. Existing users
shall move over to shmobile_defconfig.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-07-17 08:29:45 +09:00
Sekhar Nori
da104dc845 ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
M25P80 driver provides support for most common SPI NOR devices.
These devices are commonly found on TI EVMs for AM437x and DRA7x
SoCs.

Enable support for this driver in defconfig for omap2plus devices.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-07-16 00:54:53 -07:00
Sekhar Nori
5c107aa031 ARM: omap2plus_defconfig: enable support for TI CPTS
CPTS module of CPSW IP enables timestamp synchronization
using PTP. Enable CPTS feature of CPSW driver.

Available on AM335x, AM437x and DRA7x SoCs.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-07-16 00:54:10 -07:00
Sekhar Nori
af7b9f8942 ARM: omap2plus_defconfig: enable support for TI touchscreen
Enable support for on-chip resistive touchscreen m found on AM335x and
AM437x devices.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-07-16 00:54:09 -07:00
Sekhar Nori
588f2c31f3 ARM: omap2plus_defconfig: enable support for TI ADC
Enable support for on-chip ADC found on AM335x and
AM437x devices.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-07-16 00:54:09 -07:00
Kuninori Morimoto
9afa6c4980 ARM: multi_v7_defconfig: add Renesas DPCM Sound Card
This patch enables Renesas DPCM related sound card.
It is used for...
 - Sampline rate convert
 - CTU/MIXer

Note: you need to enable these settings on DTS file

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-07-15 11:21:31 +09:00
Kuninori Morimoto
6cec276808 ARM: shmobile: defconfig: add Renesas DPCM Sound Card
This patch enables DPCM related sound card.
It is used for...
 - Sampline rate convert
 - CTU/MIXer

Note: you need to enable these settings on DTS file

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-07-15 09:15:50 +09:00
Masahiro Yamada
91e2213bdb ARM: multi_v7_defconfig: enable UniPhier UART driver
The UniPhier on-chip UART driver was merged into the mainline by
commit 1a8d2903cb ("serial: 8250_uniphier: add UniPhier serial
driver").

Enable it from multi_v7_defconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-14 11:21:54 +02:00
Baruch Siach
f57eb528ec ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-14 11:20:48 +02:00
Linus Torvalds
bc0195aad0 Linux 4.2-rc2 v4.2-rc2 2015-07-12 15:10:30 -07:00
Linus Torvalds
01e2d0627a Revert "drm/i915: Use crtc_state->active in primary check_plane func"
This reverts commit dec4f799d0.

Jörg Otte reports a NULL pointder dereference due to this commit, as
'crtc_state' very much can be NULL:

        crtc_state = state->base.state ?
                intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;

So the change to test 'crtc_state->base.active' cannot possibly be
correct as-is.

There may be some other minimal fix (like just checking crtc_state for
NULL), but I'm just reverting it now for the rc2 release, and people
like Daniel Vetter who actually know this code will figure out what the
right solution is in the longer term.

Reported-and-bisected-by: Jörg Otte <jrg.otte@gmail.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-07-12 15:00:20 -07:00
Linus Torvalds
c83727a656 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
 "Fixes for this cycle regression in overlayfs and a couple of
  long-standing (== all the way back to 2.6.12, at least) bugs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  freeing unlinked file indefinitely delayed
  fix a braino in ovl_d_select_inode()
  9p: don't leave a half-initialized inode sitting around
2015-07-12 14:09:36 -07:00
Linus Torvalds
7fbb58a065 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
 "A fair number of 4.2 fixes also because Markos opened the flood gates.

   - Patch up the math used calculate the location for the page bitmap.

   - The FDC (Not what you think, FDC stands for Fast Debug Channel) IRQ
     around was causing issues on non-Malta platforms, so move the code
     to a Malta specific location.

   - A spelling fix replicated through several files.

   - Fix to the emulation of an R2 instruction for R6 cores.

   - Fix the JR emulation for R6.

   - Further patching of mindless 64 bit issues.

   - Ensure the kernel won't crash on CPUs with L2 caches with >= 8
     ways.

   - Use compat_sys_getsockopt for O32 ABI on 64 bit kernels.

   - Fix cache flushing for multithreaded cores.

   - A build fix"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: O32: Use compat_sys_getsockopt.
  MIPS: c-r4k: Extend way_string array
  MIPS: Pistachio: Support CDMM & Fast Debug Channel
  MIPS: Malta: Make GIC FDC IRQ workaround Malta specific
  MIPS: c-r4k: Fix cache flushing for MT cores
  Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
  MIPS: cps-vec: Use macros for various arithmetics and memory operations
  MIPS: kernel: cps-vec: Replace KSEG0 with CKSEG0
  MIPS: kernel: cps-vec: Use ta0-ta3 pseudo-registers for 64-bit
  MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
  MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA
  MIPS: kernel: smp-cps: Fix 64-bit compatibility errors due to pointer casting
  MIPS: Fix erroneous JR emulation for MIPS R6
  MIPS: Fix branch emulation for BLTC and BGEC instructions
  MIPS: kernel: traps: Fix broken indentation
  MIPS: bootmem: Don't use memory holes for page bitmap
  MIPS: O32: Do not handle require 32 bytes from the stack to be readable.
  MIPS, CPUFREQ: Fix spelling of Institute.
  MIPS: Lemote 2F: Fix build caused by recent mass rename.
2015-07-12 13:55:24 -07:00
Linus Torvalds
1daa1cfb7a Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:

 - the high latency PIT detection fix, which slipped through the cracks
   for rc1

 - a regression fix for the early printk mechanism

 - the x86 part to plug irq/vector related hotplug races

 - move the allocation of the espfix pages on cpu hotplug to non atomic
   context.  The current code triggers a might_sleep() warning.

 - a series of KASAN fixes addressing boot crashes and usability

 - a trivial typo fix for Kconfig help text

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kconfig: Fix typo in the CONFIG_CMDLINE_BOOL help text
  x86/irq: Retrieve irq data after locking irq_desc
  x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
  x86/irq: Plug irq vector hotplug race
  x86/earlyprintk: Allow early_printk() to use console style parameters like '115200n8'
  x86/espfix: Init espfix on the boot CPU side
  x86/espfix: Add 'cpu' parameter to init_espfix_ap()
  x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
  x86/kasan: Add message about KASAN being initialized
  x86/kasan: Fix boot crash on AMD processors
  x86/kasan: Flush TLBs after switching CR3
  x86/kasan: Fix KASAN shadow region page tables
  x86/init: Clear 'init_level4_pgt' earlier
  x86/tsc: Let high latency PIT fail fast in quick_pit_calibrate()
2015-07-12 10:02:38 -07:00
Linus Torvalds
7b732169e9 Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
 "This update from the timer departement contains:

   - A series of patches which address a shortcoming in the tick
     broadcast code.

     If the broadcast device is not available or an hrtimer emulated
     broadcast device, some of the original assumptions lead to boot
     failures.  I rather plugged all of the corner cases instead of only
     addressing the issue reported, so the change got a little larger.

     Has been extensivly tested on x86 and arm.

   - Get rid of the last holdouts using do_posix_clock_monotonic_gettime()

   - A regression fix for the imx clocksource driver

   - An update to the new state callbacks mechanism for clockevents.
     This is required to simplify the conversion, which will take place
     in 4.3"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick/broadcast: Prevent NULL pointer dereference
  time: Get rid of do_posix_clock_monotonic_gettime
  cris: Replace do_posix_clock_monotonic_gettime()
  tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
  tick/broadcast: Handle spurious interrupts gracefully
  tick/broadcast: Check for hrtimer broadcast active early
  tick/broadcast: Return busy when IPI is pending
  tick/broadcast: Return busy if periodic mode and hrtimer broadcast
  tick/broadcast: Move the check for periodic mode inside state handling
  tick/broadcast: Prevent deep idle if no broadcast device available
  tick/broadcast: Make idle check independent from mode and config
  tick/broadcast: Sanity check the shutdown of the local clock_event
  tick/broadcast: Prevent hrtimer recursion
  clockevents: Allow set-state callbacks to be optional
  clocksource/imx: Define clocksource for mx27
2015-07-12 09:36:59 -07:00
Linus Torvalds
c4bc680cf7 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
 "A single fix for a cpu hotplug race vs. interrupt descriptors:

  Prevent irq setup/teardown across the cpu starting/dying parts of cpu
  hotplug so that the starting/dying cpu has a stable view of the
  descriptor space.  This has been an issue for all architectures in the
  cpu dying phase, where interrupts are migrated away from the dying
  cpu.  In the starting phase its mostly a x86 issue vs the vector space
  update"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hotplug: Prevent alloc/free of irq descriptors during cpu up/down
2015-07-12 09:15:02 -07:00
Al Viro
75a6f82a0d freeing unlinked file indefinitely delayed
Normally opening a file, unlinking it and then closing will have
the inode freed upon close() (provided that it's not otherwise busy and
has no remaining links, of course).  However, there's one case where that
does *not* happen.  Namely, if you open it by fhandle with cold dcache,
then unlink() and close().

	In normal case you get d_delete() in unlink(2) notice that dentry
is busy and unhash it; on the final dput() it will be forcibly evicted from
dcache, triggering iput() and inode removal.  In this case, though, we end
up with *two* dentries - disconnected (created by open-by-fhandle) and
regular one (used by unlink()).  The latter will have its reference to inode
dropped just fine, but the former will not - it's considered hashed (it
is on the ->s_anon list), so it will stay around until the memory pressure
will finally do it in.  As the result, we have the final iput() delayed
indefinitely.  It's trivial to reproduce -

void flush_dcache(void)
{
        system("mount -o remount,rw /");
}

static char buf[20 * 1024 * 1024];

main()
{
        int fd;
        union {
                struct file_handle f;
                char buf[MAX_HANDLE_SZ];
        } x;
        int m;

        x.f.handle_bytes = sizeof(x);
        chdir("/root");
        mkdir("foo", 0700);
        fd = open("foo/bar", O_CREAT | O_RDWR, 0600);
        close(fd);
        name_to_handle_at(AT_FDCWD, "foo/bar", &x.f, &m, 0);
        flush_dcache();
        fd = open_by_handle_at(AT_FDCWD, &x.f, O_RDWR);
        unlink("foo/bar");
        write(fd, buf, sizeof(buf));
        system("df .");			/* 20Mb eaten */
        close(fd);
        system("df .");			/* should've freed those 20Mb */
        flush_dcache();
        system("df .");			/* should be the same as #2 */
}

will spit out something like
Filesystem     1K-blocks   Used Available Use% Mounted on
/dev/root         322023 303843      1131 100% /
Filesystem     1K-blocks   Used Available Use% Mounted on
/dev/root         322023 303843      1131 100% /
Filesystem     1K-blocks   Used Available Use% Mounted on
/dev/root         322023 283282     21692  93% /
- inode gets freed only when dentry is finally evicted (here we trigger
than by remount; normally it would've happened in response to memory
pressure hell knows when).

Cc: stable@vger.kernel.org # v2.6.38+; earlier ones need s/kill_it/unhash_it/
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-12 11:27:04 -04:00