diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:56 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:56 +0000 |
| commit | 50eba35cd397748f9f36c0592a11ab1f2598516b (patch) | |
| tree | 16c2d1206ba0d899415aeaf22a7edb269943edbd | |
| parent | 16b4cbcdd64d92f6e79d41e11eda25a178ef3b53 (diff) | |
| download | upstream-50eba35cd397748f9f36c0592a11ab1f2598516b.tar.gz upstream-50eba35cd397748f9f36c0592a11ab1f2598516b.tar.bz2 upstream-50eba35cd397748f9f36c0592a11ab1f2598516b.zip | |
kernel: update linux 3.3 to 3.3.1
SVN-Revision: 31223
5 files changed, 10 insertions, 28 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7565beeea4..93353b6fb8 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -38,8 +38,8 @@ endif ifeq ($(LINUX_VERSION),3.2.14) LINUX_KERNEL_MD5SUM:=961da0dc037181a4a5059f763b70eabd endif -ifeq ($(LINUX_VERSION),3.3) - LINUX_KERNEL_MD5SUM:=98a6cdd7d082b7ea72df9c89842bac74 +ifeq ($(LINUX_VERSION),3.3.1) + LINUX_KERNEL_MD5SUM:=ded7229c02a53cd071e541f73b9ef547 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/generic/patches-3.3/120-ppp_txqueue_restart.patch b/target/linux/generic/patches-3.3/120-ppp_txqueue_restart.patch index 83033a16c2..84eb4e41ba 100644 --- a/target/linux/generic/patches-3.3/120-ppp_txqueue_restart.patch +++ b/target/linux/generic/patches-3.3/120-ppp_txqueue_restart.patch @@ -22,8 +22,8 @@ harmless in the TX path. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> ---- a/drivers/net/ppp/ppp_generic.c~ 2012-01-26 00:39:32.000000000 +0000 -+++ b/drivers/net/ppp/ppp_generic.c 2012-03-26 10:32:31.286744147 +0100 +--- a/drivers/net/ppp/ppp_generic.c ++++ b/drivers/net/ppp/ppp_generic.c @@ -235,7 +235,7 @@ struct ppp_net { /* Prototypes. */ static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf, @@ -73,10 +73,3 @@ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> } static inline struct sk_buff * - --- -David Woodhouse Open Source Technology Centre -David.Woodhouse@intel.com Intel Corporation - - - diff --git a/target/linux/generic/patches-3.3/910-kobject_uevent.patch b/target/linux/generic/patches-3.3/910-kobject_uevent.patch index f15749fa17..aa9a40f099 100644 --- a/target/linux/generic/patches-3.3/910-kobject_uevent.patch +++ b/target/linux/generic/patches-3.3/910-kobject_uevent.patch @@ -1,6 +1,6 @@ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -49,6 +49,18 @@ static const char *kobject_actions[] = { +@@ -50,6 +50,18 @@ static const char *kobject_actions[] = { [KOBJ_OFFLINE] = "offline", }; @@ -8,9 +8,9 @@ +{ + u64 seq; + -+ spin_lock(&sequence_lock); ++ mutex_lock(&uevent_sock_mutex); + seq = ++uevent_seqnum; -+ spin_unlock(&sequence_lock); ++ mutex_unlock(&uevent_sock_mutex); + + return seq; +} @@ -19,14 +19,3 @@ /** * kobject_action_type - translate action string to numeric type * -@@ -244,9 +256,7 @@ int kobject_uevent_env(struct kobject *k - kobj->state_remove_uevent_sent = 1; - - /* we will send an event, so request a new sequence number */ -- spin_lock(&sequence_lock); -- seq = ++uevent_seqnum; -- spin_unlock(&sequence_lock); -+ seq = uevent_next_seqnum(); - retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq); - if (retval) - goto exit; diff --git a/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch index 5573266255..104df13bf2 100644 --- a/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch @@ -39,7 +39,7 @@ #endif /* _KOBJECT_H_ */ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -380,6 +380,43 @@ int add_uevent_var(struct kobj_uevent_en +@@ -381,6 +381,43 @@ int add_uevent_var(struct kobj_uevent_en EXPORT_SYMBOL_GPL(add_uevent_var); #if defined(CONFIG_NET) diff --git a/target/linux/generic/patches-3.3/950-vm_exports.patch b/target/linux/generic/patches-3.3/950-vm_exports.patch index 3fa1ece71f..b9abd0c1ca 100644 --- a/target/linux/generic/patches-3.3/950-vm_exports.patch +++ b/target/linux/generic/patches-3.3/950-vm_exports.patch @@ -71,7 +71,7 @@ --- a/mm/memory.c +++ b/mm/memory.c -@@ -1404,6 +1404,7 @@ unsigned long zap_page_range(struct vm_a +@@ -1412,6 +1412,7 @@ unsigned long zap_page_range(struct vm_a tlb_finish_mmu(&tlb, address, end); return end; } @@ -79,7 +79,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -3079,6 +3080,7 @@ static inline int check_stack_guard_page +@@ -3087,6 +3088,7 @@ static inline int check_stack_guard_page } return 0; } |