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

Commit 34b8c399 authored by Jody McIntyre's avatar Jody McIntyre
Browse files

Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents eaceec7f 88026842

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Maintained



BUSLOGIC SCSI DRIVER
@@ -834,7 +834,7 @@ P: LinuxTV.org Project 
M: 	linux-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Supported



EATA-DMA SCSI DRIVER
@@ -1284,8 +1284,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git 
S:	Supported



INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS

P:	Vojtech Pavlik

M:	vojtech@suse.cz

P:	Dmitry Torokhov

M:	dtor_core@ameritech.net

L:	linux-input@atrey.karlin.mff.cuni.cz

L:	linux-joystick@atrey.karlin.mff.cuni.cz

T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
@@ -2896,7 +2896,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Maintained



W1 DALLAS'S 1-WIRE BUS

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc5

NAME=Affluent Albatross

EXTRAVERSION =

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/alpha/kernel/machvec_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define CAT1(x,y)  x##y

#define CAT(x,y)   CAT1(x,y)



#define DO_DEFAULT_RTC rtc_port: 0x70

#define DO_DEFAULT_RTC .rtc_port = 0x70



#define DO_EV4_MMU							\

	.max_asn =			EV4_MAX_ASN,			\

arch/arm/kernel/calls.S

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ __syscall_start: 
		.long	sys_wait4

/* 115 */	.long	sys_swapoff

		.long	sys_sysinfo

		.long	sys_ipc_wrapper

		.long	sys_ipc

		.long	sys_fsync

		.long	sys_sigreturn_wrapper

/* 120 */	.long	sys_clone_wrapper
@@ -254,7 +254,7 @@ __syscall_start: 
		.long	sys_fremovexattr

		.long	sys_tkill

		.long	sys_sendfile64

/* 240 */	.long	sys_futex_wrapper

/* 240 */	.long	sys_futex

		.long	sys_sched_setaffinity

		.long	sys_sched_getaffinity

		.long	sys_io_setup
@@ -284,7 +284,7 @@ __syscall_start: 
		.long	sys_fstatfs64

		.long	sys_tgkill

		.long	sys_utimes

/* 270 */	.long	sys_arm_fadvise64_64_wrapper

/* 270 */	.long	sys_arm_fadvise64_64

		.long	sys_pciconfig_iobase

		.long	sys_pciconfig_read

		.long	sys_pciconfig_write
@@ -333,7 +333,7 @@ __syscall_start: 
		.long	sys_inotify_init

		.long	sys_inotify_add_watch

		.long	sys_inotify_rm_watch

		.long	sys_mbind_wrapper

		.long	sys_mbind

/* 320 */	.long	sys_get_mempolicy

		.long	sys_set_mempolicy

__syscall_end:

arch/arm/kernel/entry-armv.S

+49 −0
Original line number Diff line number Diff line
@@ -611,6 +611,47 @@ ENTRY(__switch_to) 
	.globl	__kuser_helper_start

__kuser_helper_start:



/*

 * Reference prototype:

 *

 *	void __kernel_memory_barrier(void)

 *

 * Input:

 *

 *	lr = return address

 *

 * Output:

 *

 *	none

 *

 * Clobbered:

 *

 *	the Z flag might be lost

 *

 * Definition and user space usage example:

 *

 *	typedef void (__kernel_dmb_t)(void);

 *	#define __kernel_dmb (*(__kernel_dmb_t *)0xffff0fa0)

 *

 * Apply any needed memory barrier to preserve consistency with data modified

 * manually and __kuser_cmpxchg usage.

 *

 * This could be used as follows:

 *

 * #define __kernel_dmb() \

 *         asm volatile ( "mov r0, #0xffff0fff; mov lr, pc; sub pc, r0, #95" \

 *	        : : : "lr","cc" )

 */



__kuser_memory_barrier:				@ 0xffff0fa0



#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_SMP)

	mcr	p15, 0, r0, c7, c10, 5	@ dmb

#endif

	mov	pc, lr



	.align	5



/*

 * Reference prototype:

 *
@@ -642,6 +683,8 @@ __kuser_helper_start: 
 * The C flag is also set if *ptr was changed to allow for assembly

 * optimization in the calling code.

 *

 * Note: this routine already includes memory barriers as needed.

 *

 * For example, a user space atomic_add implementation could look like this:

 *

 * #define atomic_add(ptr, val) \
@@ -698,10 +741,16 @@ __kuser_cmpxchg: @ 0xffff0fc0 


#else



#ifdef CONFIG_SMP

	mcr	p15, 0, r0, c7, c10, 5	@ dmb

#endif

	ldrex	r3, [r2]

	subs	r3, r3, r0

	strexeq	r3, r1, [r2]

	rsbs	r0, r3, #0

#ifdef CONFIG_SMP

	mcr	p15, 0, r0, c7, c10, 5	@ dmb

#endif

	mov	pc, lr



#endif