the first patch  moves some definitions
out of perfmon.c to perfmon.h (similar to what is in 2.4). 

The second patch contains a fix for the generic built. I did 
it that way to avoid other problems such as SIMSCSI depends
on SCSI. so simply hardcoding this in the MAkefile could cause
other problems. Anyway, SIMSCI is not defaulting to y when
HP_SIM is defined so it is not so different.