svn commit: r310508 - in stable/10/sys/ia64: ia64 include

[Andriy Gapon]

Author: avg
Date: Sat Dec 24 13:28:39 2016
New Revision: 310508
URL: https://svnweb.freebsd.org/changeset/base/310508

Log:
  define Maxmem for ia64, the only platform that didn't have it
  
  This is a direct commit to stable/10 as the platform was removed
  in the newer branches.
  
  Maxmem is required for compiling fwohci(4) on ia64 since commit
  r310081, MFC of r277511.
  It was easier to add Maxmem than to make a special case for ia64
  in fwohci.
  
  Reported by:	jhb, gjb
  Discussed with:	kib, jhb

Modified:
  stable/10/sys/ia64/ia64/physmem.c
  stable/10/sys/ia64/include/md_var.h

Modified: stable/10/sys/ia64/ia64/physmem.c
==============================================================================
--- stable/10/sys/ia64/ia64/physmem.c	Sat Dec 24 13:00:19 2016	(r310507)
+++ stable/10/sys/ia64/ia64/physmem.c	Sat Dec 24 13:28:39 2016	(r310508)
@@ -38,7 +38,7 @@ static u_int phys_avail_segs;
 vm_paddr_t phys_avail[2 * VM_PHYSSEG_MAX + 2];
 
 vm_paddr_t paddr_max;
-
+long Maxmem;
 long realmem;
 
 static u_int
@@ -168,6 +168,12 @@ ia64_physmem_fini(void)
 	size = 1U << 27;
 	realmem = (realmem + size - 1) & ~(size - 1);
 	realmem = atop(realmem);
+
+	/*
+	 * Maxmem isn't the "maximum memory", it's one larger than the
+	 * highest page of the physical address space.
+	 */
+	Maxmem = atop(paddr_max);
 	return (0);
 }
 

Modified: stable/10/sys/ia64/include/md_var.h
==============================================================================
--- stable/10/sys/ia64/include/md_var.h	Sat Dec 24 13:00:19 2016	(r310507)
+++ stable/10/sys/ia64/include/md_var.h	Sat Dec 24 13:28:39 2016	(r310508)
@@ -75,6 +75,7 @@ struct ia64_init_return {
 
 extern uint64_t ia64_lapic_addr;
 extern vm_paddr_t paddr_max;
+extern long Maxmem;
 extern u_int busdma_swi_pending;
 
 void	*acpi_find_table(const char *sig);