You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/04/18 15:34:18 UTC

[incubator-nuttx] branch master updated (29005bd79f -> 2e7b10356f)

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


    from 29005bd79f board/arch_fpu*: move arch_[get|cmp]fpu to common arch
     new 9fad9ed66b arch/mips: Remove unneeded group_addrenv call which handled by mips_doirq
     new ef62e1c970 arch/misoc: Remove unneeded group_addrenv call which handled by [lm32|minerva]_doirq
     new d28892e454 arch/xtensa: Remove unneeded group_addrenv call which handled by xtensa_irq_dispatch
     new 2e7b10356f arch/sparc: Remove unneeded group_addrenv call which handled by up_doirq

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/mips/src/common/mips_exit.c                 | 10 ---------
 arch/mips/src/mips32/mips_blocktask.c            |  9 --------
 arch/mips/src/mips32/mips_releasepending.c       |  9 --------
 arch/mips/src/mips32/mips_reprioritizertr.c      |  9 --------
 arch/mips/src/mips32/mips_unblocktask.c          |  9 --------
 arch/misoc/src/lm32/lm32_blocktask.c             |  9 --------
 arch/misoc/src/lm32/lm32_exit.c                  | 10 ---------
 arch/misoc/src/lm32/lm32_releasepending.c        |  9 --------
 arch/misoc/src/lm32/lm32_reprioritizertr.c       |  9 --------
 arch/misoc/src/lm32/lm32_swint.c                 | 28 ------------------------
 arch/misoc/src/lm32/lm32_unblocktask.c           |  9 --------
 arch/misoc/src/minerva/minerva_blocktask.c       |  9 --------
 arch/misoc/src/minerva/minerva_exit.c            | 10 ---------
 arch/misoc/src/minerva/minerva_releasepending.c  |  9 --------
 arch/misoc/src/minerva/minerva_reprioritizertr.c |  9 --------
 arch/misoc/src/minerva/minerva_swint.c           | 28 ------------------------
 arch/misoc/src/minerva/minerva_unblocktask.c     |  9 --------
 arch/sparc/src/common/up_exit.c                  | 10 ---------
 arch/sparc/src/sparc_v8/up_blocktask.c           |  9 --------
 arch/sparc/src/sparc_v8/up_unblocktask.c         |  9 --------
 arch/xtensa/src/common/xtensa_exit.c             | 10 ---------
 21 files changed, 232 deletions(-)


[incubator-nuttx] 03/04: arch/xtensa: Remove unneeded group_addrenv call which handled by xtensa_irq_dispatch

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit d28892e4542adc279ea3ce16cdc01324a0fdf983
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 22:50:34 2022 +0800

    arch/xtensa: Remove unneeded group_addrenv call which handled by xtensa_irq_dispatch
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/xtensa/src/common/xtensa_exit.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c
index 612862de41..bbd050afa1 100644
--- a/arch/xtensa/src/common/xtensa_exit.c
+++ b/arch/xtensa/src/common/xtensa_exit.c
@@ -143,16 +143,6 @@ void up_exit(int status)
 
   nxsched_resume_scheduler(tcb);
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running
-   * task is closed down gracefully (data caches dump, MMU flushed) and
-   * set up the address environment for the new thread at the head of
-   * the ready-to-run list.
-   */
-
-  group_addrenv(tcb);
-#endif
-
   /* Then switch contexts */
 
   xtensa_context_restore(tcb->xcp.regs);


[incubator-nuttx] 01/04: arch/mips: Remove unneeded group_addrenv call which handled by mips_doirq

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 9fad9ed66ba36bf5b4f599b00fd013e9663f9dff
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 22:41:04 2022 +0800

    arch/mips: Remove unneeded group_addrenv call which handled by mips_doirq
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/mips/src/common/mips_exit.c            | 10 ----------
 arch/mips/src/mips32/mips_blocktask.c       |  9 ---------
 arch/mips/src/mips32/mips_releasepending.c  |  9 ---------
 arch/mips/src/mips32/mips_reprioritizertr.c |  9 ---------
 arch/mips/src/mips32/mips_unblocktask.c     |  9 ---------
 5 files changed, 46 deletions(-)

diff --git a/arch/mips/src/common/mips_exit.c b/arch/mips/src/common/mips_exit.c
index 3251c22603..c516cf137a 100644
--- a/arch/mips/src/common/mips_exit.c
+++ b/arch/mips/src/common/mips_exit.c
@@ -137,16 +137,6 @@ void up_exit(int status)
 
   nxsched_resume_scheduler(tcb);
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running
-   * task is closed down gracefully (data caches dump, MMU flushed) and
-   * set up the address environment for the new thread at the head of
-   * the ready-to-run list.
-   */
-
-  group_addrenv(tcb);
-#endif
-
   /* Then switch contexts */
 
   up_fullcontextrestore(tcb->xcp.regs);
