kernel: update linux 3.2 to 3.2.14

SVN-Revision: 31222
This commit is contained in:
Jonas Gorski
2012-04-09 14:48:51 +00:00
parent 1a57b05f47
commit 16b4cbcdd6
40 changed files with 88 additions and 264 deletions

View File

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

View File

@@ -39,7 +39,7 @@
#endif /* _KOBJECT_H_ */
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -377,6 +377,43 @@ int add_uevent_var(struct kobj_uevent_en
@@ -378,6 +378,43 @@ int add_uevent_var(struct kobj_uevent_en
EXPORT_SYMBOL_GPL(add_uevent_var);
#if defined(CONFIG_NET)

View File

@@ -71,7 +71,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1385,6 +1385,7 @@ unsigned long zap_page_range(struct vm_a
@@ -1393,6 +1393,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
@@ -3060,6 +3061,7 @@ static inline int check_stack_guard_page
@@ -3068,6 +3069,7 @@ static inline int check_stack_guard_page
}
return 0;
}