karo-tx-linux.git
4 years agoARM: imx: defconfig: add Ka-Ro TXA5 defconfig karo-txa5 kc/karo-txa5 KARO-TXA5-2015-06-26
Lothar Waßmann [Thu, 25 Jun 2015 16:41:52 +0000 (18:41 +0200)]
ARM: imx: defconfig: add Ka-Ro TXA5 defconfig

4 years agoInput: edt-ft5x06: prevent using on-stack buffer for I2C transfer
Lothar Waßmann [Wed, 3 Jun 2015 06:11:46 +0000 (08:11 +0200)]
Input: edt-ft5x06: prevent using on-stack buffer for I2C transfer

Using this driver with a DMA enabled I2C controller produces the
following warning (with CONFIG_DMA_API_DEBUG enabled):
|at91_i2c f8014000.i2c: DMA-API: device driver maps memory from stack [addr=8f847e29]

Prevent this by using a preallocated buffer.

4 years agoi2c: at91: print error messages in case of failed dma_request_slave_channel_reason()
Lothar Waßmann [Wed, 3 Jun 2015 06:10:47 +0000 (08:10 +0200)]
i2c: at91: print error messages in case of failed dma_request_slave_channel_reason()

4 years agoi2c: at91: use correct length in dma_unmap_single()
Lothar Waßmann [Wed, 3 Jun 2015 05:49:23 +0000 (07:49 +0200)]
i2c: at91: use correct length in dma_unmap_single()

The driver calls dma_map_single() with either 'dev->buf_len' or
'dev->buf_len - 2' as length argument, but always uses 'dev->buf_len'
in dma_unmap_single(). This produces the warning:
at91_i2c f8014000.i2c: DMA-API: device driver frees DMA memory with different size [device address=0x000000002fbf9240] [map size=20 bytes] [unmap size=22 bytes]
with CONFIG_DMA_API_DEBUG enabled.

Use dma_sg_len() as argument for dma_unmap_single() which is always
set to the correct length.

4 years agodrm: add support for pixel clock and DE polarity control via DT
Lothar Waßmann [Wed, 3 Jun 2015 05:47:07 +0000 (07:47 +0200)]
drm: add support for pixel clock and DE polarity control via DT

4 years agoARM: at91/dt: sama5d4: add dts for Ka-Ro TXA5 board
Lothar Waßmann [Wed, 3 Jun 2015 05:44:58 +0000 (07:44 +0200)]
ARM: at91/dt: sama5d4: add dts for Ka-Ro TXA5 board

4 years agoARM: at91: debug: make sama5d4 debug uart selectable
Lothar Waßmann [Wed, 3 Jun 2015 05:43:03 +0000 (07:43 +0200)]
ARM: at91: debug: make sama5d4 debug uart selectable

4 years agoARM: at91/dt: sama5d4: add label to watchdog node
Lothar Waßmann [Wed, 3 Jun 2015 05:41:22 +0000 (07:41 +0200)]
ARM: at91/dt: sama5d4: add label to watchdog node

4 years agoARM: at91/dt: sama5d4: fix broken arithmetic expression in dmas property of i2c1
Lothar Waßmann [Wed, 3 Jun 2015 05:41:02 +0000 (07:41 +0200)]
ARM: at91/dt: sama5d4: fix broken arithmetic expression in dmas property of i2c1

4 years agoARM: at91/dt: sama5d4: fix ranges property for pinctrl node and mux-mask for pioD
Lothar Waßmann [Wed, 3 Jun 2015 05:39:49 +0000 (07:39 +0200)]
ARM: at91/dt: sama5d4: fix ranges property for pinctrl node and mux-mask for pioD

4 years agoARM: at91/dt: sama5d4: add support for SPI1
Lothar Waßmann [Wed, 3 Jun 2015 05:38:03 +0000 (07:38 +0200)]
ARM: at91/dt: sama5d4: add support for SPI1

