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

Configure Feed

Select the types of activity you want to include in your feed.

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

* 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

+8 -6
+1 -1
arch/arm/Makefile
··· 66 66 tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 67 67 68 68 ifeq ($(CONFIG_AEABI),y) 69 - CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork 69 + CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork 70 70 else 71 71 CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) 72 72 endif
+1 -1
arch/arm/kernel/Makefile
··· 29 29 obj-y += io.o 30 30 endif 31 31 32 - head-y := head.o 32 + head-y := head$(MMUEXT).o 33 33 obj-$(CONFIG_DEBUG_LL) += debug.o 34 34 35 35 extra-y := $(head-y) init_task.o vmlinux.lds
+3 -1
arch/arm/kernel/head-nommu.S
··· 20 20 #include <asm/mach-types.h> 21 21 #include <asm/procinfo.h> 22 22 #include <asm/ptrace.h> 23 - #include <asm/constants.h> 23 + #include <asm/thread_info.h> 24 24 #include <asm/system.h> 25 25 26 26 #define PROCINFO_INITFUNC 12 27 + #define MACHINFO_TYPE 0 27 28 28 29 /* 29 30 * Kernel startup entry point. ··· 80 79 81 80 mov pc, r13 @ clear the BSS and jump 82 81 @ to start_kernel 82 + .ltorg 83 83 84 84 #include "head-common.S"
+1 -1
arch/arm/vfp/vfpdouble.c
··· 197 197 dd, d, exceptions); 198 198 vfp_put_double(dd, d); 199 199 } 200 - return exceptions & ~VFP_NAN_FLAG; 200 + return exceptions; 201 201 } 202 202 203 203 /*
+1 -1
arch/arm/vfp/vfpmodule.c
··· 180 180 * emulate it. 181 181 */ 182 182 } 183 - return exceptions; 183 + return exceptions & ~VFP_NAN_FLAG; 184 184 } 185 185 186 186 /*
+1 -1
arch/arm/vfp/vfpsingle.c
··· 203 203 vfp_put_float(sd, d); 204 204 } 205 205 206 - return exceptions & ~VFP_NAN_FLAG; 206 + return exceptions; 207 207 } 208 208 209 209 /*