upgrade to 2.6.31.7
SVN-Revision: 18747
This commit is contained in:
@@ -811,7 +811,7 @@
|
||||
extern void kfree_skb(struct sk_buff *skb);
|
||||
extern void consume_skb(struct sk_buff *skb);
|
||||
extern void __kfree_skb(struct sk_buff *skb);
|
||||
@@ -1974,6 +1992,10 @@ static inline void __nf_copy(struct sk_b
|
||||
@@ -1976,6 +1994,10 @@ static inline void __nf_copy(struct sk_b
|
||||
dst->nfct_reasm = src->nfct_reasm;
|
||||
nf_conntrack_get_reasm(src->nfct_reasm);
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -844,7 +844,7 @@ static noinline int init_post(void)
|
||||
@@ -839,7 +839,7 @@ static noinline int init_post(void)
|
||||
numa_default_policy();
|
||||
|
||||
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -868,10 +868,7 @@ static noinline int init_post(void)
|
||||
@@ -863,10 +863,7 @@ static noinline int init_post(void)
|
||||
printk(KERN_WARNING "Failed to execute %s. Attempting "
|
||||
"defaults...\n", execute_command);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user