diff --git a/arch/mips/src/mips32/mips_blocktask.c b/arch/mips/src/mips32/mips_blocktask.c
index 24496ab9f7..5971f02137 100644
--- a/arch/mips/src/mips32/mips_blocktask.c
+++ b/arch/mips/src/mips32/mips_blocktask.c
@@ -136,15 +136,6 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Reset scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/mips/src/mips32/mips_releasepending.c b/arch/mips/src/mips32/mips_releasepending.c
index 33fa8081c4..4c061e5bd4 100644
--- a/arch/mips/src/mips32/mips_releasepending.c
+++ b/arch/mips/src/mips32/mips_releasepending.c
@@ -107,15 +107,6 @@ void up_release_pending(void)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/mips/src/mips32/mips_reprioritizertr.c b/arch/mips/src/mips32/mips_reprioritizertr.c
index 5d04a58638..7a99968d9c 100644
--- a/arch/mips/src/mips32/mips_reprioritizertr.c
+++ b/arch/mips/src/mips32/mips_reprioritizertr.c
@@ -159,15 +159,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-              /* Make sure that the address environment for the previously
-               * running task is closed down gracefully (data caches dump,
-               * MMU flushed) and set up the address environment for the new
-               * thread at the head of the ready-to-run list.
-               */
-
-              group_addrenv(nexttcb);
-#endif
               /* Update scheduler parameters */
 
               nxsched_resume_scheduler(nexttcb);
diff --git a/arch/mips/src/mips32/mips_unblocktask.c b/arch/mips/src/mips32/mips_unblocktask.c
index c822d2ee0c..586fb4b226 100644
--- a/arch/mips/src/mips32/mips_unblocktask.c
+++ b/arch/mips/src/mips32/mips_unblocktask.c
@@ -122,15 +122,6 @@ void up_unblock_task(struct tcb_s *tcb)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);


[incubator-nuttx] 02/04: arch/misoc: Remove unneeded group_addrenv call which handled by [lm32|minerva]_doirq

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit ef62e1c970e265bd5d58679ef91bed00d8e8f26e
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 22:46:22 2022 +0800

    arch/misoc: Remove unneeded group_addrenv call which handled by [lm32|minerva]_doirq
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/misoc/src/lm32/lm32_blocktask.c             |  9 --------
 arch/misoc/src/lm32/lm32_exit.c                  | 10 ---------
 arch/misoc/src/lm32/lm32_releasepending.c        |  9 --------
 arch/misoc/src/lm32/lm32_reprioritizertr.c       |  9 --------
 arch/misoc/src/lm32/lm32_swint.c                 | 28 ------------------------
 arch/misoc/src/lm32/lm32_unblocktask.c           |  9 --------
 arch/misoc/src/minerva/minerva_blocktask.c       |  9 --------
 arch/misoc/src/minerva/minerva_exit.c            | 10 ---------
 arch/misoc/src/minerva/minerva_releasepending.c  |  9 --------
 arch/misoc/src/minerva/minerva_reprioritizertr.c |  9 --------
 arch/misoc/src/minerva/minerva_swint.c           | 28 ------------------------
 arch/misoc/src/minerva/minerva_unblocktask.c     |  9 --------
 12 files changed, 148 deletions(-)

diff --git a/arch/misoc/src/lm32/lm32_blocktask.c b/arch/misoc/src/lm32/lm32_blocktask.c
index 97f3d5a4ff..9bed1c0201 100644
--- a/arch/misoc/src/lm32/lm32_blocktask.c
+++ b/arch/misoc/src/lm32/lm32_blocktask.c
@@ -136,15 +136,6 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Reset scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/lm32/lm32_exit.c b/arch/misoc/src/lm32/lm32_exit.c
index 8bbcb4addb..08ff71cfb5 100644
--- a/arch/misoc/src/lm32/lm32_exit.c
+++ b/arch/misoc/src/lm32/lm32_exit.c
@@ -127,16 +127,6 @@ void up_exit(int status)
 
   nxsched_resume_scheduler(tcb);
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running
-   * task is closed down gracefully (data caches dump, MMU flushed) and
-   * set up the address environment for the new thread at the head of
-   * the ready-to-run list.
-   */
-
-  group_addrenv(tcb);
-#endif
-
   /* Then switch contexts */
 
   up_fullcontextrestore(tcb->xcp.regs);
