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

Commit efda9452 authored by David Woodhouse's avatar David Woodhouse
Browse files

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

parents b01f2cc1 36676bcb

CREDITS

+1 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario 
S: Canada



N: Zwane Mwaikambo

E: zwane@linuxpower.ca

W: http://function.linuxpower.ca

E: zwane@arm.linux.org.uk

D: Various driver hacking

D: Lowlevel x86 kernel hacking

D: General debugging

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ S: Maintained 


OPL3-SA2, SA3, and SAx DRIVER

P:	Zwane Mwaikambo

M:	zwane@commfireservices.com

M:	zwane@arm.linux.org.uk

L:	linux-sound@vger.kernel.org

S:	Maintained
@@ -1998,7 +1998,7 @@ S: Maintained 


SC1200 WDT DRIVER

P:	Zwane Mwaikambo

M:	zwane@commfireservices.com

M:	zwane@arm.linux.org.uk

S:	Maintained



SCHEDULER

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 13

EXTRAVERSION =-rc6

EXTRAVERSION =-rc7

NAME=Woozy Numbat



# *DOCUMENTATION*

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ source "mm/Kconfig" 


config NUMA

	bool "NUMA Support (EXPERIMENTAL)"

	depends on DISCONTIGMEM

	depends on DISCONTIGMEM && BROKEN

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory

	  Access).  This option is for configuring high-end multiprocessor

arch/alpha/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ debug_spin_lock(spinlock_t * lock, const char *base_file, int line_no) 
	"	br	1b\n"

	".previous"

	: "=r" (tmp), "=m" (lock->lock), "=r" (stuck)

	: "1" (lock->lock), "2" (stuck) : "memory");

	: "m" (lock->lock), "2" (stuck) : "memory");



	if (stuck < 0) {

		printk(KERN_WARNING
@@ -1115,7 +1115,7 @@ void _raw_write_lock(rwlock_t * lock) 
	".previous"

	: "=m" (*(volatile int *)lock), "=&r" (regx), "=&r" (regy),

	  "=&r" (stuck_lock), "=&r" (stuck_reader)

	: "0" (*(volatile int *)lock), "3" (stuck_lock), "4" (stuck_reader) : "memory");

	: "m" (*(volatile int *)lock), "3" (stuck_lock), "4" (stuck_reader) : "memory");



	if (stuck_lock < 0) {

		printk(KERN_WARNING "write_lock stuck at %p\n", inline_pc);
@@ -1153,7 +1153,7 @@ void _raw_read_lock(rwlock_t * lock) 
	"	br	1b\n"

	".previous"

	: "=m" (*(volatile int *)lock), "=&r" (regx), "=&r" (stuck_lock)

	: "0" (*(volatile int *)lock), "2" (stuck_lock) : "memory");

	: "m" (*(volatile int *)lock), "2" (stuck_lock) : "memory");



	if (stuck_lock < 0) {

		printk(KERN_WARNING "read_lock stuck at %p\n", inline_pc);