2 more .22 patches

diff --git a/queue-2.6.22/powerpc-fix-invalid-semicolon-after-if-statement.patch b/queue-2.6.22/powerpc-fix-invalid-semicolon-after-if-statement.patch
new file mode 100644 (file)
index 0000000..272ac88
--- /dev/null
+++ b/queue-2.6.22/powerpc-fix-invalid-semicolon-after-if-statement.patch
@@ -0,0 +1,38 @@
+From oliver.pntr@gmail.com  Fri Feb  1 16:03:22 2008
+From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
+Date: Sat, 8 Dec 2007 15:47:02 +0100
+Subject: POWERPC: Fix invalid semicolon after if statement
+To: stable@kernel.org
+Message-ID: <6101e8c40712080647r22def0bescdd953813c038184@mail.gmail.com>
+
+From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
+
+Patch 2b02d13996fe28478e45605de9bd8bdca25718de in mainline
+
+[POWERPC] Fix invalid semicolon after if statement
+
+A similar fix to netfilter from Eric Dumazet inspired me to
+look around a bit by using some grep/sed stuff as looking for
+this kind of bugs seemed easy to automate.  This is one of them
+I found where it looks like this semicolon is not valid.
+
+Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
+Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Paul Mackerras <paulus@samba.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/mm/hash_utils_64.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/mm/hash_utils_64.c
++++ b/arch/powerpc/mm/hash_utils_64.c
+@@ -795,7 +795,7 @@ void hash_preload(struct mm_struct *mm, 
+ 
+ #ifdef CONFIG_PPC_MM_SLICES
+       /* We only prefault standard pages for now */
+-      if (unlikely(get_slice_psize(mm, ea) != mm->context.user_psize));
++      if (unlikely(get_slice_psize(mm, ea) != mm->context.user_psize))
+               return;
+ #endif
+ 

diff --git a/queue-2.6.22/series b/queue-2.6.22/series
index 5e6453bc8fc591c52d4997c801ecfdb9d5bbe09a..f9b089ee543171033481e6434fc6556ebff0140f 100644 (file)
--- a/queue-2.6.22/series
+++ b/queue-2.6.22/series
@@ -23,3 +23,5 @@ quicklist-set-tlb-need_flush-if-pages-are-remaining-in-quicklist-0.patch
 cxgb-fix-t2-gso.patch
 cxgb-fix-stats.patch
 chelsio-fix-skb-dev-setting.patch
+powerpc-fix-invalid-semicolon-after-if-statement.patch
+acpi-apply-quirk_ich6_lpc_acpi-to-more-ich8-and-ich9.patch