aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-30staging/nvec: Use platform_get_irq()Thierry Reding1-3/+2
As opposed to platform_get_resource(), the platform_get_irq() function has special code to handle driver probe deferral when booting using DT and where an interrupt provider hasn't been registered yet. While this is unlikely to become an issue for nvec, platform_get_irq() is the recommended way to get at interrupts. Signed-off-by: Thierry Reding <[email protected]> Acked-by: Marc Dietrich <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging/nvec: Do not pass resource to mfd_add_devices()Thierry Reding1-1/+1
The mfd_add_devices() function takes a struct resource * as fifth argument, but the nvec driver passes in a void __iomem *. The driver gets away with it because none of the subdevices ever directly access the registers. Since subdevices never need to access the registers we can simply pass NULL instead. Signed-off-by: Thierry Reding <[email protected]> Acked-by: Marc Dietrich <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: android: timed_output.c: use kstrtoint() instead of sscanf()Murilo Opsfelder Araujo1-1/+3
This patch makes checkpatch.pl happy by fixing the following warning: WARNING: Prefer kstrto<type> to single variable sscanf Signed-off-by: Murilo Opsfelder Araujo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds14-36/+69
Merge fixes from Andrew Morton: "10 fixes" * emailed patches from Andrew Morton <[email protected]>: Josh has moved kexec: export free_huge_page to VMCOREINFO mm: fix filemap.c pagecache_get_page() kernel-doc warnings mm: debugfs: move rounddown_pow_of_two() out from do_fault path memcg: oom_notify use-after-free fix hwpoison: call action_result() in failure path of hwpoison_user_mappings() hwpoison: fix hugetlbfs/thp precheck in hwpoison_user_mappings() rapidio/tsi721_dma: fix failure to obtain transaction descriptor mm, thp: do not allow thp faults to avoid cpuset restrictions mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()
2014-07-30Josh has movedJosh Triplett4-6/+12
My IBM email addresses haven't worked for years; also map some old-but-functional forwarding addresses to my canonical address. Update my GPG key fingerprint; I moved to 4096R a long time ago. Update description. Signed-off-by: Josh Triplett <[email protected]> Cc: "Paul E. McKenney" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30kexec: export free_huge_page to VMCOREINFOAtsushi Kumagai3-1/+4
PG_head_mask was added into VMCOREINFO to filter huge pages in b3acc56bfe1 ("kexec: save PG_head_mask in VMCOREINFO"), but makedumpfile still need another symbol to filter *hugetlbfs* pages. If a user hope to filter user pages, makedumpfile tries to exclude them by checking the condition whether the page is anonymous, but hugetlbfs pages aren't anonymous while they also be user pages. We know it's possible to detect them in the same way as PageHuge(), so we need the start address of free_huge_page(): int PageHuge(struct page *page) { if (!PageCompound(page)) return 0; page = compound_head(page); return get_compound_page_dtor(page) == free_huge_page; } For that reason, this patch changes free_huge_page() into public to export it to VMCOREINFO. Signed-off-by: Atsushi Kumagai <[email protected]> Acked-by: Baoquan He <[email protected]> Cc: Vivek Goyal <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30mm: fix filemap.c pagecache_get_page() kernel-doc warningsRandy Dunlap1-5/+8
Fix kernel-doc warnings in mm/filemap.c: pagecache_get_page(): Warning(..//mm/filemap.c:1054): No description found for parameter 'cache_gfp_mask' Warning(..//mm/filemap.c:1054): No description found for parameter 'radix_gfp_mask' Warning(..//mm/filemap.c:1054): Excess function parameter 'gfp_mask' description in 'pagecache_get_page' Fixes: 2457aec63745 ("mm: non-atomically mark page accessed during page cache allocation where possible") [[email protected]: change everything] [[email protected]: coding-style fixes] Signed-off-by: Randy Dunlap <[email protected]> Cc: Mel Gorman <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30mm: debugfs: move rounddown_pow_of_two() out from do_fault pathAndrey Ryabinin1-9/+12
do_fault_around() expects fault_around_bytes rounded down to nearest page order. Instead of calling rounddown_pow_of_two every time in fault_around_pages()/fault_around_mask() we could do round down when user changes fault_around_bytes via debugfs interface. This also fixes bug when user set fault_around_bytes to 0. Result of rounddown_pow_of_two(0) is not defined, therefore fault_around_bytes == 0 doesn't work without this patch. Let's set fault_around_bytes to PAGE_SIZE if user sets to something less than PAGE_SIZE [[email protected]: tweak code layout] Fixes: a9b0f861("mm: nominate faultaround area in bytes rather than page order") Signed-off-by: Andrey Ryabinin <[email protected]> Reported-by: Sasha Levin <[email protected]> Acked-by: Kirill A. Shutemov <[email protected]> Cc: <[email protected]> [3.15.x] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30memcg: oom_notify use-after-free fixMichal Hocko1-0/+4
Paul Furtado has reported the following GPF: general protection fault: 0000 [#1] SMP Modules linked in: ipv6 dm_mod xen_netfront coretemp hwmon x86_pkg_temp_thermal crc32_pclmul crc32c_intel ghash_clmulni_intel aesni_intel ablk_helper cryptd lrw gf128mul glue_helper aes_x86_64 microcode pcspkr ext4 jbd2 mbcache raid0 xen_blkfront CPU: 3 PID: 3062 Comm: java Not tainted 3.16.0-rc5 #1 task: ffff8801cfe8f170 ti: ffff8801d2ec4000 task.ti: ffff8801d2ec4000 RIP: e030:mem_cgroup_oom_synchronize+0x140/0x240 RSP: e02b:ffff8801d2ec7d48 EFLAGS: 00010283 RAX: 0000000000000001 RBX: ffff88009d633800 RCX: 000000000000000e RDX: fffffffffffffffe RSI: ffff88009d630200 RDI: ffff88009d630200 RBP: ffff8801d2ec7da8 R08: 0000000000000012 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: ffff88009d633800 R13: ffff8801d2ec7d48 R14: dead000000100100 R15: ffff88009d633a30 FS: 00007f1748bb4700(0000) GS:ffff8801def80000(0000) knlGS:0000000000000000 CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00007f4110300308 CR3: 00000000c05f7000 CR4: 0000000000002660 Call Trace: pagefault_out_of_memory+0x18/0x90 mm_fault_error+0xa9/0x1a0 __do_page_fault+0x478/0x4c0 do_page_fault+0x2c/0x40 page_fault+0x28/0x30 Code: 44 00 00 48 89 df e8 40 ca ff ff 48 85 c0 49 89 c4 74 35 4c 8b b0 30 02 00 00 4c 8d b8 30 02 00 00 4d 39 fe 74 1b 0f 1f 44 00 00 <49> 8b 7e 10 be 01 00 00 00 e8 42 d2 04 00 4d 8b 36 4d 39 fe 75 RIP mem_cgroup_oom_synchronize+0x140/0x240 Commit fb2a6fc56be6 ("mm: memcg: rework and document OOM waiting and wakeup") has moved mem_cgroup_oom_notify outside of memcg_oom_lock assuming it is protected by the hierarchical OOM-lock. Although this is true for the notification part the protection doesn't cover unregistration of event which can happen in parallel now so mem_cgroup_oom_notify can see already unlinked and/or freed mem_cgroup_eventfd_list. Fix this by using memcg_oom_lock also in mem_cgroup_oom_notify. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=80881 Fixes: fb2a6fc56be6 (mm: memcg: rework and document OOM waiting and wakeup) Signed-off-by: Michal Hocko <[email protected]> Reported-by: Paul Furtado <[email protected]> Tested-by: Paul Furtado <[email protected]> Acked-by: Johannes Weiner <[email protected]> Cc: <[email protected]> [3.12+] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30hwpoison: call action_result() in failure path of hwpoison_user_mappings()Naoya Horiguchi1-2/+4
hwpoison_user_mappings() could fail for various reasons, so printk()s to print out the reasons should be done in each failure check inside hwpoison_user_mappings(). And currently we don't call action_result() when hwpoison_user_mappings() fails, which is not consistent with other exit points of memory error handler. So this patch fixes these messaging problems. Signed-off-by: Naoya Horiguchi <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Chen Yucong <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30hwpoison: fix hugetlbfs/thp precheck in hwpoison_user_mappings()Naoya Horiguchi1-1/+7
A recent fix from Chen Yucong, commit 0bc1f8b0682c ("hwpoison: fix the handling path of the victimized page frame that belong to non-LRU") rejects going into unmapping operation for hugetlbfs/thp pages, which results in failing error containing on such pages. This patch fixes it. With this patch, hwpoison functional tests in mce-test testsuite pass. Signed-off-by: Naoya Horiguchi <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Chen Yucong <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30rapidio/tsi721_dma: fix failure to obtain transaction descriptorAlexandre Bounine1-1/+7
This is a bug fix for the situation when function tsi721_desc_get() fails to obtain a free transaction descriptor. The bug usually results in a memory access crash dump when data transfer scatter-gather list has more entries than size of hardware buffer descriptors ring. This fix ensures that error is properly returned to a caller instead of an invalid entry. This patch is applicable to kernel versions starting from v3.5. Signed-off-by: Alexandre Bounine <[email protected]> Cc: Matt Porter <[email protected]> Cc: Andre van Herk <[email protected]> Cc: Stef van Os <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Dan Williams <[email protected]> Cc: <[email protected]> [3.5+] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30mm, thp: do not allow thp faults to avoid cpuset restrictionsDavid Rientjes1-8/+8
The page allocator relies on __GFP_WAIT to determine if ALLOC_CPUSET should be set in allocflags. ALLOC_CPUSET controls if a page allocation should be restricted only to the set of allowed cpuset mems. Transparent hugepages clears __GFP_WAIT when defrag is disabled to prevent the fault path from using memory compaction or direct reclaim. Thus, it is unfairly able to allocate outside of its cpuset mems restriction as a side-effect. This patch ensures that ALLOC_CPUSET is only cleared when the gfp mask is truly GFP_ATOMIC by verifying it is also not a thp allocation. Signed-off-by: David Rientjes <[email protected]> Reported-by: Alex Thorlton <[email protected]> Tested-by: Alex Thorlton <[email protected]> Cc: Bob Liu <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Hedi Berriche <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Srivatsa S. Bhat <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()Maxim Patlasov1-3/+3
Under memory pressure, it is possible for dirty_thresh, calculated by global_dirty_limits() in balance_dirty_pages(), to equal zero. Then, if strictlimit is true, bdi_dirty_limits() tries to resolve the proportion: bdi_bg_thresh : bdi_thresh = background_thresh : dirty_thresh by dividing by zero. Signed-off-by: Maxim Patlasov <[email protected]> Acked-by: Rik van Riel <[email protected]> Cc: Michal Hocko <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Cc: Wu Fengguang <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function ↵navin patidar1-9/+1
_rtw_reordering_ctrl_timeout_handler() Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove unused function rtw_os_read_port()navin patidar2-14/+0
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function _addba_timer_hdl()navin patidar3-9/+4
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function _link_timer_hdl()navin patidar3-9/+4
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function _survey_timer_hdl()navin patidar3-10/+4
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function _dynamic_check_timer_handlder()navin patidar3-17/+10
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function _rtw_scan_timeout_handler()navin patidar3-11/+4
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove wrapper function rtw_join_timeout_handler()navin patidar3-12/+4
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: rtl8188eu: Remove unused member MultiFunc from struct hal_data_8188enavin patidar2-2/+0
Signed-off-by: navin patidar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: dgnc: removes unused if defined codeSeunghun Lee3-65/+0
DGNC_TRACER and TRC_TO_KMEM are never defined. This patch removes if defined DGNC_TRACER and TRC_TO_KMEM code. 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-30Staging: bcm: Qos.c: checkpatch.pl fix: Indentation of case-statements fixedMatthias Beyer1-45/+41
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: checkpatch.pl fix: Removed parentheses from return ↵Matthias Beyer1-1/+1
statement Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: checkpatch.pl fix: Transformed C99-style commentsMatthias Beyer1-2/+2
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: checkpatch.pl fix: Added blank lines after declarationsMatthias Beyer1-0/+2
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in EThCSGetPktInfo()Matthias Beyer1-11/+40
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in EThCSClassifyPkt()Matthias Beyer1-12/+35
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in EthCSMatchVLANRules()Matthias Beyer1-11/+42
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in EthCSMatchEThTypeSAP()Matthias Beyer1-7/+33
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in ↵Matthias Beyer1-5/+20
EthCSMatchDestMACAdress() Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in ↵Matthias Beyer1-5/+19
EthCSMatchSrcMACAdress() Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in ClassifyPacket()Matthias Beyer1-45/+148
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in flush_all_queues()Matthias Beyer1-4/+16
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in PruneQueue()Matthias Beyer1-13/+37
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in IpVersion4()Matthias Beyer1-21/+75
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchDestPort()Matthias Beyer1-4/+19
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchSrcPort()Matthias Beyer1-3/+11
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchProtocol()Matthias Beyer1-4/+17
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchTos()Matthias Beyer1-3/+11
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchDestIpAddress()Matthias Beyer1-4/+18
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Line length / Whitespace cleanup in MatchSrcIpAddress()Matthias Beyer1-3/+10
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced if-else return with ternary operatorMatthias Beyer1-4/+1
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced do-while(0) breaks with continueMatthias Beyer1-49/+46
This patch replaces the do-while(0); loop which is used for breaking if a check fails by using the `continue` statement. This saves one indentation level. Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced member accessing by variable in flush_all_queues()Matthias Beyer1-12/+14
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced member accessing with variable in PruneQueue()Matthias Beyer1-15/+16
Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced do-while(0) jumps with goto and label, removes ↵Matthias Beyer1-58/+57
one level of indentation Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30Staging: bcm: Qos.c: Replaced member accessing with variable in ↵Matthias Beyer1-3/+4
MatchDestIpAddress() Signed-off-by: Matthias Beyer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.