Merge yet more updates from Andrew Morton: - the rest of MM - various misc fixes and tweaks * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits) mm: Change return type int to vm_fault_t for fault handlers lib/fonts: convert comments to utf-8 s390: ebcdic: convert comments to UTF-8 treewide: convert ISO_8859-1 text comments to utf-8 drivers/gpu/drm/gma500/: change return type to vm_fault_t docs/core-api: mm-api: add section about GFP flags docs/mm: make GFP flags descriptions usable as kernel-doc docs/core-api: split memory management API to a separate file docs/core-api: move *{str,mem}dup* to "String Manipulation" docs/core-api: kill trailing whitespace in kernel-api.rst mm/util: add kernel-doc for kvfree mm/util: make strndup_user description a kernel-doc comment fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds treewide: correct "differenciate" and "instanciate" typos fs/afs: use new return type vm_fault_t drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t mm: soft-offline: close the race against page allocation mm: fix race on soft-offlining free huge pages namei: allow restricted O_CREAT of FIFOs and regular files hfs: prevent crash on exit from failed search ...
Showing the changes to kernel (3 of 63 files). Show all
Unified · Split
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de> | 4 | * Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de> |
| 5 | * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar | 5 | * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar |
| 6 | * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra | 6 | * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra |
| 7 | * Copyright � 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com> | 7 | * Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com> |
| 8 | * | 8 | * |
| 9 | * For licensing details see kernel-base/COPYING | 9 | * For licensing details see kernel-base/COPYING |
| 10 | */ | 10 | */ |
| @@ -43,7 +43,7 @@ static unsigned long order_at(struct resource *res, unsigned long pgoff) · 42 unmodified lines | |||
| 43 | pgoff += 1UL << order, order = order_at((res), pgoff)) | 43 | pgoff += 1UL << order, order = order_at((res), pgoff)) |
| 44 | 44 | ||
| 45 | #if IS_ENABLED(CONFIG_DEVICE_PRIVATE) | 45 | #if IS_ENABLED(CONFIG_DEVICE_PRIVATE) |
| 46 | int device_private_entry_fault(struct vm_area_struct *vma, | 46 | vm_fault_t device_private_entry_fault(struct vm_area_struct *vma, |
| 47 | unsigned long addr, | 47 | unsigned long addr, |
| 48 | swp_entry_t entry, | 48 | swp_entry_t entry, |
| 49 | unsigned int flags, | 49 | unsigned int flags, |
| @@ -1807,6 +1807,24 @@ static struct ctl_table fs_table[] = { · 1806 unmodified lines | |||
| 1807 | .extra1 = &zero, | 1807 | .extra1 = &zero, |
| 1808 | .extra2 = &one, | 1808 | .extra2 = &one, |
| 1809 | }, | 1809 | }, |
| 1810 | { | ||
| 1811 | .procname = "protected_fifos", | ||
| 1812 | .data = &sysctl_protected_fifos, | ||
| 1813 | .maxlen = sizeof(int), | ||
| 1814 | .mode = 0600, | ||
| 1815 | .proc_handler = proc_dointvec_minmax, | ||
| 1816 | .extra1 = &zero, | ||
| 1817 | .extra2 = &two, | ||
| 1818 | }, | ||
| 1819 | { | ||
| 1820 | .procname = "protected_regular", | ||
| 1821 | .data = &sysctl_protected_regular, | ||
| 1822 | .maxlen = sizeof(int), | ||
| 1823 | .mode = 0600, | ||
| 1824 | .proc_handler = proc_dointvec_minmax, | ||
| 1825 | .extra1 = &zero, | ||
| 1826 | .extra2 = &two, | ||
| 1827 | }, | ||
| 1810 | { | 1828 | { |
| 1811 | .procname = "suid_dumpable", | 1829 | .procname = "suid_dumpable", |
| 1812 | .data = &suid_dumpable, | 1830 | .data = &suid_dumpable, |