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

Commit 3f334c20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 

Pull phase two of __cpuinit removal from Paul Gortmaker:
 "With the __cpuinit infrastructure removed earlier, this group of
  commits only removes the function/data tagging that was done with the
  various (now no-op) __cpuinit related prefixes.

  Now that the dust has settled with yesterday's v3.11-rc1, there
  hopefully shouldn't be any new users leaking back in tree, but I think
  we can leave the harmless no-op stubs there for a release as a
  courtesy to those who still have out of tree stuff and weren't paying
  attention.

  Although the commits are against the recent tag to allow for minor
  context refreshes for things like yesterday's v3.11-rc1~ slab content,
  the patches have been largely unchanged for weeks, aside from such
  trivial updates.

  For detail junkies, the largely boring and mostly irrelevant history
  of the patches can be viewed at:

    http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git

  If nothing else, I guess it does at least demonstrate the level of
  involvement required to shepherd such a treewide change to completion.

  This is the same repository of patches that has been applied to the
  end of the daily linux-next branches for the past several weeks"

* 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (28 commits)
  block: delete __cpuinit usage from all block files
  drivers: delete __cpuinit usage from all remaining drivers files
  kernel: delete __cpuinit usage from all core kernel files
  rcu: delete __cpuinit usage from all rcu files
  net: delete __cpuinit usage from all net files
  acpi: delete __cpuinit usage from all acpi files
  hwmon: delete __cpuinit usage from all hwmon files
  cpufreq: delete __cpuinit usage from all cpufreq files
  clocksource+irqchip: delete __cpuinit usage from all related files
  x86: delete __cpuinit usage from all x86 files
  score: delete __cpuinit usage from all score files
  xtensa: delete __cpuinit usage from all xtensa files
  openrisc: delete __cpuinit usage from all openrisc files
  m32r: delete __cpuinit usage from all m32r files
  hexagon: delete __cpuinit usage from all hexagon files
  frv: delete __cpuinit usage from all frv files
  cris: delete __cpuinit usage from all cris files
  metag: delete __cpuinit usage from all metag files
  tile: delete __cpuinit usage from all tile files
  sh: delete __cpuinit usage from all sh files
  ...
parents c66bce9b 0b776b06

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,

	};

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 @@ do_entUnaUser(void __user * va, unsigned long opcode, 
	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();

}

arch/arm/include/asm/arch_timer.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline u64 arch_counter_get_cntvct(void) 
	return cval;

}



static inline void __cpuinit arch_counter_set_user_access(void)

static inline void arch_counter_set_user_access(void)

{

	u32 cntkctl;