diff --git a/arch/misoc/src/lm32/lm32_releasepending.c b/arch/misoc/src/lm32/lm32_releasepending.c
index f36f46ab58..75f88a0bfe 100644
--- a/arch/misoc/src/lm32/lm32_releasepending.c
+++ b/arch/misoc/src/lm32/lm32_releasepending.c
@@ -105,15 +105,6 @@ void up_release_pending(void)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/lm32/lm32_reprioritizertr.c b/arch/misoc/src/lm32/lm32_reprioritizertr.c
index 5203abe962..97a2568b8a 100644
--- a/arch/misoc/src/lm32/lm32_reprioritizertr.c
+++ b/arch/misoc/src/lm32/lm32_reprioritizertr.c
@@ -159,15 +159,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-              /* Make sure that the address environment for the previously
-               * running task is closed down gracefully (data caches dump,
-               * MMU flushed) and set up the address environment for the new
-               * thread at the head of the ready-to-run list.
-               */
-
-              group_addrenv(nexttcb);
-#endif
               /* Update scheduler parameters */
 
               nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/lm32/lm32_swint.c b/arch/misoc/src/lm32/lm32_swint.c
index 3c0b403048..b54336eb00 100644
--- a/arch/misoc/src/lm32/lm32_swint.c
+++ b/arch/misoc/src/lm32/lm32_swint.c
@@ -296,33 +296,5 @@ int lm32_swint(int irq, void *context, void *arg)
     }
 #endif
 
-#if defined(CONFIG_ARCH_FPU) || defined(CONFIG_ARCH_ADDRENV)
-  /* Check for a context switch.  If a context switch occurred, then
-   * g_current_regs will have a different value than it did on entry.  If an
-   * interrupt level context switch has occurred, then restore the floating
-   * point state and the establish the correct address environment before
-   * returning from the interrupt.
-   */
-
-  if (regs != g_current_regs)
-    {
-#ifdef CONFIG_ARCH_FPU
-      /* Restore floating point registers */
-
-      up_restorefpu((uint32_t *)g_current_regs);
-#endif
-
-#ifdef CONFIG_ARCH_ADDRENV
-      /* Make sure that the address environment for the previously
-       * running task is closed down gracefully (data caches dump,
-       * MMU flushed) and set up the address environment for the new
-       * thread at the head of the ready-to-run list.
-       */
-
-      group_addrenv(NULL);
-#endif
-    }
-#endif
-
   return OK;
 }
diff --git a/arch/misoc/src/lm32/lm32_unblocktask.c b/arch/misoc/src/lm32/lm32_unblocktask.c
index bdd6ade3bd..4a6e69decb 100644
--- a/arch/misoc/src/lm32/lm32_unblocktask.c
+++ b/arch/misoc/src/lm32/lm32_unblocktask.c
@@ -122,15 +122,6 @@ void up_unblock_task(struct tcb_s *tcb)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/minerva/minerva_blocktask.c b/arch/misoc/src/minerva/minerva_blocktask.c
index 8390b00c2b..6c6349af40 100644
--- a/arch/misoc/src/minerva/minerva_blocktask.c
+++ b/arch/misoc/src/minerva/minerva_blocktask.c
@@ -136,15 +136,6 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump, MMU
-           * flushed) and set up the address environment for the new thread
-           * at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Reset scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/minerva/minerva_exit.c b/arch/misoc/src/minerva/minerva_exit.c
index 4e8b1f3ad7..90fd7c61c4 100644
--- a/arch/misoc/src/minerva/minerva_exit.c
+++ b/arch/misoc/src/minerva/minerva_exit.c
@@ -127,16 +127,6 @@ void up_exit(int status)
 
   nxsched_resume_scheduler(tcb);
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running task
-   * is closed down gracefully (data caches dump, MMU flushed) and set up the
-   * address environment for the new thread at the head of the ready-to-run
-   * list.
-   */
-
-  group_addrenv(tcb);
-#endif
-
   /* Then switch contexts */
 
   up_fullcontextrestore(tcb->xcp.regs);
diff --git a/arch/misoc/src/minerva/minerva_releasepending.c b/arch/misoc/src/minerva/minerva_releasepending.c
index 5623831c91..56c1441a80 100644
--- a/arch/misoc/src/minerva/minerva_releasepending.c
+++ b/arch/misoc/src/minerva/minerva_releasepending.c
@@ -105,15 +105,6 @@ void up_release_pending(void)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump, MMU
-           * flushed) and set up the address environment for the new thread
-           * at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/minerva/minerva_reprioritizertr.c b/arch/misoc/src/minerva/minerva_reprioritizertr.c
index fcd1b0d3ab..00edf65419 100644
--- a/arch/misoc/src/minerva/minerva_reprioritizertr.c
+++ b/arch/misoc/src/minerva/minerva_reprioritizertr.c
@@ -158,15 +158,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-              /* Make sure that the address environment for the previously
-               * running task is closed down gracefully (data caches dump,
-               * MMU flushed) and set up the address environment for the
-               * new thread at the head of the ready-to-run list.
-               */
-
-              group_addrenv(nexttcb);
-#endif
               /* Update scheduler parameters */
 
               nxsched_resume_scheduler(nexttcb);
