[PATCH] powerpc: Remove lppaca structure from the PACA

At present the lppaca - the structure shared with the iSeries
hypervisor and phyp - is contained within the PACA, our own low-level
per-cpu structure.  This doesn't have to be so, the patch below
removes it, making a separate array of lppaca structures.

This saves approximately 500*NR_CPUS bytes of image size and kernel
memory, because we don't need aligning gap between the Linux and
hypervisor portions of every PACA.  On the other hand it means an
extra level of dereference in many accesses to the lppaca.

The patch also gets rid of several places where we assign the paca
address to a local variable for no particular reason.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 9dda16ccde7..1ae96a8ed7e 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -55,15 +55,13 @@ static unsigned long get_purr(void)
 {
         unsigned long sum_purr = 0;
         int cpu;
-        struct paca_struct *lpaca;
 
         for_each_cpu(cpu) {
-                lpaca = paca + cpu;
-                sum_purr += lpaca->lppaca.emulated_time_base;
+                sum_purr += lppaca[cpu].emulated_time_base;
 
 #ifdef PURR_DEBUG
                 printk(KERN_INFO "get_purr for cpu (%d) has value (%ld) \n",
-                        cpu, lpaca->lppaca.emulated_time_base);
+                        cpu, lppaca[cpu].emulated_time_base);
 #endif
         }
         return sum_purr;
@@ -79,12 +77,11 @@ static int lparcfg_data(struct seq_file *m, void *v)
         unsigned long pool_id, lp_index;
         int shared, entitled_capacity, max_entitled_capacity;
         int processors, max_processors;
-        struct paca_struct *lpaca = get_paca();
         unsigned long purr = get_purr();
 
         seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
 
-        shared = (int)(lpaca->lppaca_ptr->shared_proc);
+        shared = (int)(get_lppaca()->shared_proc);
         seq_printf(m, "serial_number=%c%c%c%c%c%c%c\n",
                    e2a(xItExtVpdPanel.mfgID[2]),
                    e2a(xItExtVpdPanel.mfgID[3]),
@@ -402,7 +399,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
                            (h_resource >> 0 * 8) & 0xffff);
 
                 /* pool related entries are apropriate for shared configs */
-                if (paca[0].lppaca.shared_proc) {
+                if (lppaca[0].shared_proc) {
 
                         h_pic(&pool_idle_time, &pool_procs);
 
@@ -451,7 +448,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
         seq_printf(m, "partition_potential_processors=%d\n",
                    partition_potential_processors);
 
-        seq_printf(m, "shared_processor_mode=%d\n", paca[0].lppaca.shared_proc);
+        seq_printf(m, "shared_processor_mode=%d\n", lppaca[0].shared_proc);
 
         return 0;
 }