The patch titled
ramzswap: remove ARM specific d-cache hack
has been removed from the -mm tree. Its filename was
ramzswap-remove-arm-specific-d-cache-hack.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ramzswap: remove ARM specific d-cache hack
From: Nitin Gupta <ngupta@xxxxxxxxxx>
Remove d-cache hack in ramzswap driver that was needed to workaround a bug
in ARM version of update_mmu_cache() which caused stale data in d-cache to
be transferred to userspace. This bug was fixed by
787b2faadc4356b6c2c71feb42fb944fece9a12f ("ARM: force dcache flush if
dcache_dirty bit set").
This also brings down one entry in TODO file.
Signed-off-by: Nitin Gupta <ngupta@xxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/staging/ramzswap/TODO | 1
drivers/staging/ramzswap/ramzswap_drv.c | 28 ++--------------------
2 files changed, 3 insertions(+), 26 deletions(-)
diff -puN drivers/staging/ramzswap/TODO~ramzswap-remove-arm-specific-d-cache-hack drivers/staging/ramzswap/TODO
--- a/drivers/staging/ramzswap/TODO~ramzswap-remove-arm-specific-d-cache-hack
+++ a/drivers/staging/ramzswap/TODO
@@ -1,6 +1,5 @@
TODO:
- Add support for swap notifiers
- - Remove CONFIG_ARM hack
Please send patches to Greg Kroah-Hartman <greg@xxxxxxxxx> and
Nitin Gupta <ngupta@xxxxxxxxxx>
diff -puN drivers/staging/ramzswap/ramzswap_drv.c~ramzswap-remove-arm-specific-d-cache-hack drivers/staging/ramzswap/ramzswap_drv.c
--- a/drivers/staging/ramzswap/ramzswap_drv.c~ramzswap-remove-arm-specific-d-cache-hack
+++ a/drivers/staging/ramzswap/ramzswap_drv.c
@@ -222,28 +222,6 @@ out:
return ret;
}
-static void ramzswap_flush_dcache_page(struct page *page)
-{
-#ifdef CONFIG_ARM
- int flag = 0;
- /*
- * Ugly hack to get flush_dcache_page() work on ARM.
- * page_mapping(page) == NULL after clearing this swap cache flag.
- * Without clearing this flag, flush_dcache_page() will simply set
- * "PG_dcache_dirty" bit and return.
- */
- if (PageSwapCache(page)) {
- flag = 1;
- ClearPageSwapCache(page);
- }
-#endif
- flush_dcache_page(page);
-#ifdef CONFIG_ARM
- if (flag)
- SetPageSwapCache(page);
-#endif
-}
-
void ramzswap_ioctl_get_stats(struct ramzswap *rzs,
struct ramzswap_ioctl_stats *s)
{
@@ -655,7 +633,7 @@ static int handle_zero_page(struct bio *
memset(user_mem, 0, PAGE_SIZE);
kunmap_atomic(user_mem, KM_USER0);
- ramzswap_flush_dcache_page(page);
+ flush_dcache_page(page);
set_bit(BIO_UPTODATE, &bio->bi_flags);
bio_endio(bio, 0);
@@ -679,7 +657,7 @@ static int handle_uncompressed_page(stru
kunmap_atomic(user_mem, KM_USER0);
kunmap_atomic(cmem, KM_USER1);
- ramzswap_flush_dcache_page(page);
+ flush_dcache_page(page);
set_bit(BIO_UPTODATE, &bio->bi_flags);
bio_endio(bio, 0);
@@ -779,7 +757,7 @@ static int ramzswap_read(struct ramzswap
goto out;
}
- ramzswap_flush_dcache_page(page);
+ flush_dcache_page(page);
set_bit(BIO_UPTODATE, &bio->bi_flags);
bio_endio(bio, 0);
_
Patches currently in -mm which might be from ngupta@xxxxxxxxxx are
linux-next.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
