package/compcache: use mainline modules for kernels >=2.6.33 (thank you nbd)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22458 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 60 insertions, 0 deletions

diff --git a/target/linux/generic/patches-2.6.33/040-compcache_swap_notify_core_support.patch b/target/linux/generic/patches-2.6.33/040-compcache_swap_notify_core_support.patch
new file mode 100644
index 000000000..0372e2065
--- /dev/null
+++ b/target/linux/generic/patches-2.6.33/040-compcache_swap_notify_core_support.patch
@@ -0,0 +1,30 @@
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -1301,6 +1301,8 @@ struct block_device_operations {
+ 						unsigned long long);
+ 	int (*revalidate_disk) (struct gendisk *);
+ 	int (*getgeo)(struct block_device *, struct hd_geometry *);
++        /* this callback is with swap_lock and sometimes page table lock held */
++        void (*swap_slot_free_notify) (struct block_device *, unsigned long);
+ 	struct module *owner;
+ };
+ 
+--- a/mm/swapfile.c
++++ b/mm/swapfile.c
+@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+ 
+ 	/* free if no reference */
+ 	if (!usage) {
++		struct gendisk *disk = p->bdev->bd_disk;
+ 		if (offset < p->lowest_bit)
+ 			p->lowest_bit = offset;
+ 		if (offset > p->highest_bit)
+@@ -583,6 +584,8 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+ 			swap_list.next = p->type;
+ 		nr_swap_pages++;
+ 		p->inuse_pages--;
++		if (disk->fops->swap_slot_free_notify)
++			disk->fops->swap_slot_free_notify(p->bdev, offset);
+ 	}
+ 
+ 	return usage;
diff --git a/target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch b/target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch
new file mode 100644
index 000000000..0372e2065
--- /dev/null
+++ b/target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch
@@ -0,0 +1,30 @@
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -1301,6 +1301,8 @@ struct block_device_operations {
+ 						unsigned long long);
+ 	int (*revalidate_disk) (struct gendisk *);
+ 	int (*getgeo)(struct block_device *, struct hd_geometry *);
++        /* this callback is with swap_lock and sometimes page table lock held */
++        void (*swap_slot_free_notify) (struct block_device *, unsigned long);
+ 	struct module *owner;
+ };
+ 
+--- a/mm/swapfile.c
++++ b/mm/swapfile.c
+@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+ 
+ 	/* free if no reference */
+ 	if (!usage) {
++		struct gendisk *disk = p->bdev->bd_disk;
+ 		if (offset < p->lowest_bit)
+ 			p->lowest_bit = offset;
+ 		if (offset > p->highest_bit)
+@@ -583,6 +584,8 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+ 			swap_list.next = p->type;
+ 		nr_swap_pages++;
+ 		p->inuse_pages--;
++		if (disk->fops->swap_slot_free_notify)
++			disk->fops->swap_slot_free_notify(p->bdev, offset);
+ 	}
+ 
+ 	return usage;