diff for duplicates of <20190103143227.9138-3-jlee@suse.com>
diff --git a/a/1.txt b/N1/1.txt
index edc5222..5c180d0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -334,7 +334,7 @@ index 640b2034edd6..e817c035f378 100644
+ memory_bm_position_reset(copy_bm);
+ for (;;) {
+ pfn = memory_bm_next_pfn(orig_bm);
-+ if (unlikely(pfn = BM_END_OF_MAP))
++ if (unlikely(pfn == BM_END_OF_MAP))
+ break;
+ dst_pfn = memory_bm_next_pfn(copy_bm);
+ copy_data_page(dst_pfn, pfn);
@@ -416,7 +416,7 @@ index 640b2034edd6..e817c035f378 100644
+ memory_bm_position_reset(copy_bm);
+ for (;;) {
+ pfn = memory_bm_next_pfn(orig_bm);
-+ if (unlikely(pfn = BM_END_OF_MAP))
++ if (unlikely(pfn == BM_END_OF_MAP))
+ break;
+ copy_data_page(memory_bm_next_pfn(copy_bm), pfn);
+ }
@@ -444,7 +444,7 @@ index 640b2034edd6..e817c035f378 100644
- memory_bm_position_reset(copy_bm);
- for(;;) {
- pfn = memory_bm_next_pfn(orig_bm);
-- if (unlikely(pfn = BM_END_OF_MAP))
+- if (unlikely(pfn == BM_END_OF_MAP))
- break;
- copy_data_page(memory_bm_next_pfn(copy_bm), pfn);
- }
@@ -596,7 +596,7 @@ index 640b2034edd6..e817c035f378 100644
struct pbe *pbe;
struct page *page;
@@ -2530,6 +2868,9 @@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
- if (pfn = BM_END_OF_MAP)
+ if (pfn == BM_END_OF_MAP)
return ERR_PTR(-EFAULT);
+ if (pfn_out)
@@ -650,7 +650,7 @@ index 640b2034edd6..e817c035f378 100644
if (handle->buffer != buffer)
handle->sync_read = 0;
+ /* Capture the trampoline for transfer data */
-+ if (pfn = trampoline_pfn && trampoline_pfn)
++ if (pfn == trampoline_pfn && trampoline_pfn)
+ trampoline_buff = handle->buffer;
+ if (h_buf)
+ *(h_buf + (handle->cur - nr_meta_pages - 1)) = handle->buffer;
diff --git a/a/content_digest b/N1/content_digest
index 88a6b8b..39262dd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 2/5] PM / hibernate: Generate and verify signature for snapshot image\0"
]
[
- "Date\0Thu, 03 Jan 2019 14:32:24 +0000\0"
+ "Date\0Thu, 3 Jan 2019 22:32:24 +0800\0"
]
[
"To\0Rafael J . Wysocki <rjw\@rjwysocki.net>",
@@ -373,7 +373,7 @@
"+\tmemory_bm_position_reset(copy_bm);\n",
"+\tfor (;;) {\n",
"+\t\tpfn = memory_bm_next_pfn(orig_bm);\n",
- "+\t\tif (unlikely(pfn = BM_END_OF_MAP))\n",
+ "+\t\tif (unlikely(pfn == BM_END_OF_MAP))\n",
"+\t\t\tbreak;\n",
"+\t\tdst_pfn = memory_bm_next_pfn(copy_bm);\n",
"+\t\tcopy_data_page(dst_pfn, pfn);\n",
@@ -455,7 +455,7 @@
"+\tmemory_bm_position_reset(copy_bm);\n",
"+\tfor (;;) {\n",
"+\t\tpfn = memory_bm_next_pfn(orig_bm);\n",
- "+\t\tif (unlikely(pfn = BM_END_OF_MAP))\n",
+ "+\t\tif (unlikely(pfn == BM_END_OF_MAP))\n",
"+\t\t\tbreak;\n",
"+\t\tcopy_data_page(memory_bm_next_pfn(copy_bm), pfn);\n",
"+\t}\n",
@@ -483,7 +483,7 @@
"-\tmemory_bm_position_reset(copy_bm);\n",
"-\tfor(;;) {\n",
"-\t\tpfn = memory_bm_next_pfn(orig_bm);\n",
- "-\t\tif (unlikely(pfn = BM_END_OF_MAP))\n",
+ "-\t\tif (unlikely(pfn == BM_END_OF_MAP))\n",
"-\t\t\tbreak;\n",
"-\t\tcopy_data_page(memory_bm_next_pfn(copy_bm), pfn);\n",
"-\t}\n",
@@ -635,7 +635,7 @@
" \tstruct pbe *pbe;\n",
" \tstruct page *page;\n",
"\@\@ -2530,6 +2868,9 \@\@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)\n",
- " \tif (pfn = BM_END_OF_MAP)\n",
+ " \tif (pfn == BM_END_OF_MAP)\n",
" \t\treturn ERR_PTR(-EFAULT);\n",
" \n",
"+\tif (pfn_out)\n",
@@ -689,7 +689,7 @@
" \t\tif (handle->buffer != buffer)\n",
" \t\t\thandle->sync_read = 0;\n",
"+\t\t/* Capture the trampoline for transfer data */\n",
- "+\t\tif (pfn = trampoline_pfn && trampoline_pfn)\n",
+ "+\t\tif (pfn == trampoline_pfn && trampoline_pfn)\n",
"+\t\t\ttrampoline_buff = handle->buffer;\n",
"+\t\tif (h_buf)\n",
"+\t\t\t*(h_buf + (handle->cur - nr_meta_pages - 1)) = handle->buffer;\n",
@@ -761,4 +761,4 @@
"2.13.6"
]
-002de93982dc7b893df38d4b4f82b8ad53aad83a26188eaf005082167404c1b9
+a5af250ce31fb046c24eff019bd9148b2a9f221825ff8e6c6e42224a0eaa4666
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.