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

Commit 43cbd286 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.11-rc2' of... 

Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.11

A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
parents fee4b700 c5ae4dca

Documentation/cpu-hotplug.txt

+3 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ Q: If i have some kernel code that needs to be aware of CPU arrival and 
A: This is what you would need in your kernel code to receive notifications.



	#include <linux/cpu.h>

	static int __cpuinit foobar_cpu_callback(struct notifier_block *nfb,

	static int foobar_cpu_callback(struct notifier_block *nfb,

				       unsigned long action, void *hcpu)

	{

		unsigned int cpu = (unsigned long)hcpu;
@@ -285,7 +285,7 @@ A: This is what you would need in your kernel code to receive notifications. 
		return NOTIFY_OK;

	}



	static struct notifier_block __cpuinitdata foobar_cpu_notifer =

	static struct notifier_block foobar_cpu_notifer =

	{

	   .notifier_call = foobar_cpu_callback,

	};

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/alpha/kernel/smp.c

+5 −5
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ wait_boot_cpu_to_stop(int cpuid) 
/*

 * Where secondaries begin a life of C.

 */

void __cpuinit

void

smp_callin(void)

{

	int cpuid = hard_smp_processor_id();
@@ -194,7 +194,7 @@ wait_for_txrdy (unsigned long cpumask) 
 * Send a message to a secondary's console.  "START" is one such

 * interesting message.  ;-)

 */

static void __cpuinit

static void

send_secondary_console_msg(char *str, int cpuid)

{

	struct percpu_struct *cpu;
@@ -285,7 +285,7 @@ recv_secondary_console_msg(void) 
/*

 * Convince the console to have a secondary cpu begin execution.

 */

static int __cpuinit

static int

secondary_cpu_start(int cpuid, struct task_struct *idle)

{

	struct percpu_struct *cpu;
@@ -356,7 +356,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) 
/*

 * Bring one cpu online.

 */

static int __cpuinit

static int

smp_boot_one_cpu(int cpuid, struct task_struct *idle)

{

	unsigned long timeout;
@@ -472,7 +472,7 @@ smp_prepare_boot_cpu(void) 
{

}



int __cpuinit

int

__cpu_up(unsigned int cpu, struct task_struct *tidle)

{

	smp_boot_one_cpu(cpu, tidle);

arch/alpha/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


static int opDEC_fix;



static void __cpuinit

static void

opDEC_check(void)

{

	__asm__ __volatile__ (
@@ -1059,7 +1059,7 @@ give_sigbus: 
	return;

}



void __cpuinit

void

trap_init(void)

{

	/* Tell PAL-code what global pointer we want in the kernel.  */

arch/arm/common/mcpm_platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/smp.h>

#include <asm/smp_plat.h>



static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)

static int mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	unsigned int mpidr, pcpu, pcluster, ret;

	extern void secondary_startup(void);
@@ -40,7 +40,7 @@ static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *i 
	return 0;

}



static void __cpuinit mcpm_secondary_init(unsigned int cpu)

static void mcpm_secondary_init(unsigned int cpu)

{

	mcpm_cpu_powered_up();

}