[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel

This patch moves the vdso's to arch/powerpc, adds support for the 32
bits vdso to the 32 bits kernel, rename systemcfg (finally !), and adds
some new (still untested) routines to both vdso's: clock_gettime() with
support for CLOCK_REALTIME and CLOCK_MONOTONIC, clock_getres() (same
clocks) and get_tbfreq() for glibc to retreive the timebase frequency.

Tom,Steve: The implementation of get_tbfreq() I've done for 32 bits
returns a long long (r3, r4) not a long. This is such that if we ever
add support for >4Ghz timebases on ppc32, the userland interface won't
have to change.

I have tested gettimeofday() using some glibc patches in both ppc32 and
ppc64 kernels using 32 bits userland (I haven't had a chance to test a
64 bits userland yet, but the implementation didn't change and was
tested earlier). I haven't tested yet the new functions.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 10 insertions, 52 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6791668213e7..fdbd9f9122f2 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -57,7 +57,6 @@
 #include <asm/lmb.h>
 #include <asm/iseries/it_lp_naca.h>
 #include <asm/firmware.h>
-#include <asm/systemcfg.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>
 
@@ -375,9 +374,8 @@ static void __init initialize_cache_info(void)
                                 DBG("Argh, can't find dcache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
-                        _systemcfg->dcache_size = ppc64_caches.dsize = size;
-                        _systemcfg->dcache_line_size =
-                                ppc64_caches.dline_size = lsize;
+                        ppc64_caches.dsize = size;
+                        ppc64_caches.dline_size = lsize;
                         ppc64_caches.log_dline_size = __ilog2(lsize);
                         ppc64_caches.dlines_per_page = PAGE_SIZE / lsize;
 
@@ -393,22 +391,13 @@ static void __init initialize_cache_info(void)
                                 DBG("Argh, can't find icache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
-                        _systemcfg->icache_size = ppc64_caches.isize = size;
-                        _systemcfg->icache_line_size =
-                                ppc64_caches.iline_size = lsize;
+                        ppc64_caches.isize = size;
+                        ppc64_caches.iline_size = lsize;
                         ppc64_caches.log_iline_size = __ilog2(lsize);
                         ppc64_caches.ilines_per_page = PAGE_SIZE / lsize;
                 }
         }
 
-        /* Add an eye catcher and the systemcfg layout version number */
-        strcpy(_systemcfg->eye_catcher, "SYSTEMCFG:PPC64");
-        _systemcfg->version.major = SYSTEMCFG_MAJOR;
-        _systemcfg->version.minor = SYSTEMCFG_MINOR;
-        _systemcfg->processor = mfspr(SPRN_PVR);
-        _systemcfg->platform = _machine;
-        _systemcfg->physicalMemorySize = lmb_phys_mem_size();
-
         DBG(" <- initialize_cache_info()\n");
 }
 
@@ -495,15 +484,14 @@ void __init setup_system(void)
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
-        printk("ppc64_interrupt_controller    = 0x%ld\n", ppc64_interrupt_controller);
-        printk("systemcfg                     = 0x%p\n", _systemcfg);
-        printk("systemcfg->platform           = 0x%x\n", _systemcfg->platform);
-        printk("systemcfg->processorCount     = 0x%lx\n", _systemcfg->processorCount);
-        printk("systemcfg->physicalMemorySize = 0x%lx\n", _systemcfg->physicalMemorySize);
+        printk("ppc64_interrupt_controller    = 0x%ld\n",
+               ppc64_interrupt_controller);
+        printk("platform                      = 0x%x\n", _machine);
+        printk("physicalMemorySize            = 0x%lx\n", lmb_phys_mem_size());
         printk("ppc64_caches.dcache_line_size = 0x%x\n",
-                        ppc64_caches.dline_size);
+               ppc64_caches.dline_size);
         printk("ppc64_caches.icache_line_size = 0x%x\n",
-                        ppc64_caches.iline_size);
+               ppc64_caches.iline_size);
         printk("htab_address                  = 0x%p\n", htab_address);
         printk("htab_hash_mask                = 0x%lx\n", htab_hash_mask);
         printk("-----------------------------------------------------\n");
@@ -568,33 +556,6 @@ static void __init emergency_stack_init(void)
 }
 
 /*
- * Called from setup_arch to initialize the bitmap of available
- * syscalls in the systemcfg page
- */
-void __init setup_syscall_map(void)
-{
-        unsigned int i, count64 = 0, count32 = 0;
-        extern unsigned long *sys_call_table;
-        extern unsigned long sys_ni_syscall;
-
-
-        for (i = 0; i < __NR_syscalls; i++) {
-                if (sys_call_table[i*2] != sys_ni_syscall) {
-                        count64++;
-                        _systemcfg->syscall_map_64[i >> 5] |=
-                                0x80000000UL >> (i & 0x1f);
-                }
-                if (sys_call_table[i*2+1] != sys_ni_syscall) {
-                        count32++;
-                        _systemcfg->syscall_map_32[i >> 5] |=
-                                0x80000000UL >> (i & 0x1f);
-                }
-        }
-        printk(KERN_INFO "Syscall map setup, %d 32-bit and %d 64-bit syscalls\n",
-               count32, count64);
-}
-
-/*
  * Called into from start_kernel, after lock_kernel has been called.
  * Initializes bootmem, which is unsed to manage page allocation until
  * mem_init is called.
@@ -635,9 +596,6 @@ void __init setup_arch(char **cmdline_p)
         do_init_bootmem();
         sparse_init();
 
-        /* initialize the syscall map in systemcfg */
-        setup_syscall_map();
-
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif