System clock with multiple NIOS cores

I'm still working this multiple NIOS II design but I have upgraded to Quartus 4.2 and NIOS 1.1. In addition, I moved to the NIOS Dev. Kit Stratix Pro Edition with the 1S40 part. I have a working dual cpu design with a mutex and ram for interprocessor communication, however, I have a problem with the SOPC Builder and HAL that I worked around. I defined a second interval timer to go with my second CPU and called it cpu1_system_timer. When I regenerated the hardware and rebuilt the software, I got compilation errors that SYSTEM_TIMER was not defined. The system.h for the second CPU showed the new timer as follows:

/*

* cpu1_system_timer configuration

*

*/

# define CPU1_SYSTEM_TIMER_NAME "/dev/cpu1_system_timer"# define CPU1_SYSTEM_TIMER_TYPE "altera_avalon_timer"# define CPU1_SYSTEM_TIMER_BASE 0x009008E0# define CPU1_SYSTEM_TIMER_IRQ 0# define CPU1_SYSTEM_TIMER_ALWAYS_RUN 0# define CPU1_SYSTEM_TIMER_FIXED_PERIOD 0# define CPU1_SYSTEM_TIMER_SNAPSHOT 1# define CPU1_SYSTEM_TIMER_PERIOD 1# define CPU1_SYSTEM_TIMER_PERIOD_UNITS "ms"# define CPU1_SYSTEM_TIMER_RESET_OUTPUT 0# define CPU1_SYSTEM_TIMER_TIMEOUT_PULSE_OUTPUT 0# define CPU1_SYSTEM_TIMER_MULT 0.001# define CPU1_SYSTEM_TIMER_FREQ 50000000

but the ALT_SYS_CLOCK section was not changed. It looked like this:

# define ALT_SYS_CLK SYSTEM_TIMER# define ALT_TIMESTAMP_CLK none# define ALT_MAX_FD 32

So, I took a guess at the name like this:

# define ALT_SYS_CLK CPU1_SYSTEM_TIMER# define ALT_TIMESTAMP_CLK none# define ALT_MAX_FD 32

And now I have a working dual core system. Can support help me with this?