Author: dannf
Date: Sat Oct 14 01:24:43 2006
New Revision: 7607
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/sal-flush-fix.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/3
Log:
* [ia64] bugfix/ia64/sal-flush-fix.patch: delay sal cache flush
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sat Oct 14 01:24:43 2006
@@ -29,9 +29,11 @@
- Show actual CPU information in /proc/cpuinfo
[ dann frazier ]
+ * [ia64]: Fix booting on HP cell systems, thanks to Troy Heber
+ - Enable CONFIG_HUGETLBFS
+ - bugfix/ia64/sal-flush-fix.patch: delay sal cache flush
* bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips
Thanks to Stephen Hemminger for the patch. (Closes: #391382)
- * [ia64] Enable CONFIG_HUGETLBFS
* features/all/drivers/cciss-support-for-gt-2TB-volumes.patch:
Add support for > 2TB volumes
@@ -42,7 +44,7 @@
[ Kyle McMartin ]
* [hppa] Force CROSS_COMPILE=hppa64-linux-gnu- (closes: #389296)
- -- dann frazier <[EMAIL PROTECTED]> Fri, 13 Oct 2006 18:57:24 -0600
+ -- dann frazier <[EMAIL PROTECTED]> Fri, 13 Oct 2006 19:19:18 -0600
linux-2.6 (2.6.18-2) unstable; urgency=low
Added: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/sal-flush-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/sal-flush-fix.patch
Sat Oct 14 01:24:43 2006
@@ -0,0 +1,62 @@
+Upstream status: unsubmitted
+Author: Troy Heber <[EMAIL PROTECTED]>
+
+diff -urpN -urN -X /space/dontdiff linux-2.6.18/arch/ia64/kernel/sal.c
new/arch/ia64/kernel/sal.c
+--- linux-2.6.18/arch/ia64/kernel/sal.c 2006-09-19 21:42:06.000000000
-0600
++++ new/arch/ia64/kernel/sal.c 2006-10-05 10:20:11.000000000 -0600
+@@ -223,12 +223,13 @@ static void __init sal_desc_ap_wakeup(vo
+ */
+ static int sal_cache_flush_drops_interrupts;
+
+-static void __init
++void __init
+ check_sal_cache_flush (void)
+ {
+ unsigned long flags;
+ int cpu;
+- u64 vector;
++ u64 vector, cache_type=3;
++ struct ia64_sal_retval isrv;
+
+ cpu = get_cpu();
+ local_irq_save(flags);
+@@ -243,7 +244,7 @@ check_sal_cache_flush (void)
+ while (!ia64_get_irr(IA64_TIMER_VECTOR))
+ cpu_relax();
+
+- ia64_sal_cache_flush(3);
++ SAL_CALL(isrv, SAL_CACHE_FLUSH, cache_type, 0, 0, 0, 0, 0, 0);
+
+ if (ia64_get_irr(IA64_TIMER_VECTOR)) {
+ vector = ia64_get_ivr();
+@@ -331,7 +332,6 @@ ia64_sal_init (struct ia64_sal_systab *s
+ p += SAL_DESC_SIZE(*p);
+ }
+
+- check_sal_cache_flush();
+ }
+
+ int
+diff -urpN -urN -X /space/dontdiff linux-2.6.18/arch/ia64/kernel/setup.c
new/arch/ia64/kernel/setup.c
+--- linux-2.6.18/arch/ia64/kernel/setup.c 2006-09-19 21:42:06.000000000
-0600
++++ new/arch/ia64/kernel/setup.c 2006-10-05 10:15:39.000000000 -0600
+@@ -458,6 +458,8 @@ setup_arch (char **cmdline_p)
+ cpu_init(); /* initialize the bootstrap CPU */
+ mmu_context_init(); /* initialize context_id bitmap */
+
++ check_sal_cache_flush();
++
+ #ifdef CONFIG_ACPI
+ acpi_boot_init();
+ #endif
+diff -urpN -urN -X /space/dontdiff linux-2.6.18/include/asm-ia64/sal.h
new/include/asm-ia64/sal.h
+--- linux-2.6.18/include/asm-ia64/sal.h 2006-09-19 21:42:06.000000000
-0600
++++ new/include/asm-ia64/sal.h 2006-10-05 10:13:39.000000000 -0600
+@@ -659,6 +659,7 @@ ia64_sal_freq_base (unsigned long which,
+ }
+
+ extern s64 ia64_sal_cache_flush (u64 cache_type);
++extern void __init check_sal_cache_flush (void);
+
+ /* Initialize all the processor and platform level instruction and data
caches */
+ static inline s64
Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/3 Sat Oct 14 01:24:43 2006
@@ -13,3 +13,4 @@
+ features/all/drivers/scsi-ahci-suspend-2.patch
+ features/all/drivers/scsi-ahci-suspend-3.patch
+ features/all/drivers/cciss-support-for-gt-2TB-volumes.patch
++ bugfix/ia64/sal-flush-fix.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
