D17073.id47822.diff
No OneTemporary
Actions

Size

1018 B

Referenced Files

None

Subscribers

None

D17073.id47822.diff
View Options

	Index: head/sys/arm/arm/physmem.c
	===================================================================
	--- head/sys/arm/arm/physmem.c
	+++ head/sys/arm/arm/physmem.c
	@@ -48,8 +48,8 @@
	* that can be allocated, or both, depending on the exclusion flags associated
	* with the region.
	*/
	-#define MAX_HWCNT 10
	-#define MAX_EXCNT 10
	+#define MAX_HWCNT 16
	+#define MAX_EXCNT 16

	#if defined(__arm__)
	#define MAX_PHYS_ADDR 0xFFFFFFFFull
	@@ -359,7 +359,8 @@
	/*
	* Add an exclusion region.
	*/
	-void arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t exflags)
	+void
	+arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t exflags)
	{
	vm_offset_t adj;

	@@ -371,8 +372,9 @@
	pa = trunc_page(pa);
	sz = round_page(sz + adj);

	- if (excnt < nitems(exregions))
	- excnt = insert_region(exregions, excnt, pa, sz, exflags);
	+ if (excnt >= nitems(exregions))
	+ panic("failed to exclude region %#lx-%#lx", pa, pa + sz);
	+ excnt = insert_region(exregions, excnt, pa, sz, exflags);
	}

	size_t