diff options
| author | grehan <grehan@FreeBSD.org> | 2002-09-19 04:29:59 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2002-09-19 04:29:59 +0000 |
| commit | 6a8e22903e535e8018c5d4537a1c36d0e47bd583 (patch) | |
| tree | 9c430b70cccb741f1a20b8297396c17b59e89064 | |
| parent | 2e460fc04ba079f0be70f6ff54041d79e8d20fcd (diff) | |
| download | FreeBSD-src-6a8e22903e535e8018c5d4537a1c36d0e47bd583.zip FreeBSD-src-6a8e22903e535e8018c5d4537a1c36d0e47bd583.tar.gz | |
- moved intrcnt/intrnames to locore.s to fix sysctl -a panic
Approved by: benno
| -rw-r--r-- | sys/powerpc/aim/interrupt.c | 6 | ||||
| -rw-r--r-- | sys/powerpc/aim/locore.S | 12 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/interrupt.c | 6 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/locore.S | 12 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/locore.s | 12 |
5 files changed, 36 insertions, 12 deletions
diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c index 491f53d..0ea2311 100644 --- a/sys/powerpc/aim/interrupt.c +++ b/sys/powerpc/aim/interrupt.c @@ -61,12 +61,6 @@ void powerpc_interrupt(struct trapframe *); -u_long intrcnt[1]; -u_long eintrcnt[1]; - -char intrnames[1]; -char eintrnames[1]; - /* * External interrupt install routines */ diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S index cafdeab..697fde8 100644 --- a/sys/powerpc/aim/locore.S +++ b/sys/powerpc/aim/locore.S @@ -93,6 +93,18 @@ GLOBAL(powersave) #define SPILLSTK 4096 /* 4K spill stack */ /* + * Dummy interrupt table to keep sysctl happy until + * it's worked out what to do with naming + */ +GLOBAL(intrnames) + .asciz "dummy" +GLOBAL(eintrnames) + .align 4 +GLOBAL(intrcnt) + .long 0 +GLOBAL(eintrcnt) + +/* * File-scope for locore.S */ idle_u: diff --git a/sys/powerpc/powerpc/interrupt.c b/sys/powerpc/powerpc/interrupt.c index 491f53d..0ea2311 100644 --- a/sys/powerpc/powerpc/interrupt.c +++ b/sys/powerpc/powerpc/interrupt.c @@ -61,12 +61,6 @@ void powerpc_interrupt(struct trapframe *); -u_long intrcnt[1]; -u_long eintrcnt[1]; - -char intrnames[1]; -char eintrnames[1]; - /* * External interrupt install routines */ diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S index cafdeab..697fde8 100644 --- a/sys/powerpc/powerpc/locore.S +++ b/sys/powerpc/powerpc/locore.S @@ -93,6 +93,18 @@ GLOBAL(powersave) #define SPILLSTK 4096 /* 4K spill stack */ /* + * Dummy interrupt table to keep sysctl happy until + * it's worked out what to do with naming + */ +GLOBAL(intrnames) + .asciz "dummy" +GLOBAL(eintrnames) + .align 4 +GLOBAL(intrcnt) + .long 0 +GLOBAL(eintrcnt) + +/* * File-scope for locore.S */ idle_u: diff --git a/sys/powerpc/powerpc/locore.s b/sys/powerpc/powerpc/locore.s index cafdeab..697fde8 100644 --- a/sys/powerpc/powerpc/locore.s +++ b/sys/powerpc/powerpc/locore.s @@ -93,6 +93,18 @@ GLOBAL(powersave) #define SPILLSTK 4096 /* 4K spill stack */ /* + * Dummy interrupt table to keep sysctl happy until + * it's worked out what to do with naming + */ +GLOBAL(intrnames) + .asciz "dummy" +GLOBAL(eintrnames) + .align 4 +GLOBAL(intrcnt) + .long 0 +GLOBAL(eintrcnt) + +/* * File-scope for locore.S */ idle_u: |
