diff options
| author | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
| commit | fb307d7d1de2e083e767df27714dca5352792ac3 (patch) | |
| tree | ddc86814ee8f35466e619bb63b8f15b41185074e /sys/kern | |
| parent | b040c9742c99e20eb9926995bea03ad4f3e849c8 (diff) | |
| download | FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.zip FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.tar.gz | |
After some off-list discussion, revert a number of changes to the
DPCPU_DEFINE and VNET_DEFINE macros, as these cause problems for various
people working on the affected files. A better long-term solution is
still being considered. This reversal may give some modules empty
set_pcpu or set_vnet sections, but these are harmless.
Changes reverted:
------------------------------------------------------------------------
r215318 | dim | 2010-11-14 21:40:55 +0100 (Sun, 14 Nov 2010) | 4 lines
Instead of unconditionally emitting .globl's for the __start_set_xxx and
__stop_set_xxx symbols, only emit them when the set_vnet or set_pcpu
sections are actually defined.
------------------------------------------------------------------------
r215317 | dim | 2010-11-14 21:38:11 +0100 (Sun, 14 Nov 2010) | 3 lines
Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout
the tree.
------------------------------------------------------------------------
r215316 | dim | 2010-11-14 21:23:02 +0100 (Sun, 14 Nov 2010) | 2 lines
Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_clock.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_clocksource.c | 2 | ||||
| -rw-r--r-- | sys/kern/sched_4bsd.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_pcpu.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index feef911..1754f7b 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -373,7 +373,7 @@ int profprocs; int ticks; int psratio; -STATIC_DPCPU_DEFINE(int, pcputicks); /* Per-CPU version of ticks. */ +static DPCPU_DEFINE(int, pcputicks); /* Per-CPU version of ticks. */ static int global_hardclock_run = 0; /* diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index dad07d2..ded6d64 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -135,7 +135,7 @@ struct pcpu_state { int idle; /* This CPU is in idle mode. */ }; -STATIC_DPCPU_DEFINE(struct pcpu_state, timerstate); +static DPCPU_DEFINE(struct pcpu_state, timerstate); #define FREQ2BT(freq, bt) \ { \ diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 6a40392..9face64 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -161,7 +161,7 @@ struct pcpuidlestat { u_int idlecalls; u_int oldidlecalls; }; -STATIC_DPCPU_DEFINE(struct pcpuidlestat, idlestat); +static DPCPU_DEFINE(struct pcpuidlestat, idlestat); static void setup_runqs(void) diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c index 4108441..24a12ea 100644 --- a/sys/kern/subr_pcpu.c +++ b/sys/kern/subr_pcpu.c @@ -70,7 +70,7 @@ struct dpcpu_free { TAILQ_ENTRY(dpcpu_free) df_link; }; -STATIC_DPCPU_DEFINE(char, modspace[DPCPU_MODMIN]); +static DPCPU_DEFINE(char, modspace[DPCPU_MODMIN]); static TAILQ_HEAD(, dpcpu_free) dpcpu_head = TAILQ_HEAD_INITIALIZER(dpcpu_head); static struct sx dpcpu_lock; uintptr_t dpcpu_off[MAXCPU]; |
