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

Commit c70fbb01 authored by Russell King's avatar Russell King
Browse files

Merge tag 'nommu-for-rmk' of git://git.pengutronix.de/git/ukl/linux into devel-stable 

Two different fixes for the same problem making some ARM nommu configurations
not boot since 3.6-rc1. The problem is that user_addr_max returned the biggest
available RAM address which makes some copy_from_user variants fail to read
from XIP memory.

Even in the presence of one of the two fixes the other still makes sense, so
both patches are included here.

This problem was the last one preventing efm32 boot to a prompt with mainline.
parents 4b2974fa 83de911c

arch/arm/include/asm/memory.h

+1 −3
Original line number Diff line number Diff line
@@ -91,9 +91,7 @@ 
 * of this define that was meant to.

 * Fortunately, there is no reference for this in noMMU mode, for now.

 */

#ifndef TASK_SIZE

#define TASK_SIZE		(CONFIG_DRAM_SIZE)

#endif

#define TASK_SIZE		UL(0xffffffff)



#ifndef TASK_UNMAPPED_BASE

#define TASK_UNMAPPED_BASE	UL(0x00000000)

arch/arm/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static inline void set_fs(mm_segment_t fs) 
#define access_ok(type,addr,size)	(__range_ok(addr,size) == 0)



#define user_addr_max() \

	(segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)

	(segment_eq(get_fs(), KERNEL_DS) ? ~0UL : get_fs())



/*

 * The "__xxx" versions of the user access functions do not verify the