Module Name:    src
Committed By:   macallan
Date:           Sun Mar 29 12:00:02 UTC 2015

Modified Files:
        src/sys/arch/mips/include: cpuset.h types.h

Log Message:
use 32bit __cpuset_t in o32 kernels
ok matt@


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/include/cpuset.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mips/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/include/cpuset.h
diff -u src/sys/arch/mips/include/cpuset.h:1.2 src/sys/arch/mips/include/cpuset.h:1.3
--- src/sys/arch/mips/include/cpuset.h:1.2	Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/include/cpuset.h	Sun Mar 29 12:00:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuset.h,v 1.2 2011/02/20 07:45:47 matt Exp $	*/
+/*	$NetBSD: cpuset.h,v 1.3 2015/03/29 12:00:02 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -33,10 +33,15 @@
 
 #define	CPUSET_SINGLE(cpu)		((__cpuset_t)1 << (cpu))
 
+#if defined(__mips_o32)
+#define	CPUSET_ADD(set, cpu)		atomic_or_32(&(set), CPUSET_SINGLE(cpu))
+#define	CPUSET_DEL(set, cpu)		atomic_and_32(&(set), ~CPUSET_SINGLE(cpu))
+#define	CPUSET_SUB(set1, set2)		atomic_and_32(&(set1), ~(set2))
+#else
 #define	CPUSET_ADD(set, cpu)		atomic_or_64(&(set), CPUSET_SINGLE(cpu))
 #define	CPUSET_DEL(set, cpu)		atomic_and_64(&(set), ~CPUSET_SINGLE(cpu))
 #define	CPUSET_SUB(set1, set2)		atomic_and_64(&(set1), ~(set2))
-
+#endif
 #define	CPUSET_EXCEPT(set, cpu)		((set) & ~CPUSET_SINGLE(cpu))
 
 #define	CPUSET_HAS_P(set, cpu)		((set) & CPUSET_SINGLE(cpu))

Index: src/sys/arch/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.54 src/sys/arch/mips/include/types.h:1.55
--- src/sys/arch/mips/include/types.h:1.54	Sat Jan  4 00:10:03 2014
+++ src/sys/arch/mips/include/types.h	Sun Mar 29 12:00:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.54 2014/01/04 00:10:03 dsl Exp $	*/
+/*	$NetBSD: types.h,v 1.55 2015/03/29 12:00:02 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -131,9 +131,13 @@ typedef struct label_t {
 #define	PCU_UNIT_COUNT	2
 #endif
 
+#if defined(__mips_o32)
+typedef __uint32_t		__cpuset_t;
+#define	__CPUSET_MAXNUMCPU	32
+#else
 typedef __uint64_t		__cpuset_t;
 #define	__CPUSET_MAXNUMCPU	64
-
+#endif
 typedef	volatile unsigned int	__cpu_simple_lock_t;
 
 #define	__SIMPLELOCK_LOCKED	1

Reply via email to