Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5
into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
55212dfe · Richard Henderson · ba1de12c · 5b01fb06 · 55212dfe · 55212dfe
Commit 55212dfe authored Jun 26, 2003 by Richard Henderson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

arch/alpha/lib/ev6-memset.S arch/alpha/lib/ev6-memset.S +2 -1

arch/alpha/lib/memset.S arch/alpha/lib/memset.S +1 -5

fs/proc/proc_misc.c fs/proc/proc_misc.c +1 -1

No files found.
--- a/arch/alpha/lib/ev6-memset.S
+++ b/arch/alpha/lib/ev6-memset.S
@@ -38,7 +38,6 @@
 	.ent __memset
 .align 5
 __memset:
-memset:
 	.frame $30,0,$26,0
 	.prologue 0

@@ -594,3 +593,5 @@ end_w:
 	ret $31,($26),1		# L0 :

 	.end __memsetw
+
+memset = __memset
--- a/arch/alpha/lib/memset.S
+++ b/arch/alpha/lib/memset.S
@@ -120,8 +120,4 @@ __memsetw:

 	.end __memsetw

-#ifdef __ELF__
- .weak memset; memset = __memset
-#else
- .weakext memset, __memset
-#endif
+memset = __memset
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -412,7 +412,7 @@ static int kstat_read_proc(char *page, char **start, off_t off,
 	}
 	len += sprintf(page + len, "intr %u", sum);

-#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC64)
+#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC64) && !defined(CONFIG_ALPHA)
 	for (i = 0 ; i < NR_IRQS ; i++)
 		len += sprintf(page + len, " %u", kstat_irqs(i));
 #endif