Commit graph

567744 commits

Author SHA1 Message Date
Luis de Bethencourt
03c7b939b1 mvsas: fix misleading indentation
am: 61fbad6a28

Change-Id: I5422457ab66bd8a08f22fae79351dc7133d4f225
2017-03-18 11:24:22 +00:00
Krzysztof Kozlowski
5aac664c0c serial: samsung: Continue to work if DMA request fails
am: 72ca0ab306

Change-Id: I6b2c536ac7ea2371badb4b8080d2806a001a44d1
2017-03-18 11:24:12 +00:00
Johan Hovold
5b6244690a USB: serial: io_ti: fix information leak in completion handler
am: 72bb2b96b8

Change-Id: Ie1079bef9c43dce4ccecb52acbee12b4dd044e3f
2017-03-18 11:24:04 +00:00
Johan Hovold
946f6288ff USB: serial: io_ti: fix NULL-deref in interrupt callback
am: e71c7bad68

Change-Id: I865b297bdb9d8c9eb69e7548ceef6e640f9061e6
2017-03-18 11:23:55 +00:00
Johan Hovold
f6753981f4 USB: iowarrior: fix NULL-deref in write
am: 6498086195

Change-Id: Ib6ec11fa0bef224af9368ee4aba48d8d4663da50
2017-03-18 11:23:45 +00:00
Johan Hovold
bf259081a4 USB: iowarrior: fix NULL-deref at probe
am: 179295c38d

Change-Id: If8771741f6228ec6af891a160d5af5f6789f5409
2017-03-18 11:23:37 +00:00
Johan Hovold
c98a41cdb8 USB: serial: omninet: fix reference leaks at open
am: 54f11a9662

Change-Id: If2605f1daf506ae915776138b6268d0769a39487
2017-03-18 11:23:27 +00:00
Johan Hovold
a94cfa2ac4 USB: serial: safe_serial: fix information leak in completion handler
am: 3cdc946387

Change-Id: I2a29b5d7a753bd94d320bda52427bd62ab042787
2017-03-18 11:23:18 +00:00
Guenter Roeck
33451f0582 usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
am: cf09c7d60c

Change-Id: I5cab1e3af61dd148ff737ba1dc68935407342983
2017-03-18 11:23:09 +00:00
Peter Chen
7badd91967 usb: host: xhci-dbg: HCIVERSION should be a binary number
am: 40c5634ffe

Change-Id: I41ed67d92ce661cb607ae65e297856b34e6a05d5
2017-03-18 11:22:59 +00:00
Felipe Balbi
5bfd45cfa0 usb: gadget: function: f_fs: pass companion descriptor along
am: 4a1a3bb70f

Change-Id: I7b29e1d8050144b745f4885566e37d2bbca122a3
2017-03-18 11:22:49 +00:00
Felipe Balbi
49e48368a6 usb: dwc3: gadget: make Set Endpoint Configuration macros safe
am: 10af248565

Change-Id: I5c852ac4d0fbe9276986df1a57e93979ec8f6cf9
2017-03-18 11:22:39 +00:00
Peter Chen
2b7b5c5f36 usb: gadget: dummy_hcd: clear usb_gadget region before registration
am: f47b97f2cd

Change-Id: Ifad25d5604ef1bc2c10cc4c5414348c23f37beb0
2017-03-18 11:22:28 +00:00
Ravi Bangoria
699ec839c0 powerpc: Emulation support for load/store instructions on LE
am: 2ca39d1300

Change-Id: I4db441c5727a8caef2b50f3a385197a1076ab55d
2017-03-18 11:22:17 +00:00
Rik van Riel
752883928d tracing: Add #undef to fix compile error
am: 074893495b

Change-Id: I20f387e74bc1cdd5c4a11d55b65e443b85606c0b
2017-03-18 11:22:06 +00:00
James Hogan
de761c12a4 MIPS: Netlogic: Fix CP0_EBASE redefinition warnings
am: 1276510585

Change-Id: Ib7ca5ebf52d798a057a0d509226b59116da302e9
2017-03-18 11:21:55 +00:00
Ralf Baechle
507638623f MIPS: DEC: Avoid la pseudo-instruction in delay slots
am: 2e4aff2405

