The patch titled Subject: mm: Fix checkpatch warnings, whitespace has been added to the -mm tree. Its filename is mm-fix-checkpatch-warnings-whitespace.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-fix-checkpatch-warnings-whitespace.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-fix-checkpatch-warnings-whitespace.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Tobin C Harding <me@xxxxxxxx> Subject: mm: Fix checkpatch warnings, whitespace Patch fixes whitespace checkpatch warnings. Link: http://lkml.kernel.org/r/1485992240-10986-3-git-send-email-me@xxxxxxxx Signed-off-by: Tobin C Harding <me@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN mm/memory.c~mm-fix-checkpatch-warnings-whitespace mm/memory.c --- a/mm/memory.c~mm-fix-checkpatch-warnings-whitespace +++ a/mm/memory.c @@ -30,7 +30,7 @@ /* * 05.04.94 - Multi-page memory management added for v1.1. - * Idea by Alex Bligh (alex@xxxxxxxxxxxxxxx) + * Idea by Alex Bligh (alex@xxxxxxxxxxxxxxx) * * 16.07.99 - Support of BIGMEM added by Gerhard Wichert, Siemens AG * (Gerhard.Wichert@xxxxxxxxxxxxxx) @@ -82,9 +82,9 @@ #ifndef CONFIG_NEED_MULTIPLE_NODES /* use the per-pgdat data instead for discontigmem - mbligh */ unsigned long max_mapnr; -struct page *mem_map; - EXPORT_SYMBOL(max_mapnr); + +struct page *mem_map; EXPORT_SYMBOL(mem_map); #endif @@ -96,7 +96,6 @@ EXPORT_SYMBOL(mem_map); * and ZONE_HIGHMEM. */ void * high_memory; - EXPORT_SYMBOL(high_memory); /* @@ -120,10 +119,10 @@ static int __init disable_randmaps(char __setup("norandmaps", disable_randmaps); unsigned long zero_pfn __read_mostly; -unsigned long highest_memmap_pfn __read_mostly; - EXPORT_SYMBOL(zero_pfn); +unsigned long highest_memmap_pfn __read_mostly; + /* * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init() */ @@ -3765,8 +3764,8 @@ int handle_mm_fault(struct vm_area_struc * VM_FAULT_OOM), there is no need to kill anything. * Just clean up the OOM state peacefully. */ - if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)) - mem_cgroup_oom_synchronize(false); + if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)) + mem_cgroup_oom_synchronize(false); } /* _ Patches currently in -mm which might be from me@xxxxxxxx are mm-fix-sparse-use-plain-integer-as-null-pointer.patch mm-fix-checkpatch-warnings-whitespace.patch mm-fix-checkpatch-errors-whitespace-errors.patch mm-fix-checkpatch-warning-extraneous-braces.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html