summaryrefslogtreecommitdiff
path: root/sock.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-06-09 12:43:15 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-06-09 12:43:15 +0200
commitbc5b7c5999b49353b720fa8ceb3c0542521cab5d (patch)
tree4001450ca8e84efd25b9a8ea32afcd8cdb6f24c8 /sock.c
parent018c335234541592924885a0229e2afd716608ef (diff)
ifpps: Rename cpu number parameter to stats_top()
This is not the top number of CPUs but the total number. Rename the variable to not confuse this. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'sock.c')
0 files changed, 0 insertions, 0 deletions
t-next.git/commit/arch/arm/boot/dts?h=nds-private-remove&id=1db175428ee374489448361213e9c3b749d14900'>1db175428ee374489448361213e9c3b749d14900 (diff)
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull DAX updates from Dan Williams: "The completion of Jan's DAX work for 4.10. As I mentioned in the libnvdimm-for-4.10 pull request, these are some final fixes for the DAX dirty-cacheline-tracking invalidation work that was merged through the -mm, ext4, and xfs trees in -rc1. These patches were prepared prior to the merge window, but we waited for 4.10-rc1 to have a stable merge base after all the prerequisites were merged. Quoting Jan on the overall changes in these patches: "So I'd like all these 6 patches to go for rc2. The first three patches fix invalidation of exceptional DAX entries (a bug which is there for a long time) - without these patches data loss can occur on power failure even though user called fsync(2). The other three patches change locking of DAX faults so that ->iomap_begin() is called in a more relaxed locking context and we are safe to start a transaction there for ext4" These have received a build success notification from the kbuild robot, and pass the latest libnvdimm unit tests. There have not been any -next releases since -rc1, so they have not appeared there" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: ext4: Simplify DAX fault path dax: Call ->iomap_begin without entry lock during dax fault dax: Finish fault completely when loading holes dax: Avoid page invalidation races and unnecessary radix tree traversals mm: Invalidate DAX radix tree entries only if appropriate ext2: Return BH_New buffers for zeroed blocks
Diffstat (limited to 'arch/arm/boot/dts')