aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-08 20:01:05 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-08 20:01:05 +0000
commitc1dc4a8a661cc5036563e6868bc6a4f197158acd (patch)
tree43998d9196413632bd4f23fb4e280d4dce045d74 /target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch
parent083ff78000c65c6edeb69db4a0d6b81bec19afa4 (diff)
downloadupstream-c1dc4a8a661cc5036563e6868bc6a4f197158acd.tar.gz
upstream-c1dc4a8a661cc5036563e6868bc6a4f197158acd.tar.bz2
upstream-c1dc4a8a661cc5036563e6868bc6a4f197158acd.zip
refresh 2.6.34 patches
SVN-Revision: 22542
Diffstat (limited to 'target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/040-compcache_swap_notify_core_support.patch6
1 files changed, 3 insertions, 3 deletions
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
index 0372e20655..5ec2551e77 100644
--- 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
@@ -1,6 +1,6 @@
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
-@@ -1301,6 +1301,8 @@ struct block_device_operations {
+@@ -1287,6 +1287,8 @@ struct block_device_operations {
unsigned long long);
int (*revalidate_disk) (struct gendisk *);
int (*getgeo)(struct block_device *, struct hd_geometry *);
@@ -11,7 +11,7 @@
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
-@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(str
/* free if no reference */
if (!usage) {
@@ -19,7 +19,7 @@
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,
+@@ -583,6 +584,8 @@ static unsigned char swap_entry_free(str
swap_list.next = p->type;
nr_swap_pages++;
p->inuse_pages--;