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

Collapse All | Expand All

(-)b/sys/dev/nvdimm/nvdimm_e820.c (-1 / +1 lines)
Lines 121-127 nvdimm_e820_create_spas(device_t dev) Link Here
121
121
122
	sc = device_get_softc(dev);
122
	sc = device_get_softc(dev);
123
	error = 0;
123
	error = 0;
124
	nfit_sa = (ACPI_NFIT_SYSTEM_ADDRESS) { 0 };
124
	nfit_sa = (ACPI_NFIT_SYSTEM_ADDRESS) { {0} };
125
125
126
	if (bootverbose)
126
	if (bootverbose)
127
		nvdimm_e820_dump_prams(dev, __func__, -1);
127
		nvdimm_e820_dump_prams(dev, __func__, -1);
(-)b/sys/vm/uma_core.c (-2 / +9 lines)
Lines 585-590 zone_timeout(uma_zone_t zone) Link Here
585
	uma_keg_t keg = zone->uz_keg;
585
	uma_keg_t keg = zone->uz_keg;
586
	u_int slabs;
586
	u_int slabs;
587
587
588
	if ((zone->uz_flags & UMA_ZFLAG_CACHE) != 0)
589
		return;
590
588
	KEG_LOCK(keg);
591
	KEG_LOCK(keg);
589
	/*
592
	/*
590
	 * Expand the keg hash table.
593
	 * Expand the keg hash table.
Lines 1081-1087 zone_reclaim(uma_zone_t zone, int waitok, bool drain) Link Here
1081
	 * we're running.  Normally the uma_rwlock would protect us but we
1084
	 * we're running.  Normally the uma_rwlock would protect us but we
1082
	 * must be able to release and acquire the right lock for each keg.
1085
	 * must be able to release and acquire the right lock for each keg.
1083
	 */
1086
	 */
1084
	keg_drain(zone->uz_keg);
1087
	if ((zone->uz_flags & UMA_ZFLAG_CACHE) == 0)
1088
		keg_drain(zone->uz_keg);
1085
	ZONE_LOCK(zone);
1089
	ZONE_LOCK(zone);
1086
	zone->uz_flags &= ~UMA_ZFLAG_RECLAIMING;
1090
	zone->uz_flags &= ~UMA_ZFLAG_RECLAIMING;
1087
	wakeup(zone);
1091
	wakeup(zone);
Lines 2027-2032 zone_foreach(void (*zfunc)(uma_zone_t)) Link Here
2027
		LIST_FOREACH(zone, &keg->uk_zones, uz_link)
2031
		LIST_FOREACH(zone, &keg->uk_zones, uz_link)
2028
			zfunc(zone);
2032
			zfunc(zone);
2029
	}
2033
	}
2034
	LIST_FOREACH(zone, &uma_cachezones, uz_link)
2035
		zfunc(zone);
2030
	if (__predict_true(booted == BOOT_RUNNING))
2036
	if (__predict_true(booted == BOOT_RUNNING))
2031
		rw_runlock(&uma_rwlock);
2037
		rw_runlock(&uma_rwlock);
2032
}
2038
}
Lines 3969-3975 uma_print_zone(uma_zone_t zone) Link Here
3969
	printf("zone: %s(%p) size %d maxitems %ju flags %#x\n",
3975
	printf("zone: %s(%p) size %d maxitems %ju flags %#x\n",
3970
	    zone->uz_name, zone, zone->uz_size, (uintmax_t)zone->uz_max_items,
3976
	    zone->uz_name, zone, zone->uz_size, (uintmax_t)zone->uz_max_items,
3971
	    zone->uz_flags);
3977
	    zone->uz_flags);
3972
	if (zone->uz_lockptr != &zone->uz_lock)
3978
	if (zone->uz_lockptr != &zone->uz_lock &&
3979
	    (zone->uz_flags & UMA_ZFLAG_CACHE) == 0)
3973
		uma_print_keg(zone->uz_keg);
3980
		uma_print_keg(zone->uz_keg);
3974
	CPU_FOREACH(i) {
3981
	CPU_FOREACH(i) {
3975
		cache = &zone->uz_cpu[i];
3982
		cache = &zone->uz_cpu[i];

Return to bug 241048