[PARISC] kill ENTRY_SYS_CPUS (430a502a) · Commits · e / devices / android_kernel_teracube_2e

arch/parisc/kernel/processor.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -337,9 +337,6 @@ show_cpuinfo (struct seq_file m, void v)
		#ifdef CONFIG_SMP
		if (0 == cpu_data[n].hpa)
		continue;
		#ifdef ENTRY_SYS_CPUS
		#error iCOD support wants to show CPU state here
		#endif
		#endif
		seq_printf(m, "processor\t: %d\n"
		"cpu family\t: PA-RISC %s\n",

arch/parisc/kernel/smp.c

+0 −129

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@
		** the Free Software Foundation; either version 2 of the License, or
		** (at your option) any later version.
		*/
		#undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */


		#include <linux/types.h>
		#include <linux/spinlock.h>
		#include <linux/slab.h>
		@@ -116,13 +113,6 @@ enum ipi_message_type {
		static void
		ipi_init(int cpuid)
		{

		/* If CPU is present ... */
		#ifdef ENTRY_SYS_CPUS
		/* and running (not stopped) ... */
		#error iCOD support wants state checked here.
		#endif

		#error verify IRQ_OFFSET(IPI_IRQ) is ipi_interrupt() in new IRQ region

		if(cpu_online(cpuid) )
		@@ -142,23 +132,12 @@ ipi_init(int cpuid)
		static void
		halt_processor(void)
		{
		#ifdef ENTRY_SYS_CPUS
		#error halt_processor() needs rework
		/*
		** o migrate I/O interrupts off this CPU.
		** o leave IPI enabled - __cli() will disable IPI.
		** o leave CPU in online map - just change the state
		*/
		cpu_data[this_cpu].state = STATE_STOPPED;
		mark_bh(IPI_BH);
		#else
		/* REVISIT : redirect I/O Interrupts to another CPU? */
		/* REVISIT : does PM know this CPU isn't available? */
		cpu_clear(smp_processor_id(), cpu_online_map);
		local_irq_disable();
		for (;;)
		;
		#endif
		}


		@@ -238,17 +217,11 @@ ipi_interrupt(int irq, void *dev_id)

		case IPI_CPU_START:
		smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu);
		#ifdef ENTRY_SYS_CPUS
		p->state = STATE_RUNNING;
		#endif
		break;

		case IPI_CPU_STOP:
		smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_STOP\n", this_cpu);
		#ifdef ENTRY_SYS_CPUS
		#else
		halt_processor();
		#endif
		break;

		case IPI_CPU_TEST:
		@@ -561,9 +534,6 @@ int __init smp_boot_one_cpu(int cpuid)
		/* Remember the Slave data */
		smp_debug(100, KERN_DEBUG "SMP: CPU:%d came alive after %ld _us\n",
		cpuid, timeout * 100);
		#ifdef ENTRY_SYS_CPUS
		cpu_data[cpuid].state = STATE_RUNNING;
		#endif
		return 0;
		}

		@@ -571,10 +541,6 @@ void __devinit smp_prepare_boot_cpu(void)
		{
		int bootstrap_processor=cpu_data[0].cpuid; /* CPU ID of BSP */

		#ifdef ENTRY_SYS_CPUS
		cpu_data[0].state = STATE_RUNNING;
		#endif

		/* Setup BSP mappings */
		printk("SMP: bootstrap CPU ID is %d\n",bootstrap_processor);

		@@ -613,101 +579,6 @@ int __cpuinit __cpu_up(unsigned int cpu)
		return cpu_online(cpu) ? 0 : -ENOSYS;
		}



		#ifdef ENTRY_SYS_CPUS
		/* Code goes along with:
		** entry.s: ENTRY_NAME(sys_cpus) / * 215, for cpu stat * /
		*/
		int sys_cpus(int argc, char **argv)
		{
		int i,j=0;
		extern int current_pid(int cpu);

		if( argc > 2 ) {
		printk("sys_cpus:Only one argument supported\n");
		return (-1);
		}
		if ( argc == 1 ){

		#ifdef DUMP_MORE_STATE
		for_each_online_cpu(i) {
		int cpus_per_line = 4;

		if (j++ % cpus_per_line)
		printk(" %3d",i);
		else
		printk("\n %3d",i);
		}
		printk("\n");
		#else
		printk("\n 0\n");
		#endif
		} else if((argc==2) && !(strcmp(argv[1],"-l"))) {
		printk("\nCPUSTATE TASK CPUNUM CPUID HARDCPU(HPA)\n");
		#ifdef DUMP_MORE_STATE
		for_each_online_cpu(i) {
		if (cpu_data[i].cpuid != NO_PROC_ID) {
		switch(cpu_data[i].state) {
		case STATE_RENDEZVOUS:
		printk("RENDEZVS ");
		break;
		case STATE_RUNNING:
		printk((current_pid(i)!=0) ? "RUNNING " : "IDLING ");
		break;
		case STATE_STOPPED:
		printk("STOPPED ");
		break;
		case STATE_HALTED:
		printk("HALTED ");
		break;
		default:
		printk("%08x?", cpu_data[i].state);
		break;
		}
		if(cpu_online(i)) {
		printk(" %4d",current_pid(i));
		}
		printk(" %6d",cpu_number_map(i));
		printk(" %5d",i);
		printk(" 0x%lx\n",cpu_data[i].hpa);
		}
		}
		#else
		printk("\n%s %4d 0 0 --------",
		(current->pid)?"RUNNING ": "IDLING ",current->pid);
		#endif
		} else if ((argc==2) && !(strcmp(argv[1],"-s"))) {
		#ifdef DUMP_MORE_STATE
		printk("\nCPUSTATE CPUID\n");
		for_each_online_cpu(i) {
		if (cpu_data[i].cpuid != NO_PROC_ID) {
		switch(cpu_data[i].state) {
		case STATE_RENDEZVOUS:
		printk("RENDEZVS");break;
		case STATE_RUNNING:
		printk((current_pid(i)!=0) ? "RUNNING " : "IDLING");
		break;
		case STATE_STOPPED:
		printk("STOPPED ");break;
		case STATE_HALTED:
		printk("HALTED ");break;
		default:
		}
		printk(" %5d\n",i);
		}
		}
		#else
		printk("\n%s CPU0",(current->pid==0)?"RUNNING ":"IDLING ");
		#endif
		} else {
		printk("sys_cpus:Unknown request\n");
		return (-1);
		}
		return 0;
		}
		#endif /* ENTRY_SYS_CPUS */

		#ifdef CONFIG_PROC_FS
		int __init
		setup_profiling_timer(unsigned int multiplier)

include/asm-parisc/smp.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -41,14 +41,6 @@ extern void smp_send_all_nop(void);

		#define PROC_CHANGE_PENALTY 15 /* Schedule penalty */

		#undef ENTRY_SYS_CPUS
		#ifdef ENTRY_SYS_CPUS
		#define STATE_RENDEZVOUS 0
		#define STATE_STOPPED 1
		#define STATE_RUNNING 2
		#define STATE_HALTED 3
		#endif

		extern unsigned long cpu_present_mask;

		#define raw_smp_processor_id() (current_thread_info()->cpu)