svn commit: r338523 - head/sbin/sysctl

[John Baldwin]

On 9/7/18 8:09 AM, Konstantin Belousov wrote:
> Author: kib
> Date: Fri Sep  7 15:09:56 2018
> New Revision: 338523
> URL: https://svnweb.freebsd.org/changeset/base/338523
> 
> Log:
>   Teach sysctl(8) about the Persistent memory type.
>   
>   Add PersistentMemory to the list of sysctl's known memory types
>   when decoding an EFI memory map.
>   
>   Submitted by:	D Scott Phillips <d.scott.phillips at intel.com>
>   MFC after:	1 week
>   Approved by:	re (rgrimes)
> 
> Modified:
>   head/sbin/sysctl/sysctl.c
> 
> Modified: head/sbin/sysctl/sysctl.c
> ==============================================================================
> --- head/sbin/sysctl/sysctl.c	Fri Sep  7 14:37:44 2018	(r338522)
> +++ head/sbin/sysctl/sysctl.c	Fri Sep  7 15:09:56 2018	(r338523)
> @@ -704,7 +704,8 @@ S_efi_map(size_t l2, void *p)
>  		"ACPIMemoryNVS",
>  		"MemoryMappedIO",
>  		"MemoryMappedIOPortSpace",
> -		"PalCode"
> +		"PalCode",
> +		"PersistentMemory"
>  	};
>  
>  	/*
> @@ -733,7 +734,7 @@ S_efi_map(size_t l2, void *p)
>  
>  	for (i = 0; i < ndesc; i++,
>  	    map = efi_next_descriptor(map, efihdr->descriptor_size)) {
> -		if (map->md_type <= EFI_MD_TYPE_PALCODE)
> +		if (map->md_type <= EFI_MD_TYPE_PERSISTENT)

Perhaps this should use nitems(types) instead?  (And I believe it's my
fault it didn't originally.)

-- 
John Baldwin