--- 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 *);
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
-@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
+@@ -576,6 +576,7 @@ static unsigned char swap_entry_free(str
/* free if no reference */
if (!usage) {
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,
+@@ -585,6 +586,8 @@ static unsigned char swap_entry_free(str
swap_list.next = p->type;
nr_swap_pages++;
p->inuse_pages--;