Skip to content

L
linux
Commit 55212dfe authored by Richard Henderson's avatar Richard Henderson
Browse files
Options

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

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
parents ba1de12c 5b01fb06
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
arch/alpha/lib/ev6-memset.S
View file @ 55212dfe
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
.ent __memset .ent __memset
.align 5 .align 5
__memset: __memset:
memset:
.frame $30,0,$26,0 .frame $30,0,$26,0
.prologue 0 .prologue 0
...@@ -594,3 +593,5 @@ end_w: ...@@ -594,3 +593,5 @@ end_w:
ret $31,($26),1 # L0 : ret $31,($26),1 # L0 :
.end __memsetw .end __memsetw
memset = __memset
arch/alpha/lib/memset.S
View file @ 55212dfe
...@@ -120,8 +120,4 @@ __memsetw: ...@@ -120,8 +120,4 @@ __memsetw:
.end __memsetw .end __memsetw
#ifdef __ELF__ memset = __memset
.weak memset; memset = __memset
#else
.weakext memset, __memset
#endif
fs/proc/proc_misc.c
View file @ 55212dfe
...@@ -412,7 +412,7 @@ static int kstat_read_proc(char *page, char **start, off_t off, ...@@ -412,7 +412,7 @@ static int kstat_read_proc(char *page, char **start, off_t off,
} }
len += sprintf(page + len, "intr %u", sum); 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++) for (i = 0 ; i < NR_IRQS ; i++)
len += sprintf(page + len, " %u", kstat_irqs(i)); len += sprintf(page + len, " %u", kstat_irqs(i));
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7