1 files changed, 13 insertions, 12 deletions
diff --git a/bsps/powerpc/qoriq/start/bspsmp.c b/bsps/powerpc/qoriq/start/bspsmp.c
index 376854c5f3..2b85ba7a88 100644
--- a/bsps/powerpc/qoriq/start/bspsmp.c
+++ b/bsps/powerpc/qoriq/start/bspsmp.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
 /*
- * Copyright (c) 2013, 2017 embedded brains GmbH.  All rights reserved.
+ * Copyright (C) 2013, 2017 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -118,11 +118,8 @@ static void bsp_inter_processor_interrupt(void *arg)
 static void setup_boot_page(void)
 {
 #ifdef QORIQ_IS_HYPERVISOR_GUEST
-  qoriq_mmu_context mmu_context;
-
-  qoriq_mmu_context_init(&mmu_context);
-  qoriq_mmu_add(
-    &mmu_context,
+  qoriq_mmu_adjust_and_write_to_tlb1(
+    QORIQ_TLB1_ENTRY_COUNT - 1,
     0xfffff000,
     0xffffffff,
     0,
@@ -130,8 +127,6 @@ static void setup_boot_page(void)
     FSL_EIS_MAS3_SR | FSL_EIS_MAS3_SW,
     0
   );
-  qoriq_mmu_partition(&mmu_context, 1);
-  qoriq_mmu_write_to_tlb1(&mmu_context, QORIQ_TLB1_ENTRY_COUNT - 1);
 #endif
 }
 
@@ -221,17 +216,23 @@ bool _CPU_SMP_Start_processor(uint32_t cpu_index)
 #endif
 }
 
+static rtems_interrupt_entry qoriq_ipi_entry;
+
 void _CPU_SMP_Finalize_initialization(uint32_t cpu_count)
 {
 #ifndef QORIQ_IS_HYPERVISOR_GUEST
   rtems_status_code sc;
 
-  sc = rtems_interrupt_handler_install(
+  rtems_interrupt_entry_initialize(
+    &qoriq_ipi_entry,
+    bsp_inter_processor_interrupt,
+    NULL,
+    "IPI"
+  );
+  sc = rtems_interrupt_entry_install(
     QORIQ_IRQ_IPI_0 + IPI_INDEX,
-    "IPI",
     RTEMS_INTERRUPT_UNIQUE,
-    bsp_inter_processor_interrupt,
-    NULL
+    &qoriq_ipi_entry
   );
   if (sc != RTEMS_SUCCESSFUL) {
     bsp_fatal(QORIQ_FATAL_SMP_IPI_HANDLER_INSTALL);