Page MenuHomeFreeBSD
Files F153278397

D29308.diff
No OneTemporary
Actions

D29308.diff
View Options

diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -179,34 +179,6 @@
*__PCPU_PTR(name) += __val; \
} while (0)
-/*
- * Increments the value of the per-cpu counter name. The implementation
- * must be atomic with respect to interrupts.
- */
-#define __PCPU_INC(name) do { \
- CTASSERT(sizeof(__pcpu_type(name)) == 1 || \
- sizeof(__pcpu_type(name)) == 2 || \
- sizeof(__pcpu_type(name)) == 4 || \
- sizeof(__pcpu_type(name)) == 8); \
- if (sizeof(__pcpu_type(name)) == 1) { \
- __asm __volatile("incb %%gs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } else if (sizeof(__pcpu_type(name)) == 2) { \
- __asm __volatile("incw %%gs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } else if (sizeof(__pcpu_type(name)) == 4) { \
- __asm __volatile("incl %%gs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } else if (sizeof(__pcpu_type(name)) == 8) { \
- __asm __volatile("incq %%gs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } \
-} while (0)
-
/*
* Sets the value of the per-cpu variable name to value val.
*/
@@ -239,7 +211,6 @@
#define PCPU_GET(member) __PCPU_GET(pc_ ## member)
#define PCPU_ADD(member, val) __PCPU_ADD(pc_ ## member, val)
-#define PCPU_INC(member) __PCPU_INC(pc_ ## member)
#define PCPU_PTR(member) __PCPU_PTR(pc_ ## member)
#define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val)
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -136,7 +136,6 @@
#define PCPU_GET(member) (get_pcpu()->pc_ ## member)
#define PCPU_ADD(member, value) (get_pcpu()->pc_ ## member += (value))
-#define PCPU_INC(member) PCPU_ADD(member, 1)
#define PCPU_PTR(member) (&get_pcpu()->pc_ ## member)
#define PCPU_SET(member,value) (get_pcpu()->pc_ ## member = (value))
diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h
--- a/sys/arm64/include/pcpu.h
+++ b/sys/arm64/include/pcpu.h
@@ -73,7 +73,6 @@
#define PCPU_GET(member) (pcpup->pc_ ## member)
#define PCPU_ADD(member, value) (pcpup->pc_ ## member += (value))
-#define PCPU_INC(member) PCPU_ADD(member, 1)
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value))
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -169,29 +169,6 @@
*__PCPU_PTR(name) += __val; \
} while (0)
-/*
- * Increments the value of the per-cpu counter name. The implementation
- * must be atomic with respect to interrupts.
- */
-#define __PCPU_INC(name) do { \
- CTASSERT(sizeof(__pcpu_type(name)) == 1 || \
- sizeof(__pcpu_type(name)) == 2 || \
- sizeof(__pcpu_type(name)) == 4); \
- if (sizeof(__pcpu_type(name)) == 1) { \
- __asm __volatile("incb %%fs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } else if (sizeof(__pcpu_type(name)) == 2) { \
- __asm __volatile("incw %%fs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } else if (sizeof(__pcpu_type(name)) == 4) { \
- __asm __volatile("incl %%fs:%0" \
- : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
- : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
- } \
-} while (0)
-
/*
* Sets the value of the per-cpu variable name to value val.
*/
@@ -224,7 +201,6 @@
#define PCPU_GET(member) __PCPU_GET(pc_ ## member)
#define PCPU_ADD(member, val) __PCPU_ADD(pc_ ## member, val)
-#define PCPU_INC(member) __PCPU_INC(pc_ ## member)
#define PCPU_PTR(member) __PCPU_PTR(pc_ ## member)
#define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val)
diff --git a/sys/mips/include/pcpu.h b/sys/mips/include/pcpu.h
--- a/sys/mips/include/pcpu.h
+++ b/sys/mips/include/pcpu.h
@@ -83,7 +83,6 @@
#define PCPU_ADD(member, value) (PCPUP->pc_ ## member += (value))
#define PCPU_GET(member) (PCPUP->pc_ ## member)
-#define PCPU_INC(member) PCPU_ADD(member, 1)
#define PCPU_PTR(member) (&PCPUP->pc_ ## member)
#define PCPU_SET(member,value) (PCPUP->pc_ ## member = (value))
#define PCPU_LAZY_INC(member) (++PCPUP->pc_ ## member)
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -168,7 +168,6 @@
* with respect to preemption.
*/
#define PCPU_ADD(member, value) (pcpup->pc_ ## member += (value))
-#define PCPU_INC(member) PCPU_ADD(member, 1)
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value))
diff --git a/sys/riscv/include/pcpu.h b/sys/riscv/include/pcpu.h
--- a/sys/riscv/include/pcpu.h
+++ b/sys/riscv/include/pcpu.h
@@ -79,7 +79,6 @@
#define PCPU_GET(member) (get_pcpu()->pc_ ## member)
#define PCPU_ADD(member, value) (get_pcpu()->pc_ ## member += (value))
-#define PCPU_INC(member) PCPU_ADD(member, 1)
#define PCPU_PTR(member) (&get_pcpu()->pc_ ## member)
#define PCPU_SET(member,value) (get_pcpu()->pc_ ## member = (value))

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 5:16 AM (16 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31891055
Default Alt Text
D29308.diff (5 KB)

Event Timeline