TOI fix for 3.6
Oleksandr Natalenko <[email protected]> Thu, 4 Oct 2012 21:36:58 +0300
| Newsgroups | gmane.linux.swsusp.devel |
|---|---|
| Organization | ITS NTUU KPI |
| Message-ID | <[email protected]> |
Another fix from me in tuxonice_builtin.c due to kmap/unmap_atomic changes. _______________________________________________ TuxOnIce-devel mailing list [email protected] http://lists.tuxonice.net/listinfo/tuxonice-devel
0001-toi-fixes-for-3.6-1-fix-kmap_atomic-kunmap_atomic-ca.patch
(text/x-patch, 1.9 KB)
From 36e516cb763e9764d28556403c04280385bfbfc0 Mon Sep 17 00:00:00 2001 From: Oleksandr Natalenko <[email protected]> Date: Thu, 4 Oct 2012 21:22:49 +0300 Subject: [PATCH] toi-fixes-for-3.6-1: fix kmap_atomic/kunmap_atomic calls --- kernel/power/tuxonice_builtin.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/kernel/power/tuxonice_builtin.c b/kernel/power/tuxonice_builtin.c index 4a16fb7..62b5d14 100644 --- a/kernel/power/tuxonice_builtin.c +++ b/kernel/power/tuxonice_builtin.c @@ -61,24 +61,22 @@ static void copyback_high(void) if (!pbe_page) return; - this_pbe = (struct pbe *) kmap_atomic(pbe_page, KM_BOUNCE_READ); + this_pbe = (struct pbe *) kmap_atomic(pbe_page); first_pbe = this_pbe; while (this_pbe) { int loop = (PAGE_SIZE / sizeof(unsigned long)) - 1; - origpage = kmap_atomic(pfn_to_page((unsigned long) this_pbe->orig_address), - KM_BIO_DST_IRQ); - copypage = kmap_atomic((struct page *) this_pbe->address, - KM_BIO_SRC_IRQ); + origpage = kmap_atomic(pfn_to_page((unsigned long) this_pbe->orig_address)); + copypage = kmap_atomic((struct page *) this_pbe->address); while (loop >= 0) { *(origpage + loop) = *(copypage + loop); loop--; } - kunmap_atomic(origpage, KM_BIO_DST_IRQ); - kunmap_atomic(copypage, KM_BIO_SRC_IRQ); + kunmap_atomic(origpage); + kunmap_atomic(copypage); if (!this_pbe->next) break; @@ -88,16 +86,15 @@ static void copyback_high(void) pbe_index++; } else { pbe_page = (struct page *) this_pbe->next; - kunmap_atomic(first_pbe, KM_BOUNCE_READ); + kunmap_atomic(first_pbe); if (!pbe_page) return; - this_pbe = (struct pbe *) kmap_atomic(pbe_page, - KM_BOUNCE_READ); + this_pbe = (struct pbe *) kmap_atomic(pbe_page); first_pbe = this_pbe; pbe_index = 1; } } - kunmap_atomic(first_pbe, KM_BOUNCE_READ); + kunmap_atomic(first_pbe); } #else /* CONFIG_HIGHMEM */ -- 1.7.12.2
signature.asc
(application/pgp-signature, 490 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAEBAgAGBQJQbddQAAoJELftKrVLdx04SaoH/2H/LrJvPw0SRyO11+u3Uxfu DA0QwlQ5MtlrNKirX+l3dHpTdMjmf/jXv3XCksbp9rC+ANsyKb8aQSG5p6OJJGSs Pb7mIuL+muy2ZRrUEAMsUfJ0hFsAIbSBPs7qr4e2oD4WXebHICXR59K6JxDYuw67 Lr6tVaOT0fTnT2aBx6zPUtqcHF7XkjJWfXxHkmzUeTSjyWVB26UD2C7xTU3UMsHG uV2SJ21VJKAjGhGvFCmN1fJ4Tu2+Ix9xs5ZDBe9Tqu0hy4BlYOSWIMS5pIs4UHmd B6imDPhxviXxEIPZpFCpwhk8FpmOInJth5mTjAehguq86KmBbup6WY6FpPCy58c= =BrO8 -----END PGP SIGNATURE-----