diff --git a/arch/misoc/src/minerva/minerva_swint.c b/arch/misoc/src/minerva/minerva_swint.c
index af82f30d60..4b4b2f0711 100644
--- a/arch/misoc/src/minerva/minerva_swint.c
+++ b/arch/misoc/src/minerva/minerva_swint.c
@@ -273,33 +273,5 @@ int minerva_swint(int irq, void *context, void *arg)
     }
 #endif
 
-#if defined(CONFIG_ARCH_FPU) || defined(CONFIG_ARCH_ADDRENV)
-  /* Check for a context switch.  If a context switch occurred, then
-   * g_current_regs will have a different value than it did on entry.  If an
-   * interrupt level context switch has occurred, then restore the floating
-   * point state and the establish the correct address environment before
-   * returning from the interrupt.
-   */
-
-  if (regs != g_current_regs)
-    {
-#ifdef CONFIG_ARCH_FPU
-      /* Restore floating point registers */
-
-      up_restorefpu((uint32_t *) g_current_regs);
-#endif
-
-#ifdef CONFIG_ARCH_ADDRENV
-      /* Make sure that the address environment for the previously running
-       * task is closed down gracefully (data caches dump, MMU flushed) and
-       * set up the address environment for the new thread at the head of
-       * the ready-to-run list.
-       */
-
-      group_addrenv(NULL);
-#endif
-    }
-#endif
-
   return OK;
 }
diff --git a/arch/misoc/src/minerva/minerva_unblocktask.c b/arch/misoc/src/minerva/minerva_unblocktask.c
index 44916489c6..69c4e0a340 100644
--- a/arch/misoc/src/minerva/minerva_unblocktask.c
+++ b/arch/misoc/src/minerva/minerva_unblocktask.c
@@ -122,15 +122,6 @@ void up_unblock_task(struct tcb_s *tcb)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump, MMU
-           * flushed) and set up the address environment for the new thread
-           * at the head of the ready-to-run list.
-           */
-
-          group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);


[incubator-nuttx] 04/04: arch/sparc: Remove unneeded group_addrenv call which handled by up_doirq

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 2e7b10356f16dcb4b0f927e8337f2c008e71f627
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 22:55:05 2022 +0800

    arch/sparc: Remove unneeded group_addrenv call which handled by up_doirq
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/sparc/src/common/up_exit.c          | 10 ----------
 arch/sparc/src/sparc_v8/up_blocktask.c   |  9 ---------
 arch/sparc/src/sparc_v8/up_unblocktask.c |  9 ---------
 3 files changed, 28 deletions(-)

diff --git a/arch/sparc/src/common/up_exit.c b/arch/sparc/src/common/up_exit.c
index 061033b08c..b622154a0d 100644
--- a/arch/sparc/src/common/up_exit.c
+++ b/arch/sparc/src/common/up_exit.c
@@ -156,16 +156,6 @@ void up_exit(int status)
 
   tcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running
-   * task is closed down gracefully (data caches dump, MMU flushed) and
-   * set up the address environment for the new thread at the head of
-   * the ready-to-run list.
-   */
-
-  (void)group_addrenv(tcb);
-#endif
-
   /* Reset scheduler parameters */
 
   nxsched_resume_scheduler(tcb);
diff --git a/arch/sparc/src/sparc_v8/up_blocktask.c b/arch/sparc/src/sparc_v8/up_blocktask.c
index af9dcb4aa7..dc3e7bb8b2 100644
--- a/arch/sparc/src/sparc_v8/up_blocktask.c
+++ b/arch/sparc/src/sparc_v8/up_blocktask.c
@@ -138,15 +138,6 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          (void)group_addrenv(nexttcb);
-#endif
           /* Reset scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/sparc/src/sparc_v8/up_unblocktask.c b/arch/sparc/src/sparc_v8/up_unblocktask.c
index 6785d4c65d..d09511bd1e 100644
--- a/arch/sparc/src/sparc_v8/up_unblocktask.c
+++ b/arch/sparc/src/sparc_v8/up_unblocktask.c
@@ -122,15 +122,6 @@ void up_unblock_task(struct tcb_s *tcb)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          (void)group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);