From: Greg Kroah-Hartman Date: Sun, 26 May 2013 00:32:44 +0000 (+0900) Subject: fix up hlist api change in mmu patch X-Git-Tag: v3.0.81~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3827f2fd7921dfdd3f14291ead217a322e72418f;p=thirdparty%2Fkernel%2Fstable-queue.git fix up hlist api change in mmu patch --- diff --git a/queue-3.0/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch b/queue-3.0/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch index 0b7d220a591..7ec24281be5 100644 --- a/queue-3.0/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch +++ b/queue-3.0/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch @@ -54,12 +54,16 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - mm/mmu_notifier.c | 79 ++++++++++++++++++++++++++---------------------------- - 1 file changed, 39 insertions(+), 40 deletions(-) + mm/mmu_notifier.c | 80 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 40 insertions(+), 40 deletions(-) --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c -@@ -40,48 +40,44 @@ void __mmu_notifier_release(struct mm_st +@@ -37,51 +37,48 @@ static struct srcu_struct srcu; + void __mmu_notifier_release(struct mm_struct *mm) + { + struct mmu_notifier *mn; ++ struct hlist_node *node; int id; /* @@ -71,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman + * ->release returns. */ id = srcu_read_lock(&srcu); -+ hlist_for_each_entry_rcu(mn, &mm->mmu_notifier_mm->list, hlist) ++ hlist_for_each_entry_rcu(mn, node, &mm->mmu_notifier_mm->list, hlist) + /* + * If ->release runs before mmu_notifier_unregister it must be + * handled, as it's the only way for the driver to flush all @@ -132,7 +136,7 @@ Signed-off-by: Greg Kroah-Hartman */ synchronize_srcu(&srcu); } -@@ -302,31 +298,34 @@ void mmu_notifier_unregister(struct mmu_ +@@ -302,31 +299,34 @@ void mmu_notifier_unregister(struct mmu_ { BUG_ON(atomic_read(&mm->mm_count) <= 0); diff --git a/queue-3.4/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch b/queue-3.4/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch index 0b7d220a591..7ec24281be5 100644 --- a/queue-3.4/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch +++ b/queue-3.4/mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch @@ -54,12 +54,16 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - mm/mmu_notifier.c | 79 ++++++++++++++++++++++++++---------------------------- - 1 file changed, 39 insertions(+), 40 deletions(-) + mm/mmu_notifier.c | 80 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 40 insertions(+), 40 deletions(-) --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c -@@ -40,48 +40,44 @@ void __mmu_notifier_release(struct mm_st +@@ -37,51 +37,48 @@ static struct srcu_struct srcu; + void __mmu_notifier_release(struct mm_struct *mm) + { + struct mmu_notifier *mn; ++ struct hlist_node *node; int id; /* @@ -71,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman + * ->release returns. */ id = srcu_read_lock(&srcu); -+ hlist_for_each_entry_rcu(mn, &mm->mmu_notifier_mm->list, hlist) ++ hlist_for_each_entry_rcu(mn, node, &mm->mmu_notifier_mm->list, hlist) + /* + * If ->release runs before mmu_notifier_unregister it must be + * handled, as it's the only way for the driver to flush all @@ -132,7 +136,7 @@ Signed-off-by: Greg Kroah-Hartman */ synchronize_srcu(&srcu); } -@@ -302,31 +298,34 @@ void mmu_notifier_unregister(struct mmu_ +@@ -302,31 +299,34 @@ void mmu_notifier_unregister(struct mmu_ { BUG_ON(atomic_read(&mm->mm_count) <= 0);