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

Commit dc46c790 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for-v3.11-rc/omap-fixes-a' of... 

Merge tag 'for-v3.11-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.12/cleanup

This series removes the currently-unused PRCM macros from
arch/arm/mach-omap2.

Basic test logs are available at:

http://www.pwsan.com/omap/testlogs/drop_unused_prcm_macros_v3.11-rc/20130721211401/

Once, years ago, we thought that it would be good to document the PRCM
register bits in the Linux codebase.  Most folks in the broader
community did not have access to the same documentation, so we thought
that they might be able to use these bits to fix bugs and improve the
code.

We were also able to autogenerate most of these macros, so it was
thought that defining them in advance would reduce the risk of error,
inconsistencies, and merge conflicts caused when patch sets
incrementally defined them by hand.

Well, nice thoughts.  But the first rationale was rendered partially
obsolete when TI started to release public TRM documentation PDFs at
some point in the OMAP3 timeframe.  (Despite their weaknesses, TI's
public OMAP TRMs remain the most useful public documentation available
for any ARM Linux SoC -- at least to the extent of my knowledge.)  And
then the current Linux development tropism towards
development-by-negative-diffstat obliterated the remainder of the
above two philosophies.

So, for the few, the masochistic, out there who wish to continue
developing TI PRCM code, I would ask that you resurrect any
additionally-needed macros from these commits, rather than writing
them manually.  Purely for the sake of a pleasant atavism, perhaps; the
way one appreciates a used bookstore, or a video rental store...

And thanks to the upstream maintainers for being patient while we
adjust.
parents ad81f054 11dab344

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

}