Commit 07a57e67 authored by Jesse Barnes's avatar Jesse Barnes Committed by David Mosberger

[PATCH] ia64: mark_idle() fixes for sn2

Small patch to fixup the new mark_idle() stuff for sn2.
parent c673e80e
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
EXTRA_CFLAGS := -DLITTLE_ENDIAN EXTRA_CFLAGS := -DLITTLE_ENDIAN
obj-y := probe.o setup.o sv.o bte.o irq.o mca.o sn2/ obj-y := probe.o setup.o sv.o bte.o irq.o mca.o \
idle.o sn2/
obj-$(CONFIG_IA64_GENERIC) += machvec.o obj-$(CONFIG_IA64_GENERIC) += machvec.o
obj-$(CONFIG_MODULES) += sn_ksyms.o obj-$(CONFIG_MODULES) += sn_ksyms.o
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
void snidle(int state) { void snidle(int state) {
if (state) { if (state) {
if (pda.idle_flag == 0) { if (pda->idle_flag == 0) {
/* /*
* Turn the activity LED off. * Turn the activity LED off.
*/ */
...@@ -24,13 +24,13 @@ void snidle(int state) { ...@@ -24,13 +24,13 @@ void snidle(int state) {
SIMULATOR_SLEEP(); SIMULATOR_SLEEP();
#endif #endif
pda.idle_flag = 1; pda->idle_flag = 1;
} else { } else {
/* /*
* Turn the activity LED on. * Turn the activity LED on.
*/ */
set_led_bits(LED_CPU_ACTIVITY, LED_CPU_ACTIVITY); set_led_bits(LED_CPU_ACTIVITY, LED_CPU_ACTIVITY);
pda.idle_flag = 0; pda->idle_flag = 0;
} }
} }
...@@ -75,11 +75,13 @@ DEFINE_PER_CPU(struct pda_s, pda_percpu); ...@@ -75,11 +75,13 @@ DEFINE_PER_CPU(struct pda_s, pda_percpu);
#define pxm_to_nasid(pxm) ((pxm)<<1) #define pxm_to_nasid(pxm) ((pxm)<<1)
#define MAX_PHYS_MEMORY (1UL << 49) /* 1 TB */
extern void bte_init_node (nodepda_t *, cnodeid_t); extern void bte_init_node (nodepda_t *, cnodeid_t);
extern void bte_init_cpu (void); extern void bte_init_cpu (void);
extern void sn_timer_init (void); extern void sn_timer_init(void);
extern void (*ia64_mark_idle)(int); extern void (*ia64_mark_idle)(int);
void snidle(int); extern void snidle(int);
unsigned long sn_rtc_cycles_per_second; unsigned long sn_rtc_cycles_per_second;
...@@ -296,21 +298,20 @@ sn_setup(char **cmdline_p) ...@@ -296,21 +298,20 @@ sn_setup(char **cmdline_p)
*/ */
sn_check_for_wars(); sn_check_for_wars();
ia64_mark_idle = &snidle;
/* /*
* For the bootcpu, we do this here. All other cpus will make the * For the bootcpu, we do this here. All other cpus will make the
* call as part of cpu_init in slave cpu initialization. * call as part of cpu_init in slave cpu initialization.
*/ */
sn_cpu_init(); sn_cpu_init();
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
init_smp_config(); init_smp_config();
#endif #endif
screen_info = sn_screen_info; screen_info = sn_screen_info;
sn_timer_init(); sn_timer_init();
ia64_mark_idle = &snidle;
} }
/** /**
...@@ -438,19 +439,3 @@ sn_cpu_init(void) ...@@ -438,19 +439,3 @@ sn_cpu_init(void)
bte_init_cpu(); bte_init_cpu();
} }
void snidle(int idleness)
{
if (!idleness) {
if (pda->idle_flag == 0) {
set_led_bits(0, LED_CPU_ACTIVITY);
}
pda->idle_flag = 1;
}
else {
set_led_bits(LED_CPU_ACTIVITY, LED_CPU_ACTIVITY);
pda->idle_flag = 0;
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment