summaryrefslogtreecommitdiff
path: root/tools/perf/util/alias.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-02-03 12:54:59 +0300
committerDavid S. Miller <davem@davemloft.net>2017-02-06 12:01:06 -0500
commit73cfb2a2e49e166c569360ee60fe023b3efe3cf6 (patch)
tree0894c9009e7d173a89aac7af23b24fcfc4074daf /tools/perf/util/alias.c
parentf820c0ac6cc84d4f9cb22c77d99ea510bd5c382a (diff)
net/mlx4_en: fix a condition
There is a "||" vs "|" typo here so we test 0x1 instead of 0x6. Fixes: 1f8176f7352a ("net/mlx4_en: Check the enabling pptx/pprx flags in SET_PORT wrapper flow") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/alias.c')
0 files changed, 0 insertions, 0 deletions
6268d&id2=880a38547ff08715ce4f1daf9a4bb30c87676e68'>diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fix from Eric Biederman: "This has a single brown bag fix. The possible deadlock with dec_pid_namespaces that I had thought was fixed earlier turned out only to have been moved. So instead of being cleaver this change takes ucounts_lock with irqs disabled. So dec_ucount can be used from any context without fear of deadlock. The items accounted for dec_ucount and inc_ucount are all comparatively heavy weight objects so I don't exepct this will have any measurable performance impact" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: userns: Make ucounts lock irq-safe
Diffstat (limited to 'drivers/usb/host/bcma-hcd.c')