8 files changed, 24 insertions, 94 deletions

diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 91e2a6a6fcd4..bf6ab242f047 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -130,4 +130,9 @@ static inline u64 arch_counter_get_cntvct(void)
         return cval;
 }
 
+static inline int arch_timer_arch_init(void)
+{
+        return 0;
+}
+
 #endif
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index bbefb6fdfee2..46f02c3b5015 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -84,11 +84,15 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void (*arm_pm_restart)(char str, const char *cmd);
 EXPORT_SYMBOL_GPL(arm_pm_restart);
 
+void arch_cpu_idle_prepare(void)
+{
+        local_fiq_enable();
+}
 
 /*
  * This is our default idle handler.
  */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
         /*
          * This should do all the clock switching and wait for interrupt
@@ -98,43 +102,6 @@ static void default_idle(void)
         local_irq_enable();
 }
 
-/*
- * The idle thread.
- * We always respect 'hlt_counter' to prevent low power idle.
- */
-void cpu_idle(void)
-{
-        local_fiq_enable();
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        /*
-                         * We need to disable interrupts here to ensure
-                         * we don't miss a wakeup call.
-                         */
-                        local_irq_disable();
-                        if (!need_resched()) {
-                                stop_critical_timings();
-                                default_idle();
-                                start_critical_timings();
-                                /*
-                                 * default_idle functions should always return
-                                 * with IRQs enabled.
-                                 */
-                                WARN_ON(irqs_disabled());
-                        } else {
-                                local_irq_enable();
-                        }
-                }
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void machine_shutdown(void)
 {
 #ifdef CONFIG_SMP
@@ -178,11 +145,7 @@ void __show_regs(struct pt_regs *regs)
 {
         int i;
 
-        printk("CPU: %d    %s  (%s %.*s)\n",
-                raw_smp_processor_id(), print_tainted(),
-                init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
+        show_regs_print_info(KERN_DEFAULT);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("LR is at %s\n", regs->regs[30]);
         printk("pc : [<%016llx>] lr : [<%016llx>] pstate: %08llx\n",
@@ -199,7 +162,6 @@ void __show_regs(struct pt_regs *regs)
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
-        printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
         __show_regs(regs);
 }
 
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 1e22ff9ae153..5d54e3717bf8 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -217,7 +217,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
         /*
          * OK, it's off to the idle thread for us
          */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
diff --git a/arch/arm64/kernel/sys32.S b/arch/arm64/kernel/sys32.S
index 9416d045a687..db01aa978c41 100644
--- a/arch/arm64/kernel/sys32.S
+++ b/arch/arm64/kernel/sys32.S
@@ -84,13 +84,6 @@ compat_sys_readahead_wrapper:
         b       sys_readahead
 ENDPROC(compat_sys_readahead_wrapper)
 
-compat_sys_lookup_dcookie:
-        orr     x0, x0, x1, lsl #32
-        mov     w1, w2
-        mov     w2, w3
-        b       sys_lookup_dcookie
-ENDPROC(compat_sys_lookup_dcookie)
-
 compat_sys_fadvise64_64_wrapper:
         mov     w6, w1
         orr     x1, x2, x3, lsl #32
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index b0ef18d14c3b..a551f88ae2c1 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -32,6 +32,7 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
+#include <linux/clocksource.h>
 
 #include <clocksource/arm_arch_timer.h>
 
@@ -77,10 +78,11 @@ void __init time_init(void)
 {
         u32 arch_timer_rate;
 
-        if (arch_timer_init())
-                panic("Unable to initialise architected timer.\n");
+        clocksource_of_init();
 
         arch_timer_rate = arch_timer_get_rate();
+        if (!arch_timer_rate)
+                panic("Unable to initialise architected timer.\n");
 
         /* Cache the sched_clock multiplier to save a divide in the hot path. */
         sched_clock_mult = NSEC_PER_SEC / arch_timer_rate;
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index b3c5f628bdb4..61d7dd29f756 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -167,13 +167,6 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
         }
 }
 
-void dump_stack(void)
-{
-        dump_backtrace(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *tsk, unsigned long *sp)
 {
         dump_backtrace(NULL, tsk);
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 800aac306a08..f497ca77925a 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -197,24 +197,6 @@ void __init bootmem_init(void)
         max_pfn = max_low_pfn = max;
 }
 
-static inline int free_area(unsigned long pfn, unsigned long end, char *s)
-{
-        unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
-
-        for (; pfn < end; pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                pages++;
-        }
-
-        if (size && s)
-                pr_info("Freeing %s memory: %dK\n", s, size);
-
-        return pages;
-}
-
 /*
  * Poison init memory with an undefined instruction (0x0).
  */
@@ -405,9 +387,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
         poison_init_mem(__init_begin, __init_end - __init_begin);
-        totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
-                                    __phys_to_pfn(__pa(__init_end)),
-                                    "init");
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -418,9 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 {
         if (!keep_initrd) {
                 poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
-                totalram_pages += free_area(__phys_to_pfn(__pa(start)),
-                                            __phys_to_pfn(__pa(end)),
-                                            "initrd");
+                free_reserved_area(start, end, 0, "initrd");
         }
 }
 
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 224b44ab534e..eeecc9c8ed68 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -261,7 +261,7 @@ static void __init create_mapping(phys_addr_t phys, unsigned long virt,
 void __iomem * __init early_io_map(phys_addr_t phys, unsigned long virt)
 {
         unsigned long size, mask;
-        bool page64k = IS_ENABLED(ARM64_64K_PAGES);
+        bool page64k = IS_ENABLED(CONFIG_ARM64_64K_PAGES);
         pgd_t *pgd;
         pud_t *pud;
         pmd_t *pmd;
@@ -391,17 +391,14 @@ int kern_addr_valid(unsigned long addr)
 }
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 #ifdef CONFIG_ARM64_64K_PAGES
-int __meminit vmemmap_populate(struct page *start_page,
-                               unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        return vmemmap_populate_basepages(start_page, size, node);
+        return vmemmap_populate_basepages(start, end, node);
 }
 #else   /* !CONFIG_ARM64_64K_PAGES */
-int __meminit vmemmap_populate(struct page *start_page,
-                               unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        unsigned long addr = (unsigned long)start_page;
-        unsigned long end = (unsigned long)(start_page + size);
+        unsigned long addr = start;
         unsigned long next;
         pgd_t *pgd;
         pud_t *pud;
@@ -434,7 +431,7 @@ int __meminit vmemmap_populate(struct page *start_page,
         return 0;
 }
 #endif  /* CONFIG_ARM64_64K_PAGES */
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 #endif  /* CONFIG_SPARSEMEM_VMEMMAP */