Change-Id: Ia06f405fc818fa7f147d9ae2ac32f74451d580fa
2017-03-18 11:21:45 +00:00
Arnd Bergmann
9d92396f8a mm: memcontrol: avoid unused function warning
am: 5fad174344

Change-Id: I6734d095131126260931a16a670c66ec58ba4896
2017-03-18 11:21:33 +00:00
Arnd Bergmann
5caa0a5ddd cpmac: remove hopeless #warning
am: 5e45d834f7

Change-Id: Icfecd82f0ed400d01e16c1719451ddbdc886c5ef
2017-03-18 11:21:22 +00:00
Arnd Bergmann
285819747b MIPS: ralink: Remove unused rt*_wdt_reset functions
am: 32883383f5

Change-Id: I1c172b4be8bd694e5781d5f248ed19f8f6bb16e4
2017-03-18 11:21:11 +00:00
John Crispin
82caf1be31 MIPS: ralink: Cosmetic change to prom_init().
am: 4b91e7a2a9

Change-Id: Icd9d99ba438913cca6698b67caba94acd5416f1d
2017-03-18 11:20:59 +00:00
Arnd Bergmann
8726395744 mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy
am: 3dc8f1e3a8

Change-Id: If4374a22df01b414e950e9621d7b0a0353b0dc3d
2017-03-18 11:20:47 +00:00
Arnd Bergmann
9e383c0ed9 MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change
am: d2a8d746ae

Change-Id: I2acfec230eda26006b4730a91067e86df5ad9c7e
2017-03-18 11:20:36 +00:00
Arnd Bergmann
07658ad370 MIPS: ip22: Fix ip28 build for modern gcc
am: c018595d83

Change-Id: Ibe3c6e3b5e809d24bd298007154b29936ebfdbdb
2017-03-18 11:20:25 +00:00
Arnd Bergmann
1e9d4597be MIPS: Update ip27_defconfig for SCSI_DH change
am: 7a6a965f35

Change-Id: Ibbda685b2c909cba88f0ec18af89dc23547b719f
2017-03-18 11:20:14 +00:00
Arnd Bergmann
d4a1ce0790 MIPS: ip27: Disable qlge driver in defconfig
am: 8ed0fdcc0c

Change-Id: Ie42b6a5c3da2ae00167f31199f5c6c16de680bc0
2017-03-18 11:20:05 +00:00
Arnd Bergmann
5d2e961aa3 MIPS: Update defconfigs for NF_CT_PROTO_DCCP/UDPLITE change
am: adc48c710b

Change-Id: Ib9e9d4fb9330edb63756d893ca382a9e070a2edb
2017-03-18 11:19:53 +00:00
Arnd Bergmann
bf38bfd770 crypto: improve gcc optimization flags for serpent and wp512
am: e041ad0664

Change-Id: I8ef3c2a7ccc25e521ab9bd5cd21702c695107411
2017-03-18 11:19:44 +00:00
Johan Hovold
ee51e01a82 USB: serial: digi_acceleport: fix OOB-event processing
am: a8cb5c02a2

Change-Id: I542f42e517db3d00ff3a2b5735149af2bf989c55
2017-03-18 11:19:34 +00:00
Johan Hovold
64272b3c31 USB: serial: digi_acceleport: fix OOB data sanity check
am: 4d95645f3d

Change-Id: Iabb41fdc9064da31bd16e93ecc1ed5846fca8df5
2017-03-18 11:19:21 +00:00
Luis de Bethencourt
61fbad6a28 mvsas: fix misleading indentation
commit 7789cd39274c51bf475411fe22a8ee7255082809 upstream.

Fix a smatch warning:
drivers/scsi/mvsas/mv_sas.c:740 mvs_task_prep() warn: curly braces intended?

The code is correct, the indention is misleading. When the device is not
ready we want to return SAS_PHY_DOWN. But current indentation makes it
look like we only do so in the else branch of if (mvi_dev).

Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Krzysztof Kozlowski
72ca0ab306 serial: samsung: Continue to work if DMA request fails
commit f98c7bce570bdbe344b74ff5daa7dfeef3f22929 upstream.

