From 553c5666505a40696f29f2ff05c1de901dea7f68 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 26 Nov 2018 12:01:36 -0600
Subject: [PATCH] sched/irq:  Include a few ProcFS-related changes missed in
 commit 1ac95584603258402ea4e9c48977e52f494f4c77

---
 configs/or1k/nsh/defconfig |  1 -
 sched/irq/irq_initialize.c |  2 --
 sched/irq/irq_procfs.c     | 31 +++----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/configs/or1k/nsh/defconfig b/configs/or1k/nsh/defconfig
index b98f5241ec..87e94aaa08 100644
--- a/configs/or1k/nsh/defconfig
+++ b/configs/or1k/nsh/defconfig
@@ -79,7 +79,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=4194304
 CONFIG_RAM_START=0x0000
 CONFIG_RAW_BINARY=y
-CONFIG_SCHED_IRQMONITOR=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=7
 CONFIG_START_MONTH=12
diff --git a/sched/irq/irq_initialize.c b/sched/irq/irq_initialize.c
index c02467299c..a4ac822343 100644
--- a/sched/irq/irq_initialize.c
+++ b/sched/irq/irq_initialize.c
@@ -97,9 +97,7 @@ void irq_initialize(void)
       g_irqvector[i].mscount = 0;
       g_irqvector[i].lscount = 0;
 #endif
-#ifdef CONFIG_SCHED_TICKLESS
       g_irqvector[i].time    = 0;
-#endif
 #endif
     }
 
diff --git a/sched/irq/irq_procfs.c b/sched/irq/irq_procfs.c
index d890a2d1d2..a108d25855 100644
--- a/sched/irq/irq_procfs.c
+++ b/sched/irq/irq_procfs.c
@@ -59,8 +59,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Output format:
- *
- * In Tickless mode (where IRQ timing is available):
  *
  *            1111111111222222222233333333334444444444
  *   1234567890123456789012345678901234567890123456789
@@ -68,37 +66,20 @@
  *   IRQ HANDLER  ARGUMENT    COUNT    RATE    TIME
  *   DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD DDDD
  *
- * In other modes:
- *
- *            11111111112222222222333333333344
- *   12345678901234567890123456789012345678901
- *
- *   IRQ HANDLER  ARGUMENT    COUNT    RATE
- *   DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD
- *
  * NOTE:  This assumes that an address can be represented in 32-bits.  In
  * the typical configuration where CONFIG_HAVE_LONG_LONG=y, the COUNT field
  * may not be wide enough.
  */
 
-#ifdef CONFIG_SCHED_TICKLESS
-#  define HDR_FMT "IRQ HANDLER  ARGUMENT    COUNT    RATE    TIME\n"
-#  define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu %4lu\n"
-#else
-#  define HDR_FMT "IRQ HANDLER  ARGUMENT    COUNT    RATE\n"
-#  define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu\n"
-#endif
+#define HDR_FMT "IRQ HANDLER  ARGUMENT    COUNT    RATE    TIME\n"
+#define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu %4lu\n"
 
 /* Determines the size of an intermediate buffer that must be large enough
  * to handle the longest line generated by this logic (plus a couple of
  * bytes).
  */
 
-#ifdef CONFIG_SCHED_TICKLESS
-#  define IRQ_LINELEN 50
-#else
-#  define IRQ_LINELEN 44
-#endif
+#define IRQ_LINELEN 50
 
 /****************************************************************************
  * Private Types
@@ -198,9 +179,7 @@ static int irq_callback(int irq, FAR struct irq_info_s *info,
   info->mscount = 0;
   info->lscount = 0;
 #endif
-#ifdef CONFIG_SCHED_TICKLESS
   info->time    = 0;
-#endif
   leave_critical_section(flags);
 
   /* Don't bother if count == 0.
@@ -273,11 +252,7 @@ static int irq_callback(int irq, FAR struct irq_info_s *info,
                       (unsigned int)irq,
                       (unsigned long)((uintptr_t)copy.handler),
                       (unsigned long)((uintptr_t)copy.arg),
-#ifdef CONFIG_SCHED_TICKLESS
                       count, intpart, fracpart, copy.time / 1000);
-#else
-                      count, intpart, fracpart);
-#endif
 
   copysize  = procfs_memcpy(irqfile->line, linesize, irqfile->buffer,
                             irqfile->remaining, &irqfile->offset);