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

Commit 09d4a80e authored by Len Brown's avatar Len Brown
Browse files

Merge HEAD from ../from-linus

parents d0d59b98 9c2c38a1

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

arch/alpha/oprofile/common.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ op_axp_setup(void) 
	model->reg_setup(&reg, ctr, &sys);



	/* Configure the registers on all cpus.  */

	smp_call_function(model->cpu_setup, &reg, 0, 1);

	(void)smp_call_function(model->cpu_setup, &reg, 0, 1);

	model->cpu_setup(&reg);

	return 0;

}
@@ -86,7 +86,7 @@ op_axp_cpu_start(void *dummy) 
static int

op_axp_start(void)

{

	smp_call_function(op_axp_cpu_start, NULL, 0, 1);

	(void)smp_call_function(op_axp_cpu_start, NULL, 0, 1);

	op_axp_cpu_start(NULL);

	return 0;

}
@@ -101,7 +101,7 @@ op_axp_cpu_stop(void *dummy) 
static void

op_axp_stop(void)

{

	smp_call_function(op_axp_cpu_stop, NULL, 0, 1);

	(void)smp_call_function(op_axp_cpu_stop, NULL, 0, 1);

	op_axp_cpu_stop(NULL);

}

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ menu "Kernel Features" 


config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL #&& n

	depends on EXPERIMENTAL && BROKEN #&& n

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If