[PATCH] ia64: two small fixes (perfmon & GENERIC build)

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.

arch/ia64/hp/sim/Kconfig

@@ -7,6 +7,7 @@ config HP_SIMETH
 
 config HP_SIMSERIAL
 	bool "Simulated serial driver support"
+	default y if IA64_GENERIC
 
 config HP_SIMSCSI
 	bool "Simulated SCSI disk"

arch/ia64/kernel/perfmon.c

@@ -131,9 +131,6 @@
 
 #define PFM_REG_RETFLAG_SET(flags, val)	do { flags &= ~PFM_REG_RETFL_MASK; flags |= (val); } while(0)
 
-#define PFM_CPUINFO_CLEAR(v)	__get_cpu_var(pfm_syst_info) &= ~(v)
-#define PFM_CPUINFO_SET(v)	__get_cpu_var(pfm_syst_info) |= (v)
-
 /*
  * debugging
  */

include/asm-ia64/perfmon.h

@@ -199,6 +199,8 @@ extern int pfm_remove_alternate_syswide_subsystem(pfm_intr_handler_desc_t *h);
 #define PFM_CPUINFO_DCR_PP	0x2	/* if set the system wide session has started */
 #define PFM_CPUINFO_EXCL_IDLE	0x4	/* the system wide session excludes the idle task */
 
+#define PFM_CPUINFO_CLEAR(v)	__get_cpu_var(pfm_syst_info) &= ~(v)
+#define PFM_CPUINFO_SET(v)	__get_cpu_var(pfm_syst_info) |= (v)
 
 #endif /* __KERNEL__ */