[folded-merged] kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes
has been removed from the -mm tree.  Its filename was
     kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch

This patch was dropped because it was folded into kexec-split-kexec_load-syscall-from-kexec-core-code.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes

WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
#2072: FILE: kernel/kexec_core.c:41:
+#include <asm/uaccess.h>

WARNING: Use #include <linux/io.h> instead of <asm/io.h>
#2073: FILE: kernel/kexec_core.c:42:
+#include <asm/io.h>

ERROR: do not initialise globals to 0 or NULL
#2092: FILE: kernel/kexec_core.c:61:
+bool kexec_in_progress = false;

WARNING: Missing a blank line after declarations
#2221: FILE: kernel/kexec_core.c:190:
+			unsigned long pstart, pend;
+			pstart = image->segment[j].mem;

WARNING: Missing a blank line after declarations
#2319: FILE: kernel/kexec_core.c:288:
+		unsigned int count, i;
+		pages->mapping = NULL;

WARNING: else is not generally useful after a break or return
#2726: FILE: kernel/kexec_core.c:695:
+			break;
+		} else {

WARNING: Missing a blank line after declarations
#2915: FILE: kernel/kexec_core.c:884:
+	size_t size = 0;
+	mutex_lock(&kexec_mutex);

WARNING: Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON()
#3263: FILE: kernel/kexec_core.c:1232:
+	BUG_ON(!crash_size || !crash_base);

total: 1 errors, 7 warnings, 2753 lines checked

./patches/kexec-split-kexec_load-syscall-from-kexec-core-code.patch has style problems, please review.

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.

Please run checkpatch prior to sending patches

Cc: Dave Young <dyoung@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/kexec_core.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff -puN kernel/kexec_core.c~kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes kernel/kexec_core.c
--- a/kernel/kexec_core.c~kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes
+++ a/kernel/kexec_core.c
@@ -30,6 +30,8 @@
 #include <linux/freezer.h>
 #include <linux/pm.h>
 #include <linux/cpu.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 #include <linux/console.h>
 #include <linux/vmalloc.h>
 #include <linux/swap.h>
@@ -38,8 +40,6 @@
 #include <linux/hugetlb.h>
 
 #include <asm/page.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
 #include <asm/sections.h>
 
 #include <crypto/hash.h>
@@ -187,6 +187,7 @@ int sanity_check_segment_list(struct kim
 		mend   = mstart + image->segment[i].memsz;
 		for (j = 0; j < i; j++) {
 			unsigned long pstart, pend;
+
 			pstart = image->segment[j].mem;
 			pend   = pstart + image->segment[j].memsz;
 			/* Do the segments overlap ? */
@@ -285,6 +286,7 @@ static struct page *kimage_alloc_pages(g
 	pages = alloc_pages(gfp_mask, order);
 	if (pages) {
 		unsigned int count, i;
+
 		pages->mapping = NULL;
 		set_page_private(pages, order);
 		count = 1 << order;
@@ -692,12 +694,9 @@ static struct page *kimage_alloc_page(st
 			addr = old_addr;
 			page = old_page;
 			break;
-		} else {
-			/* Place the page on the destination list I
-			 * will use it later.
-			 */
-			list_add(&page->lru, &image->dest_pages);
 		}
+		/* Place the page on the destination list, to be used later */
+		list_add(&page->lru, &image->dest_pages);
 	}
 
 	return page;
@@ -881,6 +880,7 @@ void crash_kexec(struct pt_regs *regs)
 size_t crash_get_memory_size(void)
 {
 	size_t size = 0;
+
 	mutex_lock(&kexec_mutex);
 	if (crashk_res.end != crashk_res.start)
 		size = resource_size(&crashk_res);
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
kexec-split-kexec_load-syscall-from-kexec-core-code.patch
align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.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



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux