Module Name:	src
Committed By:	rumble
Date:		Mon Sep  4 22:06:06 UTC 2006

Modified Files:
	src/sys/arch/sgimips/conf: GENERIC32_IP2x
	src/sys/arch/sgimips/hpc: haltwo.c

Log Message:
Check the haltwo hardware present bit in the match function, rather than
in the attach function after we've thwacked several registers and
potentially wedged the machine. This fixes booting on Challenge S systems
and addresses PR 25202.

Consequently, re-enable haltwo in the default kernel configuration.

Many thanks to George Harvey for testing and feedback.


To generate a diff of this commit:
cvs rdiff -r1.57 -r1.58 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -r1.9 -r1.10 src/sys/arch/sgimips/hpc/haltwo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.