4 years agoARM: at91/dt: sama5d4: add support for USART0/1
Lothar Waßmann [Wed, 3 Jun 2015 05:37:49 +0000 (07:37 +0200)]
ARM: at91/dt: sama5d4: add support for USART0/1

4 years agoARM: at91/dt: sama5d4: add empty lines between nodes
Lothar Waßmann [Wed, 3 Jun 2015 05:23:02 +0000 (07:23 +0200)]
ARM: at91/dt: sama5d4: add empty lines between nodes

4 years agodrm: atmel-hlcdc: distinguish between sama5d3 and sama5d4
Lothar Waßmann [Wed, 3 Jun 2015 05:21:40 +0000 (07:21 +0200)]
drm: atmel-hlcdc: distinguish between sama5d3 and sama5d4

4 years agopwm: print error messages with pr_err() instead of pr_debug()
Lothar Waßmann [Wed, 3 Jun 2015 05:18:30 +0000 (07:18 +0200)]
pwm: print error messages with pr_err() instead of pr_debug()

4 years agobacklight: pwm: don't try legacy API when devm_pwm_get() returns -EPROBE_DEFER
Lothar Waßmann [Wed, 3 Jun 2015 05:17:14 +0000 (07:17 +0200)]
backlight: pwm: don't try legacy API when devm_pwm_get() returns -EPROBE_DEFER

4 years agoAdd linux-next specific files for 20150409
Stephen Rothwell [Thu, 9 Apr 2015 09:28:46 +0000 (19:28 +1000)]
Add linux-next specific files for 20150409

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agoMerge branch 'akpm/master'
Stephen Rothwell [Thu, 9 Apr 2015 09:08:19 +0000 (19:08 +1000)]
Merge branch 'akpm/master'

4 years agomm: add strictlimit knob
Maxim Patlasov [Tue, 7 Apr 2015 23:57:08 +0000 (09:57 +1000)]
mm: add strictlimit knob

The "strictlimit" feature was introduced to enforce per-bdi dirty limits
for FUSE which sets bdi max_ratio to 1% by default:

http://article.gmane.org/gmane.linux.kernel.mm/105809

However the feature can be useful for other relatively slow or untrusted
BDIs like USB flash drives and DVD+RW.  The patch adds a knob to enable
the feature:

echo 1 > /sys/class/bdi/X:Y/strictlimit

Being enabled, the feature enforces bdi max_ratio limit even if global
(10%) dirty limit is not reached.  Of course, the effect is not visible
until /sys/class/bdi/X:Y/max_ratio is decreased to some reasonable value.

Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Artem S. Tashkinov" <t.artem@lycos.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jan Kara <jack@suse.cz>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agodrivers/w1/w1_int.c: call put_device if device_register fails
Levente Kurusa [Tue, 7 Apr 2015 23:57:08 +0000 (09:57 +1000)]
drivers/w1/w1_int.c: call put_device if device_register fails

Currently, memsetting and kfreeing the device is bad behaviour.  The
device will have a reference count of 1 and hence can cause trouble
because it has kfree'd.  Proper way to handle a failed device_register is
to call put_device right after it fails.

Signed-off-by: Levente Kurusa <levex@linux.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, mm, x86: enhance MTRR checks for KVA huge page mapping
Toshi Kani [Tue, 7 Apr 2015 23:57:08 +0000 (09:57 +1000)]
mtrr, mm, x86: enhance MTRR checks for KVA huge page mapping

This patch adds an additional argument, 'uniform', to mtrr_type_lookup(),
which returns 1 when a given range is covered uniformly by MTRRs, i.e.
the range is fully covered by a single MTRR entry or the default type.

pud_set_huge() and pmd_set_huge() are changed to check the new 'uniform'
flag to see if it is safe to create a huge page mapping to the range.
This allows them to create a huge page mapping to a range covered by a
single MTRR entry of any memory type.  It also detects a non-optimal
request properly.  They continue to check with the WB type since the WB
type has no effect even if a request spans multiple MTRR entries.

