aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 09:49:53 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 09:49:53 +0000
commit975bf6a4fa198617bd2cb7fdce47a5d60d25bedc (patch)
tree795d9e9a9008509fb23ec264491629f5a7f6164f
parentde644deef572da18b764ba19e03430c0a35a1fd4 (diff)
downloadupstream-975bf6a4fa198617bd2cb7fdce47a5d60d25bedc.tar.gz
upstream-975bf6a4fa198617bd2cb7fdce47a5d60d25bedc.tar.bz2
upstream-975bf6a4fa198617bd2cb7fdce47a5d60d25bedc.zip
linux/generic: update kernel patch refreshing. Include two missed patches.
SVN-Revision: 23240
-rw-r--r--target/linux/generic/patches-2.6.36/209-mini_fo.patch6
-rw-r--r--target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch2
-rw-r--r--target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch4
-rw-r--r--target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch2
-rw-r--r--target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch7
5 files changed, 14 insertions, 7 deletions
diff --git a/target/linux/generic/patches-2.6.36/209-mini_fo.patch b/target/linux/generic/patches-2.6.36/209-mini_fo.patch
index d7e3220d24..10900b4e18 100644
--- a/target/linux/generic/patches-2.6.36/209-mini_fo.patch
+++ b/target/linux/generic/patches-2.6.36/209-mini_fo.patch
@@ -7492,7 +7492,7 @@
+
--- /dev/null
+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University
@@ -7665,7 +7665,11 @@
+ struct dentry *hidden_d;
+
+ hidden_d = dtohd(d);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++ err = statfs_by_dentry(hidden_d, buf);
++#else
+ err = vfs_statfs(hidden_d, buf);
++#endif
+#else
+ super_block_t *hidden_sb;
+
diff --git a/target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch
index b64630d500..d021ec1b30 100644
--- a/target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch
@@ -93,7 +93,7 @@
*/
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
+@@ -266,10 +266,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
diff --git a/target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch
index b5fa64e6a1..d2a843c82e 100644
--- a/target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch
@@ -16,7 +16,7 @@
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
+@@ -242,7 +244,7 @@ mini_fo_clear_inode(inode_t *inode)
* dies.
*/
STATIC void
@@ -25,7 +25,7 @@
mini_fo_umount_begin(struct vfsmount *mnt, int flags)
{
struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
+@@ -294,7 +296,9 @@ struct super_operations mini_fo_sops =
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
index f8d2ff6628..ef00b621fb 100644
--- a/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
+++ b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
@@ -14,7 +14,7 @@
print_exit_location();
}
-@@ -296,11 +299,11 @@ struct super_operations mini_fo_sops =
+@@ -300,11 +303,11 @@ struct super_operations mini_fo_sops =
put_inode: mini_fo_put_inode,
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
diff --git a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
index 9679ce14aa..068d126e73 100644
--- a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
+++ b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
@@ -21,9 +21,12 @@
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
--- a/drivers/leds/ledtrig-netdev.c
+++ b/drivers/leds/ledtrig-netdev.c
-@@ -309,6 +309,7 @@ static void netdev_trig_timer(unsigned l
+@@ -307,8 +307,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
- const struct net_device_stats *dev_stats;
+- const struct net_device_stats *dev_stats;
++ struct rtnl_link_stats64 *dev_stats;
unsigned new_activity;
+ struct rtnl_link_stats64 temp;