iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source 
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] nommu: trivial fixups for head-nommu.S and the Makefile
  [ARM] vfp: fix leak of VFP_NAN_FLAG into FPSCR
  [ARM] 3484/1: Correct AEABI CFLAGS for correct enum handling
This commit is contained in:
Linus Torvalds 2006-04-26 15:45:02 -07:00
commit 58f8236bed
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Makefile
View File

@ -66,7 +66,7 @@ tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -
tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
ifeq ($(CONFIG_AEABI),y) ifeq ($(CONFIG_AEABI),y)
CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork
else else
CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
endif endif

2
arch/arm/kernel/Makefile
View File

@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y)
obj-y += io.o obj-y += io.o
endif endif
head-y := head.o head-y := head$(MMUEXT).o
obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_DEBUG_LL) += debug.o
extra-y := $(head-y) init_task.o vmlinux.lds extra-y := $(head-y) init_task.o vmlinux.lds

4
arch/arm/kernel/head-nommu.S
View File

@ -20,10 +20,11 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/constants.h> #include <asm/thread_info.h>
#include <asm/system.h> #include <asm/system.h>
#define PROCINFO_INITFUNC 12 #define PROCINFO_INITFUNC 12
#define MACHINFO_TYPE 0
/* /*
* Kernel startup entry point. * Kernel startup entry point.
@ -79,5 +80,6 @@ __after_proc_init:
mov pc, r13 @ clear the BSS and jump mov pc, r13 @ clear the BSS and jump
@ to start_kernel @ to start_kernel
.ltorg
#include "head-common.S" #include "head-common.S"

2
arch/arm/vfp/vfpdouble.c
View File

@ -197,7 +197,7 @@ u32 vfp_double_normaliseround(int dd, struct vfp_double *vd, u32 fpscr, u32 exce
dd, d, exceptions); dd, d, exceptions);
vfp_put_double(dd, d); vfp_put_double(dd, d);
} }
return exceptions & ~VFP_NAN_FLAG; return exceptions;
} }
/* /*

2
arch/arm/vfp/vfpmodule.c
View File

@ -180,7 +180,7 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs)
* emulate it. * emulate it.
*/ */
} }
return exceptions; return exceptions & ~VFP_NAN_FLAG;
} }
/* /*

2
arch/arm/vfp/vfpsingle.c
View File

@ -203,7 +203,7 @@ u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce
vfp_put_float(sd, d); vfp_put_float(sd, d);
} }
return exceptions & ~VFP_NAN_FLAG; return exceptions;
} }
/* /*