[kernel] refresh 2.6.34 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22542 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Florian Fainelli 2010-08-08 20:01:05 +00:00
parent fc2a9bd7c8
commit f27cb2ed92
2 changed files with 9 additions and 9 deletions

View File

@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static struct file_system_type dev_fs_type = { static struct file_system_type dev_fs_type = {
--- a/fs/ramfs/inode.c --- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c
@@ -214,7 +214,7 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts) @@ -214,7 +214,7 @@ static int ramfs_parse_options(char *dat
return 0; return 0;
} }
@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct inode *inode = NULL; struct inode *inode = NULL;
--- a/include/linux/ramfs.h --- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h +++ b/include/linux/ramfs.h
@@ -20,4 +20,6 @@ extern const struct file_operations ramfs_file_operations; @@ -20,4 +20,6 @@ extern const struct file_operations ramf
extern const struct vm_operations_struct generic_file_vm_ops; extern const struct vm_operations_struct generic_file_vm_ops;
extern int __init init_rootfs(void); extern int __init init_rootfs(void);

View File

@ -1,6 +1,6 @@
--- a/include/linux/blkdev.h --- a/include/linux/blkdev.h
+++ b/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); unsigned long long);
int (*revalidate_disk) (struct gendisk *); int (*revalidate_disk) (struct gendisk *);
int (*getgeo)(struct block_device *, struct hd_geometry *); int (*getgeo)(struct block_device *, struct hd_geometry *);
@ -11,7 +11,7 @@
--- a/mm/swapfile.c --- a/mm/swapfile.c
+++ b/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 */ /* free if no reference */
if (!usage) { if (!usage) {
@ -19,7 +19,7 @@
if (offset < p->lowest_bit) if (offset < p->lowest_bit)
p->lowest_bit = offset; p->lowest_bit = offset;
if (offset > p->highest_bit) 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; swap_list.next = p->type;
nr_swap_pages++; nr_swap_pages++;
p->inuse_pages--; p->inuse_pages--;