pmd_set_huge() logs a warning message to a non-optimal request so that
driver writers will be aware of such a case.  Drivers should make a
mapping request aligned to a single MTRR entry when the range is covered
by MTRRs.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, x86: clean up mtrr_type_lookup()
Toshi Kani [Tue, 7 Apr 2015 23:57:08 +0000 (09:57 +1000)]
mtrr, x86: clean up mtrr_type_lookup()

MTRRs contain fixed and variable entries.  mtrr_type_lookup() may
repeatedly call __mtrr_type_lookup() to handle a request that overlaps
with variable entries.  However, __mtrr_type_lookup() also handles the
fixed entries, which do not have to be repeated.  Therefore, this patch
creates separate functions, mtrr_type_lookup_fixed() and
mtrr_type_lookup_variable(), to handle the fixed and variable ranges
respectively.

The patch also updates the function headers to clarify the return values
and output argument.  It updates comments to clarify that the repeating is
necessary to handle overlaps with the default type, since overlaps with
multiple entries alone can be handled without such repeating.

There is no functional change in this patch.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup()
Toshi Kani [Tue, 7 Apr 2015 23:57:08 +0000 (09:57 +1000)]
mtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup()

mtrr_type_lookup() returns 0xFF when it cannot return a valid MTRR memory
type since MTRRs are disabled.  This patch defines MTRR_TYPE_INVALID to
clarify the meaning of this value, and documents its usage.

There is no functional change in this patch.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, x86: fix MTRR state checks in mtrr_type_lookup()
Toshi Kani [Tue, 7 Apr 2015 23:57:07 +0000 (09:57 +1000)]
mtrr, x86: fix MTRR state checks in mtrr_type_lookup()

'mtrr_state.enabled' contains the FE (fixed MTRRs enabled)
and E (MTRRs enabled) flags in MSR_MTRRdefType.  Intel SDM,
section 11.11.2.1, defines these flags as follows:
 - All MTRRs are disabled when the E flag is clear.
   The FE flag has no affect when the E flag is clear.
 - The default type is enabled when the E flag is set.
 - MTRR variable ranges are enabled when the E flag is set.
 - MTRR fixed ranges are enabled when both E and FE flags
   are set.

MTRR state checks in __mtrr_type_lookup() do not match with
SDM.  Hence, this patch makes the following changes:
 - The current code detects MTRRs disabled when both E and
   FE flags are clear in mtrr_state.enabled.  Fix to detect
   MTRRs disabled when the E flag is clear.
 - The current code does not check if the FE bit is set in
   mtrr_state.enabled when looking into the fixed entries.
   Fix to check the FE flag.
 - The current code returns the default type when the E flag
   is clear in mtrr_state.enabled.  However, the default type
   is also disabled when the E flag is clear.  Fix to remove
   the code as this case is handled as MTRR disabled with
   the 1st change.

In addition, this patch defines the E and FE flags in
mtrr_state.enabled as follows.
 - FE flag: MTRR_STATE_MTRR_FIXED_ENABLED
 - E  flag: MTRR_STATE_MTRR_ENABLED

print_mtrr_state() is also updated accordingly.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, x86: remove a wrong address check in __mtrr_type_lookup()
Toshi Kani [Tue, 7 Apr 2015 23:57:07 +0000 (09:57 +1000)]
mtrr, x86: remove a wrong address check in __mtrr_type_lookup()

__mtrr_type_lookup() checks MTRR fixed ranges when mtrr_state.have_fixed
is set and start is less than 0x100000.  However, the 'else if (start <
0x1000000)' in the code checks with a wrong address as it has an
extra-zero in the address.  The code still runs correctly as this check is
meaningless, though.

This patch replaces the wrong address check with 'else' with no condition.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomtrr, x86: fix MTRR lookup to handle inclusive entry
Toshi Kani [Tue, 7 Apr 2015 23:57:07 +0000 (09:57 +1000)]
mtrr, x86: fix MTRR lookup to handle inclusive entry

