svn commit: r212003 - stable/8/sys/compat/x86bios

[Jung-uk Kim]

Author: jkim
Date: Mon Aug 30 17:34:59 2010
New Revision: 212003
URL: http://svn.freebsd.org/changeset/base/212003

Log:
  MFC:	r211823
  
  Check opcode for short jump as well.  Some option ROMs do short jumps
  (e.g., some NVIDIA video cards) and we were not able to do POST while
  resuming because we only honored long jump.

Modified:
  stable/8/sys/compat/x86bios/x86bios.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/compat/x86bios/x86bios.c
==============================================================================
--- stable/8/sys/compat/x86bios/x86bios.c	Mon Aug 30 16:30:18 2010	(r212002)
+++ stable/8/sys/compat/x86bios/x86bios.c	Mon Aug 30 17:34:59 2010	(r212003)
@@ -446,7 +446,8 @@ x86bios_get_orm(uint32_t offset)
 
 	/* Does the shadow ROM contain BIOS POST code for x86? */
 	p = x86bios_offset(offset);
-	if (p == NULL || p[0] != 0x55 || p[1] != 0xaa || p[3] != 0xe9)
+	if (p == NULL || p[0] != 0x55 || p[1] != 0xaa ||
+	    (p[3] != 0xe9 && p[3] != 0xeb))
 		return (NULL);
 
 	return (p);