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

Commit 1b15688b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 4b317d21 3bedff1d

Documentation/arm/memory.txt

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

		Kernel Memory Layout on ARM Linux





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

		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

This document describes the virtual memory layout which the Linux

kernel uses for ARM processors.  It indicates which regions are

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

				mapping region.





VMALLOC_END	feffffff	Free for platform use, recommended.

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.

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

				Memory returned by vmalloc/ioremap will

				Memory returned by vmalloc/ioremap will

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 2

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 15

SUBLEVEL = 15

EXTRAVERSION =-rc1

EXTRAVERSION =-rc2

NAME=Affluent Albatross

NAME=Affluent Albatross





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/kernel/armksyms.c

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

EXPORT_SYMBOL(__get_user_1);

EXPORT_SYMBOL(__get_user_2);

EXPORT_SYMBOL(__get_user_2);

EXPORT_SYMBOL(__get_user_4);

EXPORT_SYMBOL(__get_user_4);

EXPORT_SYMBOL(__get_user_8);





EXPORT_SYMBOL(__put_user_1);

EXPORT_SYMBOL(__put_user_1);

EXPORT_SYMBOL(__put_user_2);

EXPORT_SYMBOL(__put_user_2);

arch/arm/kernel/entry-common.S

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

	mov	r0, sp				@ 'regs'

	mov	r2, why				@ 'syscall'

	mov	r2, why				@ 'syscall'

	bl	do_notify_resume

	bl	do_notify_resume

	disable_irq				@ disable interrupts

	b	ret_slow_syscall		@ Check work again

	b	no_work_pending





work_resched:

work_resched:

	bl	schedule

	bl	schedule

arch/arm/kernel/signal.c

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

	 */

	ret |= !valid_user_regs(regs);

	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);

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

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

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

		  &ka->sa.sa_mask);

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

		sigaddset(&tsk->blocked, sig);

	recalc_sigpending();

	recalc_sigpending();

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

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

	}





	if (ret == 0)

		return;



	force_sigsegv(sig, tsk);

}

}





/*

/*