diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-01 16:57:24 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-01 16:57:24 +0000 |
| commit | 54913f956b6dee3e647d9ed2ec363795feb11475 (patch) | |
| tree | 2a7ad6a5f846233b486dc7a38270bbd8978e0d6a /target | |
| parent | 505c98f1f6e6b7c08eb88e9c6385684a5305dc1d (diff) | |
| download | upstream-54913f956b6dee3e647d9ed2ec363795feb11475.tar.gz upstream-54913f956b6dee3e647d9ed2ec363795feb11475.tar.bz2 upstream-54913f956b6dee3e647d9ed2ec363795feb11475.zip | |
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
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-2.6.33/040-compcache_swap_notify_core_support.patch | 30 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch | 30 |
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 0000000000..0372e20655 --- /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 0000000000..0372e20655 --- /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; |