aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-28Merge branch 'merge' of ↵Linus Torvalds3-7/+9
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Ben Herrenschmidt: "Here are 3 more small powerpc fixes that should still go into .16. One is a recent regression (MMCR2 business), the other is a trivial endian fix without which FW updates won't work on LE in IBM machines, and the 3rd one turns a BUG_ON into a WARN_ON which is definitely a LOT more friendly especially when the whole thing is about retrieving error logs ..." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix endianness of flash_block_list in rtas_flash powerpc/powernv: Change BUG_ON to WARN_ON in elog code powerpc/perf: Fix MMCR2 handling for EBB
2014-07-28kthread_work: remove the unused wait_queue_headLai Jiangshan1-11/+2
The wait_queue_head_t kthread_work->done is unused since flush_kthread_work() has been re-implemented. Let's remove it including the initialization code. This makes DEFINE_KTHREAD_WORK_ONSTACK() unnecessary, removed. tj: Updated description. Removed DEFINE_KTHREAD_WORK_ONSTACK(). Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2014-07-28kthread_work: wake up worker only when the worker is idleLai Jiangshan1-1/+1
If the worker is already executing a work item when another is queued, we can safely skip wakeup without worrying about stalling queue thus avoiding waking up the busy worker spuriously. Spurious wakeups should be fine but still isn't nice and avoiding it is trivial here. tj: Updated description. Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2014-07-28ext4: check inline directory before convertingDarrick J. Wong3-0/+39
Before converting an inline directory to a regular directory, check the directory entries to make sure they're not obviously broken. This helps us to avoid a BUG_ON if one of the dirents is trashed. Signed-off-by: Darrick J. Wong <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Andreas Dilger <[email protected]>
2014-07-28Revert "perf tools: Fix jump label always changing during tracing"Jiri Olsa1-7/+2
This reverts commit deaff8b659cf4d34181c087b8cdf74f1eb17b02b. This commit makes CLOEXEC feature undetected for normal users, because per-cpu events are priviledged. Reported-by: Peter Zijlstra <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Olsa <[email protected]>
2014-07-28crypto: arm-aes - fix encryption of unaligned dataMikulas Patocka1-5/+5
Fix the same alignment bug as in arm64 - we need to pass residue unprocessed bytes as the last argument to blkcipher_walk_done. Signed-off-by: Mikulas Patocka <[email protected]> Cc: [email protected] # 3.13+ Acked-by: Ard Biesheuvel <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
2014-07-28crypto: arm64-aes - fix encryption of unaligned dataMikulas Patocka1-6/+6
cryptsetup fails on arm64 when using kernel encryption via AF_ALG socket. See https://bugzilla.redhat.com/show_bug.cgi?id=1122937 The bug is caused by incorrect handling of unaligned data in arch/arm64/crypto/aes-glue.c. Cryptsetup creates a buffer that is aligned on 8 bytes, but not on 16 bytes. It opens AF_ALG socket and uses the socket to encrypt data in the buffer. The arm64 crypto accelerator causes data corruption or crashes in the scatterwalk_pagedone. This patch fixes the bug by passing the residue bytes that were not processed as the last parameter to blkcipher_walk_done. Signed-off-by: Mikulas Patocka <[email protected]> Acked-by: Ard Biesheuvel <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
2014-07-28perf tools: Fix perf usage string leftoverJiri Olsa1-1/+1
Fixing perf usage string leftover pointed out by Namhyung. Reported-by: Namhyung Kim <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Jiri Olsa <[email protected]>
2014-07-28Merge tag 'perf-core-for-mingo' of ↵Ingo Molnar29-115/+470
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: Infrastructure changes: o More prep work to support Intel PT: (Adrian Hunter) - Polishing 'script' BTS output - 'inject' can specify --kallsym - VDSO is per machine, not a global var - Expose data addr lookup functions previously private to 'script' - Large mmap fixes in events processing o Fix build on gcc 4.4.7 (Arnaldo Carvalho de Melo) o Event ordering fixes (Jiri Olsa) o Include standard stringify macros in power pc code (Sukadev Bhattiprolu) Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28sched/fair: Fix 'make xmldocs' warning caused by missing descriptionMasanari Iida1-0/+1
This patch fix following warning caused by missing description "overload" in kernel/sched/fair.c Warning(.//kernel/sched/fair.c:5906): No description found for parameter 'overload' Signed-off-by: Masanari Iida <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28sched: Use macro for magic number of -1 for setparamSteven Rostedt1-7/+10
Instead of passing around a magic number -1 for the sched_setparam() policy, use a more descriptive macro name like SETPARAM_POLICY. [ based on top of Daniel's sched_setparam() fix ] Signed-off-by: Steven Rostedt <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: Daniel Bristot de Oliveira<[email protected]> Cc: Andrew Morton <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28sched: Robustify topology setupPeter Zijlstra1-0/+14
We hard assume that higher topology levels are supersets of lower levels. Detect, warn and try to fixup when we encounter this violated. Tested-by: Dietmar Eggemann <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: Josh Boyer <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Bruno Wolff III <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28Merge branch 'sched/urgent' into sched/core, to merge fixes before applying ↵Ingo Molnar390-2033/+3580
new changes Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28perf: Check permission only for parent tracepoint eventJiri Olsa1-0/+12
There's no need to check cloned event's permission once the parent was already checked. Also the code is checking 'current' process permissions, which is not owner process for cloned events, thus could end up with wrong permission check result. Reported-by: Alexander Yarygin <[email protected]> Tested-by: Alexander Yarygin <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Steven Rostedt <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28Merge tag 'v3.16-rc7' into perf/core, to merge in the latest fixes before ↵Ingo Molnar1000-5791/+9707
applying new changes Signed-off-by: Ingo Molnar <[email protected]>
2014-07-28sched: Fix sched_setparam() policy == -1 logicDaniel Bristot de Oliveira1-2/+3
The scheduler uses policy == -1 to preserve the current policy state to implement sched_setparam(). But, as (int) -1 is equals to 0xffffffff, it's matching the if (policy & SCHED_RESET_ON_FORK) on _sched_setscheduler(). This match changes the policy value to an invalid value, breaking the sched_setparam() syscall. This patch checks policy == -1 before check the SCHED_RESET_ON_FORK flag. The following program shows the bug: int main(void) { struct sched_param param = { .sched_priority = 5, }; sched_setscheduler(0, SCHED_FIFO, &param); param.sched_priority = 1; sched_setparam(0, &param); param.sched_priority = 0; sched_getparam(0, &param); if (param.sched_priority != 1) printf("failed priority setting (found %d instead of 1)\n", param.sched_priority); else printf("priority setting fine\n"); } Signed-off-by: Daniel Bristot de Oliveira <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Reviewed-by: Steven Rostedt <[email protected]> Cc: <[email protected]> # 3.14+ Cc: Linus Torvalds <[email protected]> Cc: [email protected] Fixes: 7479f3c9cf67 "sched: Move SCHED_RESET_ON_FORK into attr::sched_flags" Link: http://lkml.kernel.org/r/9ebe0566a08dbbb3999759d3f20d6004bb2dbcfa.1406079891.git.bristot@redhat.com Signed-off-by: Ingo Molnar <[email protected]>
2014-07-27Merge tag 'extcon-next-for-3.17' of ↵Greg Kroah-Hartman20-494/+1335
git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next Chanwoo writes: Update extcon for v3.17 This patchset add new extcon provider driver and fix minor issue of extcon driver. Detailed description for patchset: 1. Add new Silicon-Mitus SM5502 MUIC (Micro-USB Interface Controller) device - extcon-sm5502 driver is capable of identifying the type of the external power source and attached accessory. And external power sources, such as Dedicated charger or a standard USB port, are able to charge the battery in the smart phone via the connector. 2. Fix minor issue of extcon driver - extcon-arizona driver - extcon-palmas driver - Remove unnecessary OOM messages for all extcon device drivers 3. Fix minor issue of extcon core - Re-order the sequence of extcon device driver in Kconfig/Makefile alphabitically - Set parent device of extcon device automatically using devm_extcon_dev_allocate() 4. Fix MAX77693 driver - This patchset has dependency on MFD/Regulator/Extcon. So, Lee Jones (MFD Maintainer) created Immutable branch between MFD and Extcon due for v3.17 merge-window and then I merged this patchset from MFD git repo[1] to Extcon git repo. [1] git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd (branch: ib-mfd-extcon-regulator)
2014-07-27Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"Greg Kroah-Hartman1-2/+1
This reverts commit 9da433c0a0b5f71ac92dc9dca778295649675f08. Vineet writes: Could you please revert this single patch from tty-next for 3.17 as the needed core changes are not yet finalized. Cc: Vineet Gupta <[email protected]> Cc: Rob Herring <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27ext4: fix incorrect locking in move_extent_per_pageDmitry Monakhov1-1/+2
If we have to copy data we must drop i_data_sem because of get_blocks() will be called inside mext_page_mkuptodate(), but later we must reacquire it again because we are about to change extent's tree Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Jan Kara <[email protected]>
2014-07-27ext4: use correct depth valueDmitry Monakhov1-1/+1
Inode's depth can be changed from here: ext4_ext_try_to_merge() ->ext4_ext_try_to_merge_up() We must use correct value. Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Jan Kara <[email protected]>
2014-07-27ext4: add i_data_sem sanity checkDmitry Monakhov2-0/+9
Each caller of ext4_ext_dirty must hold i_data_sem, The only exception is migration code, let's make it convenient. Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Jan Kara <[email protected]>
2014-07-27ext4: fix wrong size computation in ext4_mb_normalize_request()Xiaoguang Wang1-2/+3
As the member fe_len defined in struct ext4_free_extent is expressed as number of clusters, the variable "size" computation is wrong, we need to first translate fe_len to block number, then to bytes. Signed-off-by: Xiaoguang Wang <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Lukas Czerner <[email protected]>
2014-07-28powerpc: Fix endianness of flash_block_list in rtas_flashThomas Falcon1-2/+4
The function rtas_flash_firmware passes the address of a data structure, flash_block_list, when making the update-flash-64-and-reboot rtas call. While the endianness of the address is handled correctly, the endianness of the data is not. This patch ensures that the data in flash_block_list is big endian when passed to rtas on little endian hosts. Signed-off-by: Thomas Falcon <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2014-07-28powerpc/powernv: Change BUG_ON to WARN_ON in elog codeVasant Hegde1-2/+2
We can continue to read the error log (up to MAX size) even if we get the elog size more than MAX size. Hence change BUG_ON to WARN_ON. Also updated error message. Reported-by: Gopesh Kumar Chaudhary <[email protected]> Signed-off-by: Vasant Hegde <[email protected]> Signed-off-by: Ananth N Mavinakayanahalli <[email protected]> Acked-by: Deepthi Dharwar <[email protected]> Acked-by: Stewart Smith <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2014-07-27staging: sep: remove driverKristina Martšenko13-9880/+0
Looks like no one's working on the driver anymore, so remove it for now. If someone wants to work on moving it out of staging, this commit can be reverted. Signed-off-by: Kristina Martšenko <[email protected]> Cc: Alan Cox <[email protected]> Cc: Mark A. Allyn <[email protected]> Cc: Jayant Mangalampalli <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Linux 3.16-rc7Linus Torvalds1-1/+1
2014-07-27serial: sc16is7xx: Correct initialization of s->clkJon Ringle1-5/+4
The s->clk never gets setup in sc16is7xx_probe() and instead was using a local clk variable, but then testing the uninitialized s->clk during teardown Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Jon Ringle <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: ft1000: remove procfs entriesNicolas Thery9-474/+2
This patch started as a fix to some checkpatch complaints in ft1000 procfs code but Greg suggested to remove the procfs entries altogether: http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-July/055594.html Signed-off-by: Nicolas Thery <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: lustre: lov: Fix sparse warning using plain integer as NULL pointerMarc Fite1-3/+3
This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0s with NULL. drivers/staging/lustre/lustre/lov/lov_obd.c:902:48: warning: Using plain integer as NULL pointer drivers/staging/lustre/lustre/lov/lov_obd.c:946:54: warning: Using plain integer as NULL pointer drivers/staging/lustre/lustre/lov/lov_obd.c:2819:46: warning: Using plain integer as NULL pointer Signed-off-by: Marc Fite <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: rtl8821ae: fixed a space coding style issueSylvain Calador1-1/+1
Fixed a coding style issue. Signed-off-by: Sylvain Calador <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: usbip: stub_main.c: Cleaning up missing null-terminate in ↵Rickard Strandqvist1-7/+3
conjunction with strncpy Replacing strncpy with strlcpy to avoid strings that lacks null terminate. Signed-off-by: Rickard Strandqvist <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: unisys: include: uisutils.h: Cleaning up missing null-terminate in ↵Rickard Strandqvist1-4/+4
conjunction with strncpy Replacing strncpy with strlcpy to avoid strings that lacks null terminate. Signed-off-by: Rickard Strandqvist <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: dgnc: remove commented codeSeunghun Lee5-156/+1
This patch removes commented code in dgnc driver. CC: Lidza Louina <[email protected]> CC: Mark Hounschell <[email protected]> Signed-off-by: Seunghun Lee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from power.hIgor Bezukh1-9/+0
Removed redundant comments from power.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from michael.hIgor Bezukh1-6/+0
Removed redundant comments from michael.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from mib.hIgor Bezukh1-29/+16
Removed redundant comments from mib.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from iowpa.hIgor Bezukh1-10/+0
Removed redundant comments from iowpa.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from ioctl.hIgor Bezukh1-8/+0
Removed redundant comments from ioctl.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from iocmd.hIgor Bezukh1-22/+1
Removed redundant comments from iocmd.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from IEEE11h.hIgor Bezukh1-10/+0
Removed redundant comments from IEEE11h.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from hostap.hIgor Bezukh1-8/+0
Removed redundant comments from hostap.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from dpc.hIgor Bezukh1-8/+0
Removed redundant comments from dpc.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from device_cfg.hIgor Bezukh1-3/+0
Removed redundant comments from device_cfg.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from desc.hIgor Bezukh1-98/+87
Removed redundant comments from desc.h header file. Signed-off-by: Igor Bezukh <[email protected]> C99 style comments will be fixed in further patches. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from channel.hIgor Bezukh1-4/+0
Removed redundant comments from channel.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from country.hIgor Bezukh1-1/+0
Removed redundant comments from country.h header file Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from datarate.hIgor Bezukh1-19/+9
Removed redundant comments from datarate.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: remove redundant comments from card.hIgor Bezukh1-9/+1
Removed redundant comments from card.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: bcm: DDRInit.c: fixed coding style: lines over 80 charSudip Mukherjee1-20/+39
Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: set board_name before common attachIan Abbott1-2/+1
For PCI boards, the `auto_attach` handler, `pc236_auto_attach()`, initializes `dev->board_ptr` to point to a `struct pc236_board`, but leaves `dev->board_name` unchanged. The Comedi core will have initialized `dev->board_name` to the `driver_name` string member of `amplc_pc236_driver`. For consistency with ISA boards manually configured by the `COMEDI_DEVCONFIG` ioctl via the legacy `attach` handler, `pc236_attach()`, set `dev->board_name` to the `name` member of the `struct pc236_board` pointed to by `dev->board_ptr`. Both `pc236_attach()` and `pc236_auto_attach()` call `pc236_common_attach()`, which also sets `dev->board_name` to the `name` member of the `struct pc236_board`. Since this assignment no longer changes anything, remove it. A nice side-effect of this change is that the same owner name string is used for requesting I/O regions (before the call the `pc236_common_attach()`) as is used for requesting the IRQ handler (during the call to `pc236_common_attach()`). It was already the same for (manually configured) ISA boards, but is now the same for (automatically configured) PCI boards. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.