ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 06:33:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

linux/generic: update kernel patch refreshing. Include two missed patches.

Browse Source 
SVN-Revision: 23240
This commit is contained in:
Alexandros C. Couloumbis 2010-10-05 09:49:53 +00:00
parent de644deef5
commit 975bf6a4fa
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/patches-2.6.36/209-mini_fo.patch
View File

@ -7492,7 +7492,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/fs/mini_fo/super.c +++ b/fs/mini_fo/super.c
@@ -0,0 +1,281 @@ @@ -0,0 +1,285 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University + * Copyright (c) 2001-2003 Stony Brook University
@ -7665,7 +7665,11 @@
+ struct dentry *hidden_d; + struct dentry *hidden_d;
+ +
+ hidden_d = dtohd(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); + err = vfs_statfs(hidden_d, buf);
+#endif
+#else +#else
+ super_block_t *hidden_sb; + super_block_t *hidden_sb;
+ +

2
target/linux/generic/patches-2.6.36/210-mini_fo_2.6.25_fixes.patch
View File

@ -93,7 +93,7 @@
*/ */
--- a/fs/mini_fo/super.c --- a/fs/mini_fo/super.c
+++ b/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 #endif

4
target/linux/generic/patches-2.6.36/212-mini_fo_2.6.26_fixes.patch
View File

@ -16,7 +16,7 @@
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) #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. * dies.
*/ */
STATIC void STATIC void
@ -25,7 +25,7 @@
mini_fo_umount_begin(struct vfsmount *mnt, int flags) mini_fo_umount_begin(struct vfsmount *mnt, int flags)
{ {
struct vfsmount *hidden_mnt; 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) #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode, write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */

2
target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
View File

@ -14,7 +14,7 @@
print_exit_location(); 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, put_inode: mini_fo_put_inode,
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)

7
target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
View File

@ -21,9 +21,12 @@
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
--- a/drivers/leds/ledtrig-netdev.c --- a/drivers/leds/ledtrig-netdev.c
+++ b/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; 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; unsigned new_activity;
+ struct rtnl_link_stats64 temp; + struct rtnl_link_stats64 temp;