.32 patches

diff --git a/queue-2.6.32/alpha-fix-printk-format-errors.patch b/queue-2.6.32/alpha-fix-printk-format-errors.patch
new file mode 100644 (file)
index 0000000..9dcba2a
--- /dev/null
+++ b/queue-2.6.32/alpha-fix-printk-format-errors.patch
@@ -0,0 +1,56 @@
+From 3e073367a57d41e506f20aebb98e308387ce3090 Mon Sep 17 00:00:00 2001
+From: Michael Cree <mcree@orcon.net.nz>
+Date: Wed, 1 Sep 2010 11:25:17 -0400
+Subject: alpha: Fix printk format errors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Michael Cree <mcree@orcon.net.nz>
+
+commit 3e073367a57d41e506f20aebb98e308387ce3090 upstream.
+
+When compiling alpha generic build get errors such as:
+arch/alpha/kernel/err_marvel.c: In function ‘marvel_print_err_cyc’:
+arch/alpha/kernel/err_marvel.c:119: error: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘u64’
+
+Replaced a number of %ld format specifiers with %lld since u64
+is unsigned long long.
+
+Signed-off-by: Michael Cree <mcree@orcon.net.nz>
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/alpha/kernel/err_marvel.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/alpha/kernel/err_marvel.c
++++ b/arch/alpha/kernel/err_marvel.c
+@@ -109,7 +109,7 @@ marvel_print_err_cyc(u64 err_cyc)
+ #define IO7__ERR_CYC__CYCLE__M        (0x7)
+ 
+       printk("%s        Packet In Error: %s\n"
+-             "%s        Error in %s, cycle %ld%s%s\n",
++             "%s        Error in %s, cycle %lld%s%s\n",
+              err_print_prefix, 
+              packet_desc[EXTRACT(err_cyc, IO7__ERR_CYC__PACKET)],
+              err_print_prefix,
+@@ -313,7 +313,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym
+       }
+ 
+       printk("%s      Up Hose Garbage Symptom:\n"
+-             "%s        Source Port: %ld - Dest PID: %ld - OpCode: %s\n", 
++             "%s        Source Port: %lld - Dest PID: %lld - OpCode: %s\n",
+              err_print_prefix,
+              err_print_prefix, 
+              EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_SRC_PORT),
+@@ -552,7 +552,7 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt
+ #define IO7__POX_SPLCMPLT__REM_BYTE_COUNT__M  (0xfff)
+ 
+       printk("%s      Split Completion Error:\n"      
+-             "%s         Source (Bus:Dev:Func): %ld:%ld:%ld\n",
++             "%s         Source (Bus:Dev:Func): %lld:%lld:%lld\n",
+              err_print_prefix,
+              err_print_prefix,
+              EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__SOURCE_BUS),

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 06ae5191a37f048cff9c1312f30d191cb1751424..ef0f8274be2a4c51b49d2212f4a77a75462ca065 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -64,3 +64,4 @@ pata_pdc202xx_old-fix-udma-mode-for-promise-udma33-cards.patch
 pata_pdc202xx_old-fix-UDMA-mode-for-PDC2026x-chipset.patch
 mips-sibyte-fix-m3-tlb-exception-handler-workaround.patch
 sis-agp-remove-sis-760-handled-by-amd64-agp.patch
+alpha-fix-printk-format-errors.patch