x86_64/vdso: Move getcpu code from vsyscall_64.c to vdso/vma.c

[sfrench/cifs-2.6.git] / arch / x86 / kernel / vsyscall_64.c

diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 521d5ed1954729533c294eb399e12c4f891d3c7f..2f9ef0c1d112649271fcb28b83fc0a39ede308df 100644 (file)
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -332,49 +332,6 @@ int in_gate_area_no_mm(unsigned long addr)
        return (addr & PAGE_MASK) == VSYSCALL_ADDR;
 }
 
-/*
- * Assume __initcall executes before all user space. Hopefully kmod
- * doesn't violate that. We'll find out if it does.
- */
-static void vsyscall_set_cpu(int cpu)
-{
-       unsigned long d;
-       unsigned long node = 0;
-#ifdef CONFIG_NUMA
-       node = cpu_to_node(cpu);
-#endif
-       if (cpu_has(&cpu_data(cpu), X86_FEATURE_RDTSCP))
-               write_rdtscp_aux((node << 12) | cpu);
-
-       /*
-        * Store cpu number in limit so that it can be loaded quickly
-        * in user space in vgetcpu. (12 bits for the CPU and 8 bits for the node)
-        */
-       d = 0x0f40000000000ULL;
-       d |= cpu;
-       d |= (node & 0xf) << 12;
-       d |= (node >> 4) << 48;
-
-       write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_PER_CPU, &d, DESCTYPE_S);
-}
-
-static void cpu_vsyscall_init(void *arg)
-{
-       /* preemption should be already off */
-       vsyscall_set_cpu(raw_smp_processor_id());
-}
-
-static int
-cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
-{
-       long cpu = (long)arg;
-
-       if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN)
-               smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 1);
-
-       return NOTIFY_DONE;
-}
-
 void __init map_vsyscall(void)
 {
        extern char __vsyscall_page;
@@ -387,17 +344,3 @@ void __init map_vsyscall(void)
        BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
                     (unsigned long)VSYSCALL_ADDR);
 }
-
-static int __init vsyscall_init(void)
-{
-       cpu_notifier_register_begin();
-
-       on_each_cpu(cpu_vsyscall_init, NULL, 1);
-       /* notifier priority > KVM */
-       __hotcpu_notifier(cpu_vsyscall_notifier, 30);
-
-       cpu_notifier_register_done();
-
-       return 0;
-}
-__initcall(vsyscall_init);