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

Commit 29ac878a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 54c4e6b5 a6c61e9d

Documentation/arm/memory.txt

+3 −1
Original line number Diff line number Diff line 
		Kernel Memory Layout on ARM Linux



		Russell King <rmk@arm.linux.org.uk>

			May 21, 2004 (2.6.6)

		     November 17, 2005 (2.6.15)



This document describes the virtual memory layout which the Linux

kernel uses for ARM processors.  It indicates which regions are
@@ -37,6 +37,8 @@ ff000000 ffbfffff Reserved for future expansion of DMA 
				mapping region.



VMALLOC_END	feffffff	Free for platform use, recommended.

				VMALLOC_END must be aligned to a 2MB

				boundary.



VMALLOC_START	VMALLOC_END-1	vmalloc() / ioremap() space.

				Memory returned by vmalloc/ioremap will

arch/arm/kernel/armksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ EXPORT_SYMBOL(__arch_strncpy_from_user); 
EXPORT_SYMBOL(__get_user_1);

EXPORT_SYMBOL(__get_user_2);

EXPORT_SYMBOL(__get_user_4);

EXPORT_SYMBOL(__get_user_8);



EXPORT_SYMBOL(__put_user_1);

EXPORT_SYMBOL(__put_user_2);

arch/arm/kernel/entry-common.S

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ work_pending: 
	mov	r0, sp				@ 'regs'

	mov	r2, why				@ 'syscall'

	bl	do_notify_resume

	disable_irq				@ disable interrupts

	b	no_work_pending

	b	ret_slow_syscall		@ Check work again



work_resched:

	bl	schedule

arch/arm/kernel/signal.c

+12 −13
Original line number Diff line number Diff line
@@ -595,10 +595,14 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, 
	 */

	ret |= !valid_user_regs(regs);



	if (ret != 0) {

		force_sigsegv(sig, tsk);

		return;

	}



	/*

	 * Block the signal if we were unsuccessful.

	 * Block the signal if we were successful.

	 */

	if (ret != 0) {

	spin_lock_irq(&tsk->sighand->siglock);

	sigorsets(&tsk->blocked, &tsk->blocked,

		  &ka->sa.sa_mask);
@@ -606,12 +610,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, 
		sigaddset(&tsk->blocked, sig);

	recalc_sigpending();

	spin_unlock_irq(&tsk->sighand->siglock);

	}



	if (ret == 0)

		return;



	force_sigsegv(sig, tsk);

}



/*

arch/arm/kernel/vmlinux.lds.S

+5 −1
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ SECTIONS 
	.comment 0 : { *(.comment) }

}



/* those must never be empty */

/*

 * These must never be empty

 * If you have to comment these two assert statements out, your

 * binutils is too old (for other reasons as well)

 */

ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")

ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")