If DMA is not available (even when configured in DeviceTree), the driver
will fail the startup procedure thus making serial console not
available.

For example this causes boot failure on QEMU ARMv7 (Exynos4210, SMDKC210):
    [    1.302575] OF: amba_device_add() failed (-19) for /amba/pdma@12680000
    ...
    [   11.435732] samsung-uart 13800000.serial: DMA request failed
    [   72.963893] samsung-uart 13800000.serial: DMA request failed
    [   73.143361] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000000

DMA is not necessary for serial to work, so continue with UART startup
after emitting a warning.

Fixes: 62c37eedb7 ("serial: samsung: add dma reqest/release functions")
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
72bb2b96b8 USB: serial: io_ti: fix information leak in completion handler
commit 654b404f2a222f918af9b0cd18ad469d0c941a8e upstream.

Add missing sanity check to the bulk-in completion handler to avoid an
integer underflow that can be triggered by a malicious device.

This avoids leaking 128 kB of memory content from after the URB transfer
buffer to user space.

Fixes: 8c209e6782 ("USB: make actual_length in struct urb field u32")
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
e71c7bad68 USB: serial: io_ti: fix NULL-deref in interrupt callback
commit 0b1d250afb8eb9d65afb568bac9b9f9253a82b49 upstream.

Fix a NULL-pointer dereference in the interrupt callback should a
malicious device send data containing a bad port number by adding the
missing sanity check.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
6498086195 USB: iowarrior: fix NULL-deref in write
commit de46e56653de7b3b54baa625bd582635008b8d05 upstream.

Make sure to verify that we have the required interrupt-out endpoint for
IOWarrior56 devices to avoid dereferencing a NULL-pointer in write
should a malicious device lack such an endpoint.

Fixes: 946b960d13 ("USB: add driver for iowarrior devices.")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
179295c38d USB: iowarrior: fix NULL-deref at probe
commit b7321e81fc369abe353cf094d4f0dc2fe11ab95f upstream.

Make sure to check for the required interrupt-in endpoint to avoid
dereferencing a NULL-pointer should a malicious device lack such an
endpoint.

Note that a fairly recent change purported to fix this issue, but added
an insufficient test on the number of endpoints only, a test which can
now be removed.

Fixes: 4ec0ef3a8212 ("USB: iowarrior: fix oops with malicious USB descriptors")
Fixes: 946b960d13 ("USB: add driver for iowarrior devices.")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
54f11a9662 USB: serial: omninet: fix reference leaks at open
commit 30572418b445d85fcfe6c8fe84c947d2606767d8 upstream.

This driver needlessly took another reference to the tty on open, a
reference which was then never released on close. This lead to not just
a leak of the tty, but also a driver reference leak that prevented the
driver from being unloaded after a port had once been opened.

Fixes: 4a90f09b20 ("tty: usb-serial krefs")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:58 +08:00
Johan Hovold
3cdc946387 USB: serial: safe_serial: fix information leak in completion handler
commit 8c76d7cd520ebffc1ea9ea0850d87a224a50c7f2 upstream.

Add missing sanity check to the bulk-in completion handler to avoid an
integer underflow that could be triggered by a malicious device.

This avoids leaking up to 56 bytes from after the URB transfer buffer to
user space.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Guenter Roeck
cf09c7d60c usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
commit dcc7620cad5ad1326a78f4031a7bf4f0e5b42984 upstream.

