PERFORCE change 140766 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Apr 27 23:00:23 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140766
Change 140766 by marcel at marcel_xcllnt on 2008/04/27 23:00:08
IFC @140764
Affected files ...
.. //depot/projects/powerpc/bin/sh/arith.h#2 integrate
.. //depot/projects/powerpc/bin/sh/arith.y#2 integrate
.. //depot/projects/powerpc/bin/sh/shell.h#2 integrate
.. //depot/projects/powerpc/sys/conf/files.powerpc#19 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath.c#15 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/clock.c#6 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/locore.S#9 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#11 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#6 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#7 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#5 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#5 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#6 integrate
.. //depot/projects/powerpc/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/powerpc/sys/powerpc/booke/trap_subr.S#3 integrate
.. //depot/projects/powerpc/sys/powerpc/conf/NOTES#11 integrate
.. //depot/projects/powerpc/sys/powerpc/include/cpufunc.h#6 integrate
.. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#13 integrate
.. //depot/projects/powerpc/sys/powerpc/include/smp.h#7 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#13 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#22 integrate
.. //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#11 integrate
Differences ...
==== //depot/projects/powerpc/bin/sh/arith.h#2 (text+ko) ====
@@ -27,11 +27,15 @@
* SUCH DAMAGE.
*
* @(#)arith.h 1.1 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/arith.h,v 1.11 2005/08/13 07:59:46 stefanf Exp $
+ * $FreeBSD: src/bin/sh/arith.h,v 1.12 2008/04/27 20:46:45 stefanf Exp $
*/
+#include "shell.h"
+
+#define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3)
+
extern char *arith_buf, *arith_startbuf;
-int arith(char *);
+arith_t arith(char *);
void arith_lex_reset(void);
int expcmd(int, char **);
==== //depot/projects/powerpc/bin/sh/arith.y#2 (text+ko) ====
@@ -38,7 +38,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.21 2005/08/13 07:59:46 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.22 2008/04/27 20:46:45 stefanf Exp $");
#include <limits.h>
#include <stdio.h>
@@ -75,7 +75,10 @@
exp:
expr
- { return ($1); }
+ {
+ *YYPARSE_PARAM = $1;
+ return (0);
+ }
;
expr:
@@ -259,12 +262,13 @@
#include "output.h"
#include "memalloc.h"
-#define lstrlen(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3)
+#define YYPARSE_PARAM_TYPE arith_t *
+#define YYPARSE_PARAM result
char *arith_buf, *arith_startbuf;
int yylex(void);
-int yyparse(void);
+int yyparse(YYPARSE_PARAM_TYPE);
static int
arith_assign(char *name, arith_t value)
@@ -272,22 +276,22 @@
char *str;
int ret;
- str = (char *)ckmalloc(lstrlen(value));
+ str = (char *)ckmalloc(DIGITS(value));
sprintf(str, ARITH_FORMAT_STR, value);
ret = setvarsafe(name, str, 0);
free(str);
return ret;
}
-int
+arith_t
arith(char *s)
{
- long result;
+ arith_t result;
arith_buf = arith_startbuf = s;
INTOFF;
- result = yyparse();
+ yyparse(&result);
arith_lex_reset(); /* Reprime lex. */
INTON;
@@ -313,7 +317,7 @@
char *p;
char *concat;
char **ap;
- long i;
+ arith_t i;
if (argc > 1) {
p = argv[1];
@@ -338,7 +342,7 @@
i = arith(p);
- out1fmt("%ld\n", i);
+ out1fmt(ARITH_FORMAT_STR "\n", i);
return !i;
}
==== //depot/projects/powerpc/bin/sh/shell.h#2 (text+ko) ====
@@ -30,9 +30,14 @@
* SUCH DAMAGE.
*
* @(#)shell.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/shell.h,v 1.17 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/shell.h,v 1.18 2008/04/27 20:46:45 stefanf Exp $
*/
+#ifndef SHELL_H_
+#define SHELL_H_
+
+#include <inttypes.h>
+
/*
* The follow should be set to reflect the type of system you have:
* JOBS -> 1 if you have Berkeley job control, 0 otherwise.
@@ -50,10 +55,10 @@
/*
* Type of used arithmetics. SUSv3 requires us to have at least signed long.
*/
-typedef long arith_t;
-#define ARITH_FORMAT_STR "%ld"
-#define atoarith_t(arg) strtol(arg, NULL, 0)
-#define strtoarith_t(nptr, endptr, base) strtol(nptr, endptr, base)
+typedef intmax_t arith_t;
+#define ARITH_FORMAT_STR "%" PRIdMAX
+#define atoarith_t(arg) strtoimax(arg, NULL, 0)
+#define strtoarith_t(nptr, endptr, base) strtoimax(nptr, endptr, base)
typedef void *pointer;
#define STATIC static
@@ -68,3 +73,5 @@
#else
#define TRACE(param)
#endif
+
+#endif /* !SHELL_H_ */
==== //depot/projects/powerpc/sys/conf/files.powerpc#19 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.75 2008/04/26 17:57:28 raj Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.76 2008/04/27 22:33:41 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -68,7 +68,7 @@
powerpc/aim/locore.S optional aim no-obj
powerpc/aim/machdep.c optional aim
powerpc/aim/mmu_oea.c optional aim
-powerpc/aim/mp_cpudep.c optional smp
+powerpc/aim/mp_cpudep.c optional aim smp
powerpc/aim/nexus.c optional aim
powerpc/aim/ofw_machdep.c optional aim
powerpc/aim/ofwmagic.S optional aim
==== //depot/projects/powerpc/sys/dev/ath/if_ath.c#15 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.180 2008/04/20 20:35:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.181 2008/04/27 22:03:56 sam Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -5920,7 +5920,12 @@
ath_hal_setregdomain(ah, 0);
/* XXX not quite right but close enough for now */
getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE);
+
+ /* NB: restore previous state */
ath_hal_setregdomain(ah, ord);
+ (void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
+ ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
+ ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
}
static int
==== //depot/projects/powerpc/sys/powerpc/aim/clock.c#6 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.33 2008/04/22 19:38:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.34 2008/04/27 22:33:42 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/powerpc/sys/powerpc/aim/locore.S#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/powerpc/aim/locore.S,v 1.26 2008/04/16 23:28:11 marcel Exp $ */
+/* $FreeBSD: src/sys/powerpc/aim/locore.S,v 1.28 2008/04/27 22:33:42 marcel Exp $ */
/* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
/*-
@@ -77,20 +77,21 @@
.globl kernbase
.set kernbase, KERNBASE
+#define TMPSTKSZ 8192 /* 8K temporary stack */
+
/*
* Globals
*/
.data
.align 4
GLOBAL(tmpstk)
- .space 8192
+ .space TMPSTKSZ
GLOBAL(esym)
.long 0 /* end of symbol table */
GLOBAL(ofmsr)
.long 0, 0, 0, 0, 0 /* msr/sprg0-3 used in Open Firmware */
-#define INTSTK 16384 /* 16K interrupt stack */
#define INTRCNT_COUNT 256 /* max(HROWPIC_IRQMAX,OPENPIC_IRQMAX) */
GLOBAL(intrnames)
.space INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
@@ -152,9 +153,8 @@
stw 5,openfirmware_entry at l(8) /* save client interface handler */
mr 3,5
- lis 1,tmpstk at ha
- addi 1,1,tmpstk at l
- addi 1,1,8192-16
+ lis 1,(tmpstk+TMPSTKSZ-16)@ha
+ addi 1,1,(tmpstk+TMPSTKSZ-16)@l
mfmsr 0
lis 9,ofmsr at ha
==== //depot/projects/powerpc/sys/powerpc/aim/machdep.c#11 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.114 2008/04/25 05:18:49 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.115 2008/04/27 22:33:42 marcel Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -238,7 +238,9 @@
extern char kernel_text[], _end[];
+#ifdef SMP
extern void *rstcode, *rstsize;
+#endif
extern void *trapcode, *trapsize;
extern void *alitrap, *alisize;
extern void *dsitrap, *dsisize;
@@ -323,7 +325,11 @@
*/
mtmsr(mfmsr() & ~(PSL_IR | PSL_DR));
isync();
- bcopy(&rstcode, (void *)EXC_RST, (size_t)&rstsize);
+#ifdef SMP
+ bcopy(&rstcode, (void *)EXC_RST, (size_t)&rstsize);
+#else
+ bcopy(&trapcode, (void *)EXC_RST, (size_t)&trapsize);
+#endif
bcopy(&trapcode, (void *)EXC_MCHK, (size_t)&trapsize);
bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize);
bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize);
@@ -340,7 +346,7 @@
bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize);
bcopy(&trapcode, (void *)EXC_BPT, (size_t)&trapsize);
#ifdef KDB
- bcopy(&dblow, (void *)EXC_MCHK, (size_t)&dbsize);
+ bcopy(&dblow, (void *)EXC_MCHK, (size_t)&dbsize);
bcopy(&dblow, (void *)EXC_PGM, (size_t)&dbsize);
bcopy(&dblow, (void *)EXC_TRC, (size_t)&dbsize);
bcopy(&dblow, (void *)EXC_BPT, (size_t)&dbsize);
==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#6 (text+ko) ====
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea.c,v 1.119 2008/04/17 00:37:40 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea.c,v 1.120 2008/04/27 22:33:42 marcel Exp $");
/*
* Manages physical address maps.
==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#7 (text+ko) ====
==== //depot/projects/powerpc/sys/powerpc/aim/swtch.S#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/powerpc/aim/swtch.S,v 1.24 2008/03/02 17:05:56 raj Exp $ */
+/* $FreeBSD: src/sys/powerpc/aim/swtch.S,v 1.25 2008/04/27 22:33:42 marcel Exp $ */
/* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
/*-
@@ -127,12 +127,13 @@
lwz %r17,TD_PCB(%r15) /* Store new current PCB */
stw %r17,PC_CURPCB(%r7)
- lwz %r6, PCB_FLAGS(%r17) /* Restore FPU context if needed */
+ lwz %r6, PCB_FLAGS(%r17)
andi. %r16, %r6, PCB_DBREGS
beq .L2
lwz %r16, PCB_DABR(%r17)
mtspr SPR_DABR, %r16
.L2:
+ /* Restore FPU context if needed */
andi. %r6, %r6, PCB_FPU
beq .L3
mr %r3,%r15 /* Pass curthread to enable_fpu */
==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/powerpc/aim/trap_subr.S,v 1.18 2008/03/02 17:05:56 raj Exp $ */
+/* $FreeBSD: src/sys/powerpc/aim/trap_subr.S,v 1.19 2008/04/27 22:33:42 marcel Exp $ */
/* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $ */
/*-
@@ -228,9 +228,8 @@
mfsprg2 %r2; /* restore r2 & r3 */ \
mfsprg3 %r3
-#ifdef KDB
+#ifdef SMP
/*
- * Define the kdb debugger stack
*/
.data
.align 4
@@ -260,8 +259,8 @@
stw %r3,4(%r2) /* trace data: MSR */
sync
- lis %r1,(dbstk+INTSTK)@ha
- addi %r1,%r1,(dbstk+INTSTK)@l
+ lis %r1,(tmpstk+TMPSTKSZ-16)@ha
+ addi %r1,%r1,(tmpstk+TMPSTKSZ-16)@l
addi %r3,%r2,4
stw %r3,0(%r1)
@@ -442,8 +441,8 @@
stw %r30,(PC_DBSAVE +CPUSAVE_R30)(%r1) /* save r30 */
lwz %r31,(PC_DISISAVE+CPUSAVE_R31)(%r1) /* get r31 */
stw %r31,(PC_DBSAVE +CPUSAVE_R31)(%r1) /* save r31 */
- lis %r1,dbstk+INTSTK at ha /* get new SP */
- addi %r1,%r1,dbstk+INTSTK at l
+ lis %r1,(tmpstk+TMPSTKSZ-16)@ha /* get new SP */
+ addi %r1,%r1,(tmpstk+TMPSTKSZ-16)@l
b dbtrap
#endif
@@ -590,8 +589,8 @@
stw %r30,(PC_DBSAVE+CPUSAVE_R30)(%r1) /* free r30 */
stw %r31,(PC_DBSAVE+CPUSAVE_R31)(%r1) /* free r31 */
mflr %r28 /* save LR */
- lis %r1,dbstk+INTSTK at ha /* get new SP */
- addi %r1,%r1,dbstk+INTSTK at l
+ lis %r1,(tmpstk+TMPSTKSZ-16)@ha /* get new SP */
+ addi %r1,%r1,(tmpstk+TMPSTKSZ-16)@l
bla dbtrap
CNAME(dbsize) = .-CNAME(dblow)
#endif /* KDB */
==== //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD: src/sys/powerpc/aim/vm_machdep.c,v 1.120 2008/03/12 10:12:00 jeff Exp $
+ * $FreeBSD: src/sys/powerpc/aim/vm_machdep.c,v 1.121 2008/04/27 22:33:42 marcel Exp $
*/
/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
==== //depot/projects/powerpc/sys/powerpc/booke/pmap.c#2 (text+ko) ====
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.1 2008/03/03 17:17:00 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.2 2008/04/27 21:04:54 marcel Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -379,20 +379,6 @@
};
MMU_DEF(booke_mmu);
-/*
- * This routine defines the region(s) of memory that should
- * not be tested for the modified bit.
- */
-static __inline int
-track_modified_needed(pmap_t pmap, vm_offset_t va)
-{
-
- if (pmap == kernel_pmap)
- return ((va < kmi.clean_sva) || (va >= kmi.clean_eva));
- else
- return (1);
-}
-
/* Return number of entries in TLB0. */
static __inline void
tlb0_get_tlbconf(void)
@@ -780,10 +766,8 @@
if (PTE_ISMANAGED(pte)) {
/* Handle modified pages. */
- if (PTE_ISMODIFIED(pte)) {
- if (track_modified_needed(pmap, va))
- vm_page_dirty(m);
- }
+ if (PTE_ISMODIFIED(pte))
+ vm_page_dirty(m);
/* Referenced pages. */
if (PTE_ISREFERENCED(pte))
@@ -1487,10 +1471,8 @@
pte->flags |= PTE_UW;
} else {
/* Handle modified pages, sense modify status. */
- if (PTE_ISMODIFIED(pte)) {
- if (track_modified_needed(pmap, va))
- vm_page_dirty(m);
- }
+ if (PTE_ISMODIFIED(pte))
+ vm_page_dirty(m);
}
/* If we're turning on execute permissions, flush the icache. */
@@ -1809,10 +1791,8 @@
m = PHYS_TO_VM_PAGE(PTE_PA(pte));
/* Handle modified pages. */
- if (PTE_ISMODIFIED(pte)) {
- if (track_modified_needed(pmap, va))
- vm_page_dirty(m);
- }
+ if (PTE_ISMODIFIED(pte))
+ vm_page_dirty(m);
/* Referenced pages. */
if (PTE_ISREFERENCED(pte))
@@ -1850,11 +1830,8 @@
m = PHYS_TO_VM_PAGE(PTE_PA(pte));
/* Handle modified pages. */
- if (PTE_ISMODIFIED(pte)) {
- if (track_modified_needed(pv->pv_pmap,
- pv->pv_va))
- vm_page_dirty(m);
- }
+ if (PTE_ISMODIFIED(pte))
+ vm_page_dirty(m);
/* Referenced pages. */
if (PTE_ISREFERENCED(pte))
@@ -2055,9 +2032,6 @@
if (!PTE_ISVALID(pte))
goto make_sure_to_unlock;
- if (!track_modified_needed(pv->pv_pmap, pv->pv_va))
- goto make_sure_to_unlock;
-
if (PTE_ISMODIFIED(pte)) {
PMAP_UNLOCK(pv->pv_pmap);
return (TRUE);
@@ -2138,9 +2112,6 @@
if (!PTE_ISVALID(pte))
goto make_sure_to_unlock;
- if (!track_modified_needed(pv->pv_pmap, pv->pv_va))
- goto make_sure_to_unlock;
-
if (PTE_ISREFERENCED(pte)) {
pte->flags &= ~PTE_REFERENCED;
tlb0_flush_entry(pv->pv_pmap, pv->pv_va);
==== //depot/projects/powerpc/sys/powerpc/booke/trap_subr.S#3 (text+ko) ====
@@ -26,7 +26,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/booke/trap_subr.S,v 1.1 2008/03/03 17:17:00 raj Exp $
+ * $FreeBSD: src/sys/powerpc/booke/trap_subr.S,v 1.2 2008/04/27 22:33:42 marcel Exp $
*/
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
==== //depot/projects/powerpc/sys/powerpc/conf/NOTES#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.16 2008/03/04 03:05:53 marcel Exp $
+# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.17 2008/04/27 22:33:42 marcel Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
==== //depot/projects/powerpc/sys/powerpc/include/cpufunc.h#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.23 2008/04/27 17:13:22 marcel Exp $
+ * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.24 2008/04/27 22:33:42 marcel Exp $
*/
#ifndef _MACHINE_CPUFUNC_H_
==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#13 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.26 2008/03/06 16:59:36 marcel Exp $
+ * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.27 2008/04/27 22:33:42 marcel Exp $
*/
#ifndef _MACHINE_PCPU_H_
==== //depot/projects/powerpc/sys/powerpc/include/smp.h#7 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2006 Marcel Moolenaar
+ * Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/smp.h,v 1.2 2008/04/27 19:51:34 marcel Exp $
*/
#ifndef _MACHINE_SMP_H_
==== //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#13 (text+ko) ====
@@ -57,7 +57,7 @@
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20
*
- * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.21 2008/04/11 03:26:40 jeff Exp $
+ * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.22 2008/04/27 22:33:43 marcel Exp $
*/
#include <sys/param.h>
@@ -100,7 +100,10 @@
static u_int nvectors; /* Allocated vectors */
static u_int stray_count;
+#ifdef SMP
static void *ipi_cookie;
+#endif
+
static u_int ipi_irq;
device_t pic;
@@ -201,7 +204,10 @@
powerpc_enable_intr(void)
{
struct powerpc_intr *i;
- int error, vector;
+#ifdef SMP
+ int error;
+#endif
+ int vector;
if (pic == NULL)
panic("no PIC detected\n");
==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#22 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2006-2008 Marcel Moolenaar
+ * Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mp_machdep.c,v 1.15 2008/04/27 22:33:43 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@
cpu_topo(void)
{
- return smp_topo_none();
+ return (smp_topo_none());
}
void
==== //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#11 (text+ko) ====
@@ -22,7 +22,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/powerpc/powerpc/openpic.c,v 1.18 2008/03/07 22:08:43 marcel Exp $
+ * $FreeBSD: src/sys/powerpc/powerpc/openpic.c,v 1.19 2008/04/27 22:33:43 marcel Exp $
*/
#include <sys/param.h>
More information about the p4-projects
mailing list