- Remove the eintrcnt/eintrnames usage and introduce the concept of

  sintrcnt/sintrnames which are symbols containing the size of the 2
  tables.
- For amd64/i386 remove the storage of intr* stuff from assembly files.
  This area can be widely improved by applying the same to other
  architectures and likely finding an unified approach among them and
  move the whole code to be MI. More work in this area is expected to
  happen fairly soon.

No MFC is previewed for this patch.

Tested by:	pluknet
Reviewed by:	jhb
Approved by:	re (kib)

2 files changed, 8 insertions, 5 deletions

diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index 5ef50a3..fa2f2d5 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -371,14 +371,17 @@ END(rsf_fatal)
 
 	.data
 	_ALIGN_DATA
-	.globl	intrnames, eintrnames
+	.globl	intrnames, sintrnames
 intrnames:
 	.space	IV_MAX * (MAXCOMLEN + 1)
-eintrnames:
-	.globl	intrcnt, eintrcnt
+sintrnames:
+	.word	IV_MAX * (MAXCOMLEN + 1)
+
+	.globl	intrcnt, sintrcnt
 intrcnt:
 	.space	IV_MAX * 8
-eintrcnt:
+sintrcnt:
+	.word	IV_MAX * 8
 
 	.text
 
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index 112ddab..9a7e92f 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -171,7 +171,7 @@ static int
 intrcnt_setname(const char *name, int index)
 {
 
-	if (intrnames + (MAXCOMLEN + 1) * index >= eintrnames)
+	if ((MAXCOMLEN + 1) * index >= sintrnames)
 		return (E2BIG);
 	snprintf(intrnames + (MAXCOMLEN + 1) * index, MAXCOMLEN + 1, "%-*s",
 	    MAXCOMLEN, name);