Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f8236b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 83d722f7 f13d241b

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)



ifeq ($(CONFIG_AEABI),y)

CFLAGS_ABI	:=-mabi=aapcs -mno-thumb-interwork

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork

else

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

endif

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y) 
  obj-y		+= io.o

endif



head-y			:= head.o

head-y			:= head$(MMUEXT).o

obj-$(CONFIG_DEBUG_LL)	+= debug.o



extra-y := $(head-y) init_task.o vmlinux.lds

arch/arm/kernel/head-nommu.S

+3 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/constants.h>

#include <asm/thread_info.h>

#include <asm/system.h>



#define PROCINFO_INITFUNC       12

#define MACHINFO_TYPE		0



/*

 * Kernel startup entry point.
@@ -79,5 +80,6 @@ __after_proc_init: 


	mov	pc, r13				@ clear the BSS and jump

						@ to start_kernel

	.ltorg



#include "head-common.S"

arch/arm/vfp/vfpdouble.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ u32 vfp_double_normaliseround(int dd, struct vfp_double *vd, u32 fpscr, u32 exce 
			 dd, d, exceptions);

		vfp_put_double(dd, d);

	}

	return exceptions & ~VFP_NAN_FLAG;

	return exceptions;

}



/*

arch/arm/vfp/vfpmodule.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) 
		 * emulate it.

		 */

	}

	return exceptions;

	return exceptions & ~VFP_NAN_FLAG;

}



/*