GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 07:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sparc64: Reclaim trap_block[]->hdesc

Browse source 
This really isn't necessary at all, a local variable suits the
job just fine.

This frees up 8 bytes in the trap_block[] that we can use later
to store the per-cpu base addresses.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-03-31 17:15:40 -07:00
parent 03347e2592
commit 557fe0e884
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/include/asm/cpudata_64.h
View file

@ -80,7 +80,7 @@ struct trap_per_cpu {
unsigned int dev_mondo_qmask; unsigned int dev_mondo_qmask;
unsigned int resum_qmask; unsigned int resum_qmask;
unsigned int nonresum_qmask; unsigned int nonresum_qmask;
void *hdesc; unsigned long __unused;
} __attribute__((aligned(64))); } __attribute__((aligned(64)));
extern struct trap_per_cpu trap_block[NR_CPUS]; extern struct trap_per_cpu trap_block[NR_CPUS];
extern void init_cur_cpu_trap(struct thread_info *); extern void init_cur_cpu_trap(struct thread_info *);

14
arch/sparc/kernel/smp_64.c
View file

@ -278,7 +278,7 @@ static unsigned long kimage_addr_to_ra(void *p)
return kern_base + (val - KERNBASE); return kern_base + (val - KERNBASE);
} }
static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, void **descrp)
{ {
extern unsigned long sparc64_ttable_tl0; extern unsigned long sparc64_ttable_tl0;
extern unsigned long kern_locked_tte_data; extern unsigned long kern_locked_tte_data;
@ -298,12 +298,12 @@ static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread
"hvtramp_descr.\n"); "hvtramp_descr.\n");
return; return;
} }
*descrp = hdesc;
hdesc->cpu = cpu; hdesc->cpu = cpu;
hdesc->num_mappings = num_kernel_image_mappings; hdesc->num_mappings = num_kernel_image_mappings;
tb = &trap_block[cpu]; tb = &trap_block[cpu];
tb->hdesc = hdesc;
hdesc->fault_info_va = (unsigned long) &tb->fault_info; hdesc->fault_info_va = (unsigned long) &tb->fault_info;
hdesc->fault_info_pa = kimage_addr_to_ra(&tb->fault_info); hdesc->fault_info_pa = kimage_addr_to_ra(&tb->fault_info);
@ -341,12 +341,12 @@ static struct thread_info *cpu_new_thread = NULL;
static int __cpuinit smp_boot_one_cpu(unsigned int cpu) static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
{ {
struct trap_per_cpu *tb = &trap_block[cpu];
unsigned long entry = unsigned long entry =
(unsigned long)(&sparc64_cpu_startup); (unsigned long)(&sparc64_cpu_startup);
unsigned long cookie = unsigned long cookie =
(unsigned long)(&cpu_new_thread); (unsigned long)(&cpu_new_thread);
struct task_struct *p; struct task_struct *p;
void *descr = NULL;
int timeout, ret; int timeout, ret;
p = fork_idle(cpu); p = fork_idle(cpu);
@ -359,7 +359,8 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
#if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU) #if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
if (ldom_domaining_enabled) if (ldom_domaining_enabled)
ldom_startcpu_cpuid(cpu, ldom_startcpu_cpuid(cpu,
(unsigned long) cpu_new_thread); (unsigned long) cpu_new_thread,
&descr);
else else
#endif #endif
prom_startcpu_cpuid(cpu, entry, cookie); prom_startcpu_cpuid(cpu, entry, cookie);
@ -383,10 +384,7 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
} }
cpu_new_thread = NULL; cpu_new_thread = NULL;
if (tb->hdesc) { kfree(descr);
kfree(tb->hdesc);
tb->hdesc = NULL;
}
return ret; return ret;
} }