View | Details | Raw Unified | Return to bug 240609 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/e1000/e1000_osdep.h (-2 / +2 lines)
Lines 82-88 Link Here
82
82
83
static inline void
83
static inline void
84
safe_pause_us(int x) {
84
safe_pause_us(int x) {
85
	if (cold) {
85
	if (cold || in_epoch(net_epoch_preempt)) {
86
		DELAY(x);
86
		DELAY(x);
87
	} else {
87
	} else {
88
		pause("e1000_delay", max(1,  x/(1000000/hz)));
88
		pause("e1000_delay", max(1,  x/(1000000/hz)));
Lines 91-97 Link Here
91
91
92
static inline void
92
static inline void
93
safe_pause_ms(int x) {
93
safe_pause_ms(int x) {
94
	if (cold) {
94
	if (cold || in_epoch(net_epoch_preempt)) {
95
		DELAY(x*1000);
95
		DELAY(x*1000);
96
	} else {
96
	} else {
97
		pause("e1000_delay", ms_scale(x));
97
		pause("e1000_delay", ms_scale(x));

Return to bug 240609