Upstream commit 98d74f9ceaef ("xhci: fix 10 second timeout on removal of
PCI hotpluggable xhci controllers") fixes a problem with hot pluggable PCI
xhci controllers which can result in excessive timeouts, to the point where
the system reports a deadlock.

The same problem is seen with hot pluggable xhci controllers using the
xhci-plat driver, such as the driver used for Type-C ports on rk3399.
Similar to hot-pluggable PCI controllers, the driver for this chip
removes the xhci controller from the system when the Type-C cable is
disconnected.

The solution for PCI devices works just as well for non-PCI devices
and avoids the problem.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Peter Chen
40c5634ffe usb: host: xhci-dbg: HCIVERSION should be a binary number
commit f95e60a7dbecd2de816bb3ad517b3d4fbc20b507 upstream.

According to xHCI spec, HCIVERSION containing a BCD encoding
of the xHCI specification revision number, 0100h corresponds
to xHCI version 1.0. Change "100" as "0x100".

Cc: Lu Baolu <baolu.lu@linux.intel.com>
Fixes: 04abb6de28 ("xhci: Read and parse new xhci 1.1 capability register")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Felipe Balbi
4a1a3bb70f usb: gadget: function: f_fs: pass companion descriptor along
commit 2bfa0719ac2a9b2f3c91345873d3cdebd0296ba9 upstream.

If we're dealing with SuperSpeed endpoints, we need
to make sure to pass along the companion descriptor
and initialize fields needed by the Gadget
API. Eventually, f_fs.c should be converted to use
config_ep_by_speed() like all other functions,
though.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Felipe Balbi
10af248565 usb: dwc3: gadget: make Set Endpoint Configuration macros safe
commit 7369090a9fb57c3fc705ce355d2e4523a5a24716 upstream.

Some gadget drivers are bad, bad boys. We notice
that ADB was passing bad Burst Size which caused top
bits of param0 to be overwritten which confused DWC3
when running this command.

In order to avoid future issues, we're going to make
sure values passed by macros are always safe for the
controller. Note that ADB still needs a fix to *not*
pass bad values.

Reported-by: Mohamed Abbas <mohamed.abbas@intel.com>
Sugested-by: Adam Andruszak <adam.andruszak@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Peter Chen
f47b97f2cd usb: gadget: dummy_hcd: clear usb_gadget region before registration
commit 5bbc852676ae08e818241cf66a3ffe4be44225c4 upstream.

When the user does device unbind and rebind test, the kernel will
show below dump due to usb_gadget memory region is dirty after unbind.
Clear usb_gadget region for every new probe.

root@imx6qdlsolo:/sys/bus/platform/drivers/dummy_udc# echo dummy_udc.0 > bind
[  102.523312] kobject (eddd78b0): tried to init an initialized object, something is seriously wrong.
[  102.532447] CPU: 0 PID: 734 Comm: sh Not tainted 4.10.0-rc7-00872-g1b2b8e9 #1298
[  102.539866] Hardware name: Freescale i.MX6 SoloX (Device Tree)
[  102.545717] Backtrace:
[  102.548225] [<c010d090>] (dump_backtrace) from [<c010d338>] (show_stack+0x18/0x1c)
[  102.555822]  r7:ede34000 r6:60010013 r5:00000000 r4:c0f29418
[  102.561512] [<c010d320>] (show_stack) from [<c040c2a4>] (dump_stack+0xb4/0xe8)
[  102.568764] [<c040c1f0>] (dump_stack) from [<c040e6d4>] (kobject_init+0x80/0x9c)
[  102.576187]  r10:0000001f r9:eddd7000 r8:eeaf8c10 r7:eddd78a8 r6:c177891c r5:c0f3b060
[  102.584036]  r4:eddd78b0 r3:00000000
[  102.587641] [<c040e654>] (kobject_init) from [<c05359a4>] (device_initialize+0x28/0xf8)
[  102.595665]  r5:eebc4800 r4:eddd78a8
[  102.599268] [<c053597c>] (device_initialize) from [<c05382ac>] (device_register+0x14/0x20)
[  102.607556]  r7:eddd78a8 r6:00000000 r5:eebc4800 r4:eddd78a8
[  102.613256] [<c0538298>] (device_register) from [<c0668ef4>] (usb_add_gadget_udc_release+0x8c/0x1ec)
[  102.622410]  r5:eebc4800 r4:eddd7860
[  102.626015] [<c0668e68>] (usb_add_gadget_udc_release) from [<c0669068>] (usb_add_gadget_udc+0x14/0x18)
[  102.635351]  r10:0000001f r9:eddd7000 r8:eddd788c r7:bf003770 r6:eddd77f8 r5:eddd7818
[  102.643198]  r4:eddd785c r3:eddd7b24
[  102.646834] [<c0669054>] (usb_add_gadget_udc) from [<bf003428>] (dummy_udc_probe+0x170/0x1c4 [dummy_hcd])
[  102.656458] [<bf0032b8>] (dummy_udc_probe [dummy_hcd]) from [<c053d114>] (platform_drv_probe+0x54/0xb8)
[  102.665881]  r10:00000008 r9:c1778960 r8:bf004128 r7:fffffdfb r6:bf004128 r5:eeaf8c10
[  102.673727]  r4:eeaf8c10
[  102.676293] [<c053d0c0>] (platform_drv_probe) from [<c053b160>] (driver_probe_device+0x264/0x474)
[  102.685186]  r7:00000000 r6:00000000 r5:c1778960 r4:eeaf8c10
[  102.690876] [<c053aefc>] (driver_probe_device) from [<c05397c4>] (bind_store+0xb8/0x14c)
[  102.698994]  r10:eeb3bb4c r9:ede34000 r8:0000000c r7:eeaf8c44 r6:bf004128 r5:c0f3b668
[  102.706840]  r4:eeaf8c10
[  102.709402] [<c053970c>] (bind_store) from [<c0538ca8>] (drv_attr_store+0x28/0x34)
[  102.716998]  r9:ede34000 r8:00000000 r7:ee3863c0 r6:ee3863c0 r5:c0538c80 r4:c053970c
[  102.724776] [<c0538c80>] (drv_attr_store) from [<c029c930>] (sysfs_kf_write+0x50/0x54)
[  102.732711]  r5:c0538c80 r4:0000000c
[  102.736313] [<c029c8e0>] (sysfs_kf_write) from [<c029be84>] (kernfs_fop_write+0x100/0x214)
[  102.744599]  r7:ee3863c0 r6:eeb3bb40 r5:00000000 r4:00000000
[  102.750287] [<c029bd84>] (kernfs_fop_write) from [<c0222dd8>] (__vfs_write+0x34/0x120)
[  102.758231]  r10:00000000 r9:ede34000 r8:c0108bc4 r7:0000000c r6:ede35f80 r5:c029bd84
[  102.766077]  r4:ee223780
[  102.768638] [<c0222da4>] (__vfs_write) from [<c0224678>] (vfs_write+0xa8/0x170)
[  102.775974]  r9:ede34000 r8:c0108bc4 r7:ede35f80 r6:01861cb0 r5:ee223780 r4:0000000c
[  102.783743] [<c02245d0>] (vfs_write) from [<c0225498>] (SyS_write+0x4c/0xa8)
[  102.790818]  r9:ede34000 r8:c0108bc4 r7:0000000c r6:01861cb0 r5:ee223780 r4:ee223780
[  102.798595] [<c022544c>] (SyS_write) from [<c0108a20>] (ret_fast_syscall+0x0/0x1c)
[  102.806188]  r7:00000004 r6:b6e83d58 r5:01861cb0 r4:0000000c

Fixes: 90fccb529d ("usb: gadget: Gadget directory cleanup - group UDC drivers")
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Tested-by: Xiaolong Ye <xiaolong.ye@intel.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Ravi Bangoria
2ca39d1300 powerpc: Emulation support for load/store instructions on LE
commit e148bd17f48bd17fca2f4f089ec879fa6e47e34c upstream.

emulate_step() uses a number of underlying kernel functions that were
initially not enabled for LE. This has been rectified since. So, fix
emulate_step() for LE for the corresponding instructions.

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Rik van Riel
074893495b tracing: Add #undef to fix compile error
commit bf7165cfa23695c51998231c4efa080fe1d3548d upstream.

There are several trace include files that define TRACE_INCLUDE_FILE.

Include several of them in the same .c file (as I currently have in
some code I am working on), and the compile will blow up with a
"warning: "TRACE_INCLUDE_FILE" redefined #define TRACE_INCLUDE_FILE syscalls"

Every other include file in include/trace/events/ avoids that issue
by having a #undef TRACE_INCLUDE_FILE before the #define; syscalls.h
should have one, too.

Link: http://lkml.kernel.org/r/20160928225554.13bd7ac6@annuminas.surriel.com

Fixes: b8007ef742 ("tracing: Separate raw syscall from syscall tracer")
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
James Hogan
1276510585 MIPS: Netlogic: Fix CP0_EBASE redefinition warnings
commit 32eb6e8bee147b45e5e59230630d59541ccbb6e5 upstream.

A couple of netlogic assembly files define CP0_EBASE to $15, the same as
CP0_PRID in mipsregs.h, and use it for accessing both CP0_PRId and
CP0_EBase registers. However commit 609cf6f229 ("MIPS: CPS: Early
debug using an ns16550-compatible UART") added a different definition of
CP0_EBASE to mipsregs.h, which included a register select of 1. This
causes harmless build warnings like the following:

  arch/mips/netlogic/common/reset.S:53:0: warning: "CP0_EBASE" redefined
  #define CP0_EBASE $15
  ^
  In file included from arch/mips/netlogic/common/reset.S:41:0:
  ./arch/mips/include/asm/mipsregs.h:63:0: note: this is the location of the previous definition
  #define CP0_EBASE $15, 1
  ^

Update the code to use the definitions from mipsregs.h for accessing
both registers.

Fixes: 609cf6f229 ("MIPS: CPS: Early debug using an ns16550-compatible UART")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13183/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Ralf Baechle
2e4aff2405 MIPS: DEC: Avoid la pseudo-instruction in delay slots
commit 3021773c7c3e75e20b693931a19362681e744ea9 upstream.

When expanding the la or dla pseudo-instruction in a delay slot the GNU
assembler will complain should the pseudo-instruction expand to multiple
actual instructions, since only the first of them will be in the delay
slot leading to the pseudo-instruction being only partially executed if
the branch is taken. Use of PTR_LA in the dec int-handler.S leads to
such warnings:

  arch/mips/dec/int-handler.S: Assembler messages:
  arch/mips/dec/int-handler.S:149: Warning: macro instruction expanded into multiple instructions in a branch delay slot
  arch/mips/dec/int-handler.S:198: Warning: macro instruction expanded into multiple instructions in a branch delay slot

Avoid this by open coding the PTR_LA macros.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Arnd Bergmann
5fad174344 mm: memcontrol: avoid unused function warning
commit 358c07fcc3b60ab08d77f1684de8bd81bcf49a1a upstream.

A bugfix in v4.8-rc2 introduced a harmless warning when
CONFIG_MEMCG_SWAP is disabled but CONFIG_MEMCG is enabled:

  mm/memcontrol.c:4085:27: error: 'mem_cgroup_id_get_online' defined but not used [-Werror=unused-function]
   static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg)

This moves the function inside of the #ifdef block that hides the
calling function, to avoid the warning.

Fixes: 1f47b61fb407 ("mm: memcontrol: fix swap counter leak on swapout from offline cgroup")
Link: http://lkml.kernel.org/r/20160824113733.2776701-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:57 +08:00
Arnd Bergmann
5e45d834f7 cpmac: remove hopeless #warning
commit d43e6fb4ac4abfe4ef7c102833ed02330ad701e0 upstream.

The #warning was present 10 years ago when the driver first got merged.
As the platform is rather obsolete by now, it seems very unlikely that
the warning will cause anyone to fix the code properly.

kernelci.org reports the warning for every build in the meantime, so
I think it's better to just turn it into a code comment to reduce
noise.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:56 +08:00
Arnd Bergmann
32883383f5 MIPS: ralink: Remove unused rt*_wdt_reset functions
commit 886f9c69fc68f56ddea34d3de51ac1fc2ac8dfbc upstream.

All pointers to these functions were removed, so now they produce
warnings:

arch/mips/ralink/rt305x.c:92:13: error: 'rt305x_wdt_reset' defined but not used [-Werror=unused-function]

This removes the functions. If we need them again, the patch can be
reverted later.

Fixes: f576fb6a07 ("MIPS: ralink: cleanup the soc specific pinmux data")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: John Crispin <john@phrozen.org>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15044/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-03-18 19:09:56 +08:00