When an MTRR entry is inclusive to a requested range, i.e.  the start and
end of the request are not within the MTRR entry range but the range
contains the MTRR entry entirely, __mtrr_type_lookup() ignores such a case
because both start_state and end_state are set to zero.

This bug can cause the following issues:

1) reserve_memtype() tracks an effective memory type in case a request
   type is WB (ex.  /dev/mem blindly uses WB).  Missing to track with its
   effective type causes a subsequent request to map the same range with
   the effective type to fail.

2) pud_set_huge() and pmd_set_huge() check if a requested range has any
   overlap with MTRRs.  Missing to detect an overlap may cause a
   performance penalty or undefined behavior.

This patch fixes the bug by adding a new flag, 'inclusive', to detect the
inclusive case.  This case is then handled in the same way as
(!start_state && end_state).  With this fix, __mtrr_type_lookup() handles
the inclusive case properly.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomm, x86: document return values of mapping funcs
Toshi Kani [Tue, 7 Apr 2015 23:57:07 +0000 (09:57 +1000)]
mm, x86: document return values of mapping funcs

This patchset enhances MTRR checks for the kernel huge I/O mapping, which
was enabled by the patchset below:

  https://lkml.org/lkml/2015/3/3/589

The following functional changes are made in patch 7/7.
 - Allow pud_set_huge() and pmd_set_huge() to create a huge page
   mapping to a range covered by a single MTRR entry of any memory
   type.
 - Log a pr_warn() message when a specified PMD map range spans more
   than a single MTRR entry.  Drivers should make a mapping request
   aligned to a single MTRR entry when the range is covered by MTRRs.

This patch (of 7):

Document the return values of KVA mapping functions, pud_set_huge(),
pmd_set_huge, pud_clear_huge() and pmd_clear_huge().

Simplify the conditions to select HAVE_ARCH_HUGE_VMAP in the Kconfig,
since X86_PAE depends on X86_32.

There is no functional change in this patch.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Robert Elliott <Elliott@hp.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agodrivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
Ben Dooks [Tue, 7 Apr 2015 23:57:07 +0000 (09:57 +1000)]
drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic

Change the __raw IO calls to readl/write_relaxed which makes the driver
endian agnostic to run properly on big endian systems.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Andrew Victor <linux@maxim.org.za>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agoDocumentation/spi/spidev_test.c: fix warning
Andrew Morton [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
Documentation/spi/spidev_test.c: fix warning

Documentation/spi/spidev_test.c:83:5: warning: no previous prototype for 'unespcape' [-Wmissing-prototypes]

fix spelling too.

Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agortc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2
Krzysztof Kozlowski [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2

Consistently use platform_get_device_id() instead of pdev->id_entry.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agodrivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
Krzysztof Kozlowski [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type

The RTC driver supports two flavors of S5M devices: S5M8767-like and
S2MPS14-like.

On S2MPS13 and S2MPS14 devices the RTC module is the same so we want to
re-use the existing support of S2MPS14.  However device type was passed
from parent MFD driver in platform data structure.  This way for the
S2MPS13 device the main MFD driver passed device type of 'S2MPS13X'.

Instead decouple detecting of device type between main MFD and RTC driver.
 This allows adding support for other S2MPS14 variations (like S2MPS11 and
S2MPS13) easily by adding to mfd/sec-core.c:

static const struct mfd_cell s2mps13_devs[] = {
{ .name = "s2mps14-rtc", }
};

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years ago.gitignore: ignore *.tar
Andrey Skvortsov [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
.gitignore: ignore *.tar

Running make tar-pkg results in following:

 # Untracked files:
 #   (use "git add <file>..." to include in what will be committed)
 #
 #       linux-4.0.0-rc3-next-20150313-150225--x86.tar

This patch makes git ignore *.tar files.
Running 'git ls-files -i --exclude-standard' does not show any
tar files excluded from tracking after the change.

Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agoMAINTAINERS: add Mediatek SoC mailing list
Matthias Brugger [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
MAINTAINERS: add Mediatek SoC mailing list

Add the new list that Mediatek specific patches should also be
directed to.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agoprctl: avoid using mmap_sem for exe_file serialization
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:06 +0000 (09:57 +1000)]
prctl: avoid using mmap_sem for exe_file serialization

Oleg cleverly suggested using xchg() to set the new mm->exe_file instead
of calling set_mm_exe_file() which requires some form of serialization --
mmap_sem in this case.  For archs that do not have atomic rmw instructions
we still fallback to a spinlock alternative, so this should always be
safe.  As such, we only need the mmap_sem for looking up the backing
vm_file, which can be done sharing the lock.  Naturally, this means we
need to manually deal with both the new and old file reference counting,
and we need not worry about the MMF_EXE_FILE_CHANGED bits, which can
probably be deleted in the future anyway.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Suggested-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agotomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes
Andrew Morton [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
tomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes

Sumeone needs to buy a tab key.

WARNING: please, no spaces at the start of a line
#29: FILE: security/tomoyo/util.c:951:
+       struct file *exe_file;$

WARNING: please, no spaces at the start of a line
#30: FILE: security/tomoyo/util.c:952:
+       const char *cp;$

WARNING: please, no spaces at the start of a line
#31: FILE: security/tomoyo/util.c:953:
+       struct mm_struct *mm = current->mm;$

WARNING: please, no spaces at the start of a line
#40: FILE: security/tomoyo/util.c:955:
+       if (!mm)$

WARNING: suspect code indent for conditional statements (7, 15)
#40: FILE: security/tomoyo/util.c:955:
+       if (!mm)
+        return NULL;

WARNING: please, no spaces at the start of a line
#42: FILE: security/tomoyo/util.c:957:
+       exe_file = get_mm_exe_file(mm);$

WARNING: please, no spaces at the start of a line
#43: FILE: security/tomoyo/util.c:958:
+       if (!exe_file)$

WARNING: suspect code indent for conditional statements (7, 15)
#43: FILE: security/tomoyo/util.c:958:
+       if (!exe_file)
+        return NULL;

WARNING: please, no spaces at the start of a line
#46: FILE: security/tomoyo/util.c:961:
+       cp = tomoyo_realpath_from_path(&exe_file->f_path);$

WARNING: please, no spaces at the start of a line
#47: FILE: security/tomoyo/util.c:962:
+       fput(exe_file);$

WARNING: please, no spaces at the start of a line
#48: FILE: security/tomoyo/util.c:963:
+       return cp;$

total: 0 errors, 11 warnings, 28 lines checked

./patches/tomoyo-reduce-mmap_sem-hold-for-mm-exe_file.patch has style problems, please review.

If any of these errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

Please run checkpatch prior to sending patches

Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: James Morris <jmorris@namei.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agotomoyo: reduce mmap_sem hold for mm->exe_file
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
tomoyo: reduce mmap_sem hold for mm->exe_file

The mm->exe_file is currently serialized with mmap_sem (shared) in order
to both safely (1) read the file and (2) compute the realpath by calling
tomoyo_realpath_from_path, making it an absolute overkill.  Good users
will, on the other hand, make use of the more standard get_mm_exe_file(),
requiring only holding the mmap_sem to read the value, and relying on
reference

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agooprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix
Andrew Morton [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix

export get_mm_exe_file for arch/x86/oprofile/oprofile.ko

Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: Robert Richter <rric@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agopowerpc/oprofile: reduce mmap_sem hold for exe_file
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
powerpc/oprofile: reduce mmap_sem hold for exe_file

In the future mm->exe_file will be done without mmap_sem serialization,
thus isolate and reorganize the related code to make the transition
easier.  Good users will, make use of the more standard get_mm_exe_file(),
requiring only holding the mmap_sem to read the value, and relying on
reference counting to make sure that the exe file won't dissappear
underneath us while getting the dcookie.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Robert Richter <rric@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agooprofile: reduce mmap_sem hold for mm->exe_file
Davidlohr Bueso [Tue, 7 Apr 2015 23:57:05 +0000 (09:57 +1000)]
oprofile: reduce mmap_sem hold for mm->exe_file

sync_buffer() needs the mmap_sem for two distinct operations, both only
occurring upon user context switch handling:

 1) Dealing with the exe_file.

 2) Adding the dcookie data as we need to lookup the vma that
   backs it. This is done via add_sample() and add_data().

This patch isolates 1), for it will no longer need the mmap_sem for
serialization.  However, for now, make of the more standard
get_mm_exe_file(), requiring only holding the mmap_sem to read the value,
and relying on reference counting to make sure that the exe file won't
dissappear underneath us while doing the get dcookie.

As a consequence, for 2) we move the mmap_sem locking into where we really
need it, in lookup_dcookie().  The benefits are twofold: reduce mmap_sem
hold times, and cleaner code.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Robert Richter <rric@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agomips: ip32: add platform data hooks to use DS1685 driver
Joshua Kinard [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
mips: ip32: add platform data hooks to use DS1685 driver

This modifies the IP32 (SGI O2) platform and reset code to utilize the new
rtc-ds1685 driver.  The old mc146818rtc.h header is removed and ip32_defconfig
is updated as well.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agolib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Andrew Morton [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text

Cc: Yalin Wang <yalin.wang@sonymobile.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agoarch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Masanari Iida [Tue, 7 Apr 2015 23:57:04 +0000 (09:57 +1000)]
arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Thu, 9 Apr 2015 08:53:01 +0000 (18:53 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
Documentation/printk-formats.txt
arch/arm64/Kconfig
arch/parisc/include/asm/Kbuild
arch/s390/mm/mmap.c
drivers/rtc/class.c
drivers/rtc/rtc-mc13xxx.c
fs/ext2/file.c
fs/ext4/file.c
fs/fat/inode.c

4 years agoMerge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:30:33 +0000 (18:30 +1000)]
Merge remote-tracking branch 'livepatching/for-next'

Conflicts:
arch/s390/Kconfig

4 years agoMerge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Thu, 9 Apr 2015 08:28:53 +0000 (18:28 +1000)]
Merge remote-tracking branch 'y2038/y2038'

Conflicts:
drivers/staging/media/lirc/lirc_parallel.c

4 years agoMerge remote-tracking branch 'kselftest/next'
Stephen Rothwell [Thu, 9 Apr 2015 08:27:46 +0000 (18:27 +1000)]
Merge remote-tracking branch 'kselftest/next'

Conflicts:
tools/testing/selftests/powerpc/Makefile

4 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:27:39 +0000 (18:27 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'

4 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)]
Merge remote-tracking branch 'clk/clk-next'

4 years agoMerge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:24:23 +0000 (18:24 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'

4 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:22:58 +0000 (18:22 +1000)]
Merge remote-tracking branch 'pwm/for-next'

4 years agoMerge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:14:07 +0000 (18:14 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

4 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:12:15 +0000 (18:12 +1000)]
Merge remote-tracking branch 'gpio/for-next'

4 years agoMerge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:11:11 +0000 (18:11 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'

4 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:06:24 +0000 (18:06 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/usb/dwc3/dwc3-pci.c

4 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 08:01:05 +0000 (18:01 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

4 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:59:53 +0000 (17:59 +1000)]
Merge remote-tracking branch 'target-updates/for-next'

4 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:48:08 +0000 (17:48 +1000)]
Merge remote-tracking branch 'scsi/for-next'

4 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

4 years agoMerge remote-tracking branch 'kdbus/kdbus'
Stephen Rothwell [Thu, 9 Apr 2015 07:22:55 +0000 (17:22 +1000)]
Merge remote-tracking branch 'kdbus/kdbus'

Conflicts:
Documentation/Makefile

4 years agoMerge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:21:49 +0000 (17:21 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'

4 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:10:26 +0000 (17:10 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

4 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:08:15 +0000 (17:08 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/media/mn88473/mn88473.c

4 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 9 Apr 2015 07:05:43 +0000 (17:05 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

4 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:01:01 +0000 (17:01 +1000)]
Merge remote-tracking branch 'usb/usb-next'

4 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:59:00 +0000 (16:59 +1000)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/dma/Kconfig

4 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:45:59 +0000 (16:45 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

4 years agoMerge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:44:58 +0000 (16:44 +1000)]
Merge remote-tracking branch 'ipmi/for-next'

4 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:42:41 +0000 (16:42 +1000)]
Merge remote-tracking branch 'leds/for-next'

4 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:41:39 +0000 (16:41 +1000)]
Merge remote-tracking branch 'hsi/for-next'

4 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:40:14 +0000 (16:40 +1000)]
Merge remote-tracking branch 'regmap/for-next'

4 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:39:07 +0000 (16:39 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'

4 years agoMerge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)]
Merge remote-tracking branch 'drivers-x86/for-next'

4 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:25:21 +0000 (16:25 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

4 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:15:22 +0000 (16:15 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
drivers/xen/Kconfig

4 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:02:39 +0000 (16:02 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/mips/kernel/genex.S

4 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 9 Apr 2015 05:49:11 +0000 (15:49 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

4 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:37:20 +0000 (15:37 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

4 years agoMerge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:27:37 +0000 (15:27 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'

Conflicts:
arch/arm/mach-exynos/suspend.c

4 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:26:18 +0000 (15:26 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

4 years agoMerge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)]
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/mach-rockchip/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/rockchip_timer.c

4 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 9 Apr 2015 05:13:12 +0000 (15:13 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
include/linux/bpf.h
include/uapi/linux/bpf.h
samples/bpf/Makefile

4 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:11:15 +0000 (15:11 +1000)]
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma_regs.h

4 years agoMerge remote-tracking branch 'mailbox/mailbox-for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:06:09 +0000 (15:06 +1000)]
Merge remote-tracking branch 'mailbox/mailbox-for-next'

4 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:58:22 +0000 (14:58 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt

4 years agoMerge remote-tracking branch 'audit/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:55:32 +0000 (14:55 +1000)]
Merge remote-tracking branch 'audit/next'

4 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:43:10 +0000 (14:43 +1000)]
Merge remote-tracking branch 'trivial/for-next'

4 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:41:52 +0000 (14:41 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

4 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:40:14 +0000 (14:40 +1000)]
Merge remote-tracking branch 'vfio/next'

4 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:38:48 +0000 (14:38 +1000)]
Merge remote-tracking branch 'dwmw2-iommu/master'

4 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:37:12 +0000 (14:37 +1000)]
Merge remote-tracking branch 'iommu/next'

4 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:36:10 +0000 (14:36 +1000)]
Merge remote-tracking branch 'watchdog/master'

4 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:50 +0000 (14:34 +1000)]
Merge remote-tracking branch 'selinux/next'

4 years agoMerge remote-tracking branch 'integrity/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:47 +0000 (14:34 +1000)]
Merge remote-tracking branch 'integrity/next'

4 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:33:28 +0000 (14:33 +1000)]
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm-chip.c

4 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:16:13 +0000 (14:16 +1000)]
Merge remote-tracking branch 'regulator/for-next'

4 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

4 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:13:18 +0000 (14:13 +1000)]
Merge remote-tracking branch 'battery/master'

Conflicts:
drivers/hid/wacom.h
drivers/hid/wacom_sys.c

4 years agoMerge remote-tracking branch 'backlight/for-backlight-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:12:14 +0000 (14:12 +1000)]
Merge remote-tracking branch 'backlight/for-backlight-next'

4 years agoMerge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:10:43 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'

4 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:09:14 +0000 (14:09 +1000)]
Merge remote-tracking branch 'md/for-next'