[kernel] r5525 - dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Fri Jan 20 02:35:08 2006
New Revision: 5525

Modified:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/26_cobalt-ll-sc.dpatch
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/27_cobalt-def_fix.dpatch
Log:
make this stuff apply


Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/26_cobalt-ll-sc.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/26_cobalt-ll-sc.dpatch	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/26_cobalt-ll-sc.dpatch	Fri Jan 20 02:35:08 2006
@@ -34,10 +34,7 @@
 
 exit 0
 
-
-
---- /dev/null
-+++ b/include/asm-mips/cobalt/cpu-feature-overrides.h
++++ b/include/asm-mips/cobalt/cpu-feature-overrides.h	2006-01-19 22:19:28.000000000 +0000
 @@ -0,0 +1,56 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
@@ -51,28 +48,28 @@
 +
 +#include <linux/config.h>
 +
-+#define cpu_has_tlb             1
-+#define cpu_has_4kex            1
-+#define cpu_has_3k_cache        0
-+#define cpu_has_4k_cache        1
-+#define cpu_has_tx39_cache      0
-+#define cpu_has_sb1_cache       0
-+#define cpu_has_fpu             1
-+#define cpu_has_32fpr           1
-+#define cpu_has_counter         1
-+#define cpu_has_watch           0
-+#define cpu_has_divec           1
-+#define cpu_has_vce             0
-+#define cpu_has_cache_cdex_p    0
-+#define cpu_has_cache_cdex_s    0
-+#define cpu_has_prefetch        0
-+#define cpu_has_mcheck          0
-+#define cpu_has_ejtag           0
-+
-+#define cpu_has_subset_pcaches  0
-+#define cpu_dcache_line_size()  32
-+#define cpu_icache_line_size()  32
-+#define cpu_scache_line_size()  0
++#define cpu_has_tlb		1
++#define cpu_has_4kex		1
++#define cpu_has_3k_cache	0
++#define cpu_has_4k_cache	1
++#define cpu_has_tx39_cache	0
++#define cpu_has_sb1_cache	0
++#define cpu_has_fpu		1
++#define cpu_has_32fpr		1
++#define cpu_has_counter		1
++#define cpu_has_watch		0
++#define cpu_has_divec		1
++#define cpu_has_vce		0
++#define cpu_has_cache_cdex_p	0
++#define cpu_has_cache_cdex_s	0
++#define cpu_has_prefetch	0
++#define cpu_has_mcheck		0
++#define cpu_has_ejtag		0
++
++#define cpu_has_subset_pcaches	0
++#define cpu_dcache_line_size()	32
++#define cpu_icache_line_size()	32
++#define cpu_scache_line_size()	0
 +
 +#ifdef CONFIG_64BIT
 +#define cpu_has_llsc            0
@@ -80,19 +77,18 @@
 +#define cpu_has_llsc            1
 +#endif
 +
-+#define cpu_has_mips16          0
-+#define cpu_has_mdmx            0
-+#define cpu_has_mips3d          0
-+#define cpu_has_smartmips       0
-+#define cpu_has_vtag_icache     0
-+#define cpu_has_ic_fills_f_dc   0
-+#define cpu_icache_snoops_remote_store  0
-+#define cpu_has_dsp             0
-+
-+#define cpu_has_mips32r1        0
-+#define cpu_has_mips32r2        0
-+#define cpu_has_mips64r1        0
-+#define cpu_has_mips64r2        0
++#define cpu_has_mips16		0
++#define cpu_has_mdmx		0
++#define cpu_has_mips3d		0
++#define cpu_has_smartmips	0
++#define cpu_has_vtag_icache	0
++#define cpu_has_ic_fills_f_dc	0
++#define cpu_icache_snoops_remote_store	0
++#define cpu_has_dsp		0
++
++#define cpu_has_mips32r1	0
++#define cpu_has_mips32r2	0
++#define cpu_has_mips64r1	0
++#define cpu_has_mips64r2	0
 +
 +#endif /* __ASM_COBALT_CPU_FEATURE_OVERRIDES_H */
-

Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/27_cobalt-def_fix.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/27_cobalt-def_fix.dpatch	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/27_cobalt-def_fix.dpatch	Fri Jan 20 02:35:08 2006
@@ -31,7 +31,7 @@
 exit 0
 
 --- a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h~	2006-01-19 19:21:35.000000000 +0000
-+++ b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h	2006-01-19 19:21:41.000000000 +0000
++++ b/include/asm-mips/cobalt/cpu-feature-overrides.h	2006-01-19 19:21:41.000000000 +0000
 @@ -45,7 +45,7 @@
  #define cpu_has_smartmips	0
  #define cpu_has_vtag_icache	0