upgrade to 2.6.31.7

SVN-Revision: 18747
This commit is contained in:
Imre Kaloz
2009-12-11 11:10:49 +00:00
parent 30992cceeb
commit 948ecb59d9
5 changed files with 6 additions and 6 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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);
}