Merge with Linux 2.4.0-test2.

4 files changed, 25 insertions, 11 deletions

diff --git a/include/asm-alpha/cache.h b/include/asm-alpha/cache.h
index 5e46073a8..d9483efb1 100644
--- a/include/asm-alpha/cache.h
+++ b/include/asm-alpha/cache.h
@@ -4,9 +4,18 @@
 #ifndef __ARCH_ALPHA_CACHE_H
 #define __ARCH_ALPHA_CACHE_H
 
-/* Bytes per L1 (data) cache line.  Both EV4 and EV5 are write-through,
-   read-allocate, direct-mapped, physical. */
-#define L1_CACHE_BYTES     32
+#include <linux/config.h>
+
+/* Bytes per L1 (data) cache line. */
+#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
+# define L1_CACHE_BYTES     32	/* should be 64, but networking dies */
+#else
+/* Both EV4 and EV5 are write-through, read-allocate,
+   direct-mapped, physical.
+*/
+# define L1_CACHE_BYTES     32
+#endif
+
 #define L1_CACHE_ALIGN(x)  (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
 #define SMP_CACHE_BYTES    L1_CACHE_BYTES
 
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index 27e06783a..a74290f55 100644
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -56,6 +56,11 @@ extern inline void pcibios_set_master(struct pci_dev *dev)
 	/* No special bus mastering setup handling */
 }
 
+extern inline void pcibios_penalize_isa_irq(int irq)
+{
+	/* We don't do dynamic PCI IRQ allocation */
+}
+
 /* IOMMU controls.  */
 
 /* Allocate and map kernel buffer using consistant mode DMA for PCI
diff --git a/include/asm-alpha/string.h b/include/asm-alpha/string.h
index a7cf9557d..2b9cf9438 100644
--- a/include/asm-alpha/string.h
+++ b/include/asm-alpha/string.h
@@ -18,7 +18,7 @@ extern void * memmove(void *, const void *, size_t);
 /* For backward compatibility with modules.  Unused otherwise.  */
 extern void * __memcpy(void *, const void *, size_t);
 
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 #define memcpy __builtin_memcpy
 #endif
 
@@ -27,7 +27,7 @@ extern void * __constant_c_memset(void *, unsigned long, size_t);
 extern void * __memset(void *, int, size_t);
 extern void * memset(void *, int, size_t);
 
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 #define memset(s, c, n)							    \
 (__builtin_constant_p(c)						    \
  ? (__builtin_constant_p(n) && (c) == 0					    \
diff --git a/include/asm-alpha/unaligned.h b/include/asm-alpha/unaligned.h
index cd268017e..8017f6bfa 100644
--- a/include/asm-alpha/unaligned.h
+++ b/include/asm-alpha/unaligned.h
@@ -31,7 +31,7 @@ struct __una_u16 { __u16 x __attribute__((packed)); };
 
 extern inline unsigned long __uldq(const unsigned long * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	const struct __una_u64 *ptr = (const struct __una_u64 *) r11;
 	return ptr->x;
 #else
@@ -50,7 +50,7 @@ extern inline unsigned long __uldq(const unsigned long * r11)
 
 extern inline unsigned long __uldl(const unsigned int * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	const struct __una_u32 *ptr = (const struct __una_u32 *) r11;
 	return ptr->x;
 #else
@@ -69,7 +69,7 @@ extern inline unsigned long __uldl(const unsigned int * r11)
 
 extern inline unsigned long __uldw(const unsigned short * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	const struct __una_u16 *ptr = (const struct __una_u16 *) r11;
 	return ptr->x;
 #else
@@ -92,7 +92,7 @@ extern inline unsigned long __uldw(const unsigned short * r11)
 
 extern inline void __ustq(unsigned long r5, unsigned long * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	struct __una_u64 *ptr = (struct __una_u64 *) r11;
 	ptr->x = r5;
 #else
@@ -117,7 +117,7 @@ extern inline void __ustq(unsigned long r5, unsigned long * r11)
 
 extern inline void __ustl(unsigned long r5, unsigned int * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	struct __una_u32 *ptr = (struct __una_u32 *) r11;
 	ptr->x = r5;
 #else
@@ -142,7 +142,7 @@ extern inline void __ustl(unsigned long r5, unsigned int * r11)
 
 extern inline void __ustw(unsigned long r5, unsigned short * r11)
 {
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 	struct __una_u16 *ptr = (struct __una_u16 *) r11;
 	ptr->x = r5;
 #else