refresh 2.6.34 patches

SVN-Revision: 22542

diff --git a/target/linux/generic/patches-2.6.34/015-devtmpfs_ramfs.patch b/target/linux/generic/patches-2.6.34/015-devtmpfs_ramfs.patch
index 8cea56d3f8526552f3955e84d4473bdb85e95bb5..8ff7f9da6a25135948df73a750db9517eb372aec 100644 (file)
--- a/target/linux/generic/patches-2.6.34/015-devtmpfs_ramfs.patch
+++ b/target/linux/generic/patches-2.6.34/015-devtmpfs_ramfs.patch
@@ -10,7 +10,7 @@ Acked-by: Kay Sievers <kay.sievers@vrfy.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- a/drivers/base/Kconfig
 +++ b/drivers/base/Kconfig
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- a/drivers/base/Kconfig
 +++ b/drivers/base/Kconfig

-@@ -18,9 +18,9 @@  config UEVENT_HELPER_PATH
+@@ -18,9 +18,9 @@ config UEVENT_HELPER_PATH

  
  config DEVTMPFS
        bool "Maintain a devtmpfs filesystem to mount at /dev"
  
  config DEVTMPFS
        bool "Maintain a devtmpfs filesystem to mount at /dev"


@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
          In this filesystem, the kernel driver core maintains device
          nodes with their default names and permissions for all
          registered devices with an assigned major/minor number.
          In this filesystem, the kernel driver core maintains device
          nodes with their default names and permissions for all
          registered devices with an assigned major/minor number.

-@@ -33,6 +33,9 @@  config DEVTMPFS
+@@ -33,6 +33,9 @@ config DEVTMPFS

          functional /dev without any further help. It also allows simple
          rescue systems, and reliably handles dynamic major/minor numbers.
  
          functional /dev without any further help. It also allows simple
          rescue systems, and reliably handles dynamic major/minor numbers.
  


@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        depends on DEVTMPFS
 --- a/drivers/base/devtmpfs.c
 +++ b/drivers/base/devtmpfs.c
        depends on DEVTMPFS
 --- a/drivers/base/devtmpfs.c
 +++ b/drivers/base/devtmpfs.c

-@@ -20,6 +20,7 @@ 
+@@ -20,6 +20,7 @@

  #include <linux/namei.h>
  #include <linux/fs.h>
  #include <linux/shmem_fs.h>
  #include <linux/namei.h>
  #include <linux/fs.h>
  #include <linux/shmem_fs.h>


@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/cred.h>
  #include <linux/sched.h>
  #include <linux/init_task.h>
  #include <linux/cred.h>
  #include <linux/sched.h>
  #include <linux/init_task.h>

-@@ -45,7 +46,11 @@  __setup("devtmpfs.mount=", mount_param);
+@@ -45,7 +46,11 @@ __setup("devtmpfs.mount=", mount_param);

  static int dev_get_sb(struct file_system_type *fs_type, int flags,
                      const char *dev_name, void *data, struct vfsmount *mnt)
  {
  static int dev_get_sb(struct file_system_type *fs_type, int flags,
                      const char *dev_name, void *data, struct vfsmount *mnt)
  {


@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static struct file_system_type dev_fs_type = {
 --- a/fs/ramfs/inode.c
 +++ b/fs/ramfs/inode.c
  static struct file_system_type dev_fs_type = {
 --- a/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;
 --- a/include/linux/ramfs.h
 +++ b/include/linux/ramfs.h
        struct inode *inode = NULL;
 --- a/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 int __init init_rootfs(void);
  
  extern const struct vm_operations_struct generic_file_vm_ops;
  extern int __init init_rootfs(void);
  

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 0372e20655b4a03e448efb17fa2916dee168d0eb..5ec2551e773bf4282e13ca36d84a4a055d07f226 100644 (file)
--- 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
 --- 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 *);
                                                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
  
 --- 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) {
  
        /* free if no reference */
        if (!usage) {


@@ -19,7 +19,7 @@
                if (offset < p->lowest_bit)
                        p->lowest_bit = offset;
                if (offset > p->highest_bit)
                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--;
                        swap_list.next = p->type;
                nr_swap_pages++;
                p->inuse_pages--;