3 files changed, 21 insertions, 18 deletions
diff --git a/arch/ia64/ia32/ia32_ioctl.c b/arch/ia64/ia32/ia32_ioctl.c
index 164b211f4174..88739394f6df 100644
--- a/arch/ia64/ia32/ia32_ioctl.c
+++ b/arch/ia64/ia32/ia32_ioctl.c
@@ -29,10 +29,8 @@
 #define CODE
 #include "compat_ioctl.c"
-typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
 #define COMPATIBLE_IOCTL(cmd)           HANDLE_IOCTL((cmd),sys_ioctl)
-#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl32_handler_t)(handler), NULL },
+#define HANDLE_IOCTL(cmd,handler)       { (cmd), (ioctl_trans_handler_t)(handler), NULL },
 #define IOCTL_TABLE_START \
        struct ioctl_trans ioctl_start[] = {
 #define IOCTL_TABLE_END \
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 051e050359e4..640d6908f8ec 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -197,11 +197,15 @@ void
 default_idle (void)
 {
        local_irq_enable();
-        while (!need_resched())
+        while (!need_resched()) {
-                if (can_do_pal_halt)
+                if (can_do_pal_halt) {
-                        safe_halt();
+                        local_irq_disable();
-                else
+                        if (!need_resched())
+                                safe_halt();
+                        local_irq_enable();
+                } else
                        cpu_relax();
+        }
 }
 #ifdef CONFIG_HOTPLUG_CPU
@@ -263,16 +267,16 @@ void __attribute__((noreturn))
 cpu_idle (void)
 {
        void (*mark_idle)(int) = ia64_mark_idle;
+        int cpu = smp_processor_id();
+        set_thread_flag(TIF_POLLING_NRFLAG);
        /* endless idle loop with no priority at all */
        while (1) {
+                if (!need_resched()) {
+                        void (*idle)(void);
 #ifdef CONFIG_SMP
-                if (!need_resched())
                        min_xtp();
 #endif
-                while (!need_resched()) {
-                        void (*idle)(void);
                        if (__get_cpu_var(cpu_idle_state))
                                __get_cpu_var(cpu_idle_state) = 0;
@@ -284,17 +288,17 @@ cpu_idle (void)
                        if (!idle)
                                idle = default_idle;
                        (*idle)();
-                }
+                        if (mark_idle)
+                                (*mark_idle)(0);
-                if (mark_idle)
-                        (*mark_idle)(0);
 #ifdef CONFIG_SMP
-                normal_xtp();
+                        normal_xtp();
 #endif
+                }
+                preempt_enable_no_resched();
                schedule();
+                preempt_disable();
                check_pgt_cache();
-                if (cpu_is_offline(smp_processor_id()))
+                if (cpu_is_offline(cpu))
                        play_dead();
        }
 }
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 400a48987124..8f44e7d2df66 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -399,6 +399,7 @@ start_secondary (void *unused)
        Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id());
        efi_map_pal_code();
        cpu_init();
+        preempt_disable();
        smp_callin();
        cpu_idle();

diff --git a/arch/ia64/ia32/ia32_ioctl.c b/arch/ia64/ia32/ia32_ioctl.c index 164b211f4174..88739394f6df 100644 --- a/arch/ia64/ia32/ia32_ioctl.c +++ b/arch/ia64/ia32/ia32_ioctl.c
@@ -29,10 +29,8 @@
29	#define CODE	29	#define CODE
30	#include "compat_ioctl.c"	30	#include "compat_ioctl.c"
31		31
32	typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
33
34	#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl)	32	#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl)
35	#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL },	33	#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl_trans_handler_t)(handler), NULL },
36	#define IOCTL_TABLE_START \	34	#define IOCTL_TABLE_START \
37	struct ioctl_trans ioctl_start[] = {	35	struct ioctl_trans ioctl_start[] = {
38	#define IOCTL_TABLE_END \	36	#define IOCTL_TABLE_END \


diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 051e050359e4..640d6908f8ec 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c
@@ -197,11 +197,15 @@ void
197	default_idle (void)	197	default_idle (void)
198	{	198	{
199	local_irq_enable();	199	local_irq_enable();
200	while (!need_resched())	200	while (!need_resched()) {
201	if (can_do_pal_halt)	201	if (can_do_pal_halt) {
202	safe_halt();	202	local_irq_disable();
203	else	203	if (!need_resched())
		204	safe_halt();
		205	local_irq_enable();
		206	} else
204	cpu_relax();	207	cpu_relax();
		208	}
205	}	209	}
206		210
207	#ifdef CONFIG_HOTPLUG_CPU	211	#ifdef CONFIG_HOTPLUG_CPU
@@ -263,16 +267,16 @@ void __attribute__((noreturn))
263	cpu_idle (void)	267	cpu_idle (void)
264	{	268	{
265	void (*mark_idle)(int) = ia64_mark_idle;	269	void (*mark_idle)(int) = ia64_mark_idle;
		270	int cpu = smp_processor_id();
		271	set_thread_flag(TIF_POLLING_NRFLAG);
266		272
267	/* endless idle loop with no priority at all */	273	/* endless idle loop with no priority at all */
268	while (1) {	274	while (1) {
		275	if (!need_resched()) {
		276	void (*idle)(void);
269	#ifdef CONFIG_SMP	277	#ifdef CONFIG_SMP
270	if (!need_resched())
271	min_xtp();	278	min_xtp();
272	#endif	279	#endif
273	while (!need_resched()) {
274	void (*idle)(void);
275
276	if (__get_cpu_var(cpu_idle_state))	280	if (__get_cpu_var(cpu_idle_state))
277	__get_cpu_var(cpu_idle_state) = 0;	281	__get_cpu_var(cpu_idle_state) = 0;
278		282
@@ -284,17 +288,17 @@ cpu_idle (void)
284	if (!idle)	288	if (!idle)
285	idle = default_idle;	289	idle = default_idle;
286	(*idle)();	290	(*idle)();
287	}	291	if (mark_idle)
288		292	(*mark_idle)(0);
289	if (mark_idle)
290	(*mark_idle)(0);
291
292	#ifdef CONFIG_SMP	293	#ifdef CONFIG_SMP
293	normal_xtp();	294	normal_xtp();
294	#endif	295	#endif
		296	}
		297	preempt_enable_no_resched();
295	schedule();	298	schedule();
		299	preempt_disable();
296	check_pgt_cache();	300	check_pgt_cache();
297	if (cpu_is_offline(smp_processor_id()))	301	if (cpu_is_offline(cpu))
298	play_dead();	302	play_dead();
299	}	303	}
300	}	304	}


diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 400a48987124..8f44e7d2df66 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c
@@ -399,6 +399,7 @@ start_secondary (void *unused)
399	Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id());	399	Dprintk("start_secondary: starting CPU 0x%x\n", hard_smp_processor_id());
400	efi_map_pal_code();	400	efi_map_pal_code();
401	cpu_init();	401	cpu_init();
		402	preempt_disable();
402	smp_callin();	403	smp_callin();
403		404
404	cpu_idle();	405	cpu_idle();