projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30992cc
)
upgrade to 2.6.31.7
author
Imre Kaloz
<kaloz@openwrt.org>
Fri, 11 Dec 2009 11:10:49 +0000
(11:10 +0000)
committer
Imre Kaloz
<kaloz@openwrt.org>
Fri, 11 Dec 2009 11:10:49 +0000
(11:10 +0000)
SVN-Revision: 18747
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
patch
|
blob
|
history
target/linux/x86/Makefile
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 420bd115ebb9f21bb13043c0271e8b6123792b98..05c3691e51b28db281bd23acd9474929dc912db9 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-22,8
+22,8
@@
endif
ifeq ($(LINUX_VERSION),2.6.30.10)
LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
endif
ifeq ($(LINUX_VERSION),2.6.30.10)
LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
endif
-ifeq ($(LINUX_VERSION),2.6.31.
6
)
- LINUX_KERNEL_MD5SUM:=
485472df88af84becdcf47f45de3ba46
+ifeq ($(LINUX_VERSION),2.6.31.
7
)
+ LINUX_KERNEL_MD5SUM:=
ae93db04f169f35c98e786f25e84c237
endif
ifeq ($(LINUX_VERSION),2.6.32)
LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879
endif
ifeq ($(LINUX_VERSION),2.6.32)
LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879
diff --git
a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
index 70c80c81dba0b2c1bfd8c5660e55cf921cdd8c60..cc9f5f263eb5de713c72d5ec2d32ba5f7f562cb4 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
+++ b/
target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
@@
-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);
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
-@@ -197
4,6 +1992
,10 @@ static inline void __nf_copy(struct sk_b
+@@ -197
6,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
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
diff --git
a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
b/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
index d9e443a666723fa455bae01400724cbf68b1c5a4..b90a247a8e952d893ed4cee5d0846be6d2983db7 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
+++ b/
target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
@@
-1,6
+1,6
@@
--- a/init/main.c
+++ b/init/main.c
--- a/init/main.c
+++ b/init/main.c
-@@ -8
44,7 +844
,7 @@ static noinline int init_post(void)
+@@ -8
39,7 +839
,7 @@ static noinline int init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git
a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
b/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
index 5d1f61ff02fa0ef934864051c8e96f8011a2eba6..c85113ddd7e860017ea54f5ba8c8d01d004cef53 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
+++ b/
target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
@@
-1,6
+1,6
@@
--- a/init/main.c
+++ b/init/main.c
--- a/init/main.c
+++ b/init/main.c
-@@ -86
8,10 +868
,7 @@ static noinline int init_post(void)
+@@ -86
3,10 +863
,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
diff --git
a/target/linux/x86/Makefile
b/target/linux/x86/Makefile
index 94a259fe86e6332919570c2c882bba006bc5be98..164e27904a51610fe92fe30e20df620239fe9223 100644
(file)
--- a/
target/linux/x86/Makefile
+++ b/
target/linux/x86/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
SUBTARGETS=generic olpc
FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
SUBTARGETS=generic olpc
-LINUX_VERSION:=2.6.31.
6
+LINUX_VERSION:=2.6.31.
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk