tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m68k: fix use of void foo(void) asm("bar") in traps.c

with gcc4 these have file scope, so having them different in different
blocks doesn't work anymore

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds a763be5c 63907435

+18 -18
unified split
+18 -18
arch/m68k/kernel/traps.c
··· 169 169 170 170 if (CPU_IS_060 && !FPU_IS_EMU) { 171 171 /* set up IFPSP entry points */ 172 - asmlinkage void snan_vec(void) asm ("_060_fpsp_snan"); 173 - asmlinkage void operr_vec(void) asm ("_060_fpsp_operr"); 174 - asmlinkage void ovfl_vec(void) asm ("_060_fpsp_ovfl"); 175 - asmlinkage void unfl_vec(void) asm ("_060_fpsp_unfl"); 176 - asmlinkage void dz_vec(void) asm ("_060_fpsp_dz"); 177 - asmlinkage void inex_vec(void) asm ("_060_fpsp_inex"); 178 - asmlinkage void fline_vec(void) asm ("_060_fpsp_fline"); 179 - asmlinkage void unsupp_vec(void) asm ("_060_fpsp_unsupp"); 180 - asmlinkage void effadd_vec(void) asm ("_060_fpsp_effadd"); 172 + asmlinkage void snan_vec6(void) asm ("_060_fpsp_snan"); 173 + asmlinkage void operr_vec6(void) asm ("_060_fpsp_operr"); 174 + asmlinkage void ovfl_vec6(void) asm ("_060_fpsp_ovfl"); 175 + asmlinkage void unfl_vec6(void) asm ("_060_fpsp_unfl"); 176 + asmlinkage void dz_vec6(void) asm ("_060_fpsp_dz"); 177 + asmlinkage void inex_vec6(void) asm ("_060_fpsp_inex"); 178 + asmlinkage void fline_vec6(void) asm ("_060_fpsp_fline"); 179 + asmlinkage void unsupp_vec6(void) asm ("_060_fpsp_unsupp"); 180 + asmlinkage void effadd_vec6(void) asm ("_060_fpsp_effadd"); 181 181 182 - vectors[VEC_FPNAN] = snan_vec; 183 - vectors[VEC_FPOE] = operr_vec; 184 - vectors[VEC_FPOVER] = ovfl_vec; 185 - vectors[VEC_FPUNDER] = unfl_vec; 186 - vectors[VEC_FPDIVZ] = dz_vec; 187 - vectors[VEC_FPIR] = inex_vec; 188 - vectors[VEC_LINE11] = fline_vec; 189 - vectors[VEC_FPUNSUP] = unsupp_vec; 190 - vectors[VEC_UNIMPEA] = effadd_vec; 182 + vectors[VEC_FPNAN] = snan_vec6; 183 + vectors[VEC_FPOE] = operr_vec6; 184 + vectors[VEC_FPOVER] = ovfl_vec6; 185 + vectors[VEC_FPUNDER] = unfl_vec6; 186 + vectors[VEC_FPDIVZ] = dz_vec6; 187 + vectors[VEC_FPIR] = inex_vec6; 188 + vectors[VEC_LINE11] = fline_vec6; 189 + vectors[VEC_FPUNSUP] = unsupp_vec6; 190 + vectors[VEC_UNIMPEA] = effadd_vec6; 191 191 } 192 192 193 193 /* if running on an amiga, make the NMI interrupt do nothing */