Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

6 files changed, 26 insertions, 22 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/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index f081c60ab206..eb39bc9c133b 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -88,7 +88,7 @@ mca_page_isolate(unsigned long paddr)
         if (!ia64_phys_addr_valid(paddr))
                 return ISOLATE_NONE;
 
-        if (!pfn_valid(paddr))
+        if (!pfn_valid(paddr >> PAGE_SHIFT))
                 return ISOLATE_NONE;
 
         /* convert physical address to physical page number */
@@ -108,6 +108,7 @@ mca_page_isolate(unsigned long paddr)
                 return ISOLATE_NG;
 
         /* add attribute 'Reserved' and register the page */
+        get_page(p);
         SetPageReserved(p);
         page_isolate[num_page_isolate++] = p;
 
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())
-                if (can_do_pal_halt)
-                        safe_halt();
-                else
+        while (!need_resched()) {
+                if (can_do_pal_halt) {
+                        local_irq_disable();
+                        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/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 7b03b8084ffc..1f500c81002c 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -212,13 +212,13 @@ void pcibr_target_interrupt(struct sn_irq_info *sn_irq_info)
                     pdi_pcibus_info;
 
                 /* Disable the device's IRQ   */
-                pcireg_intr_enable_bit_clr(pcibus_info, bit);
+                pcireg_intr_enable_bit_clr(pcibus_info, (1 << bit));
 
                 /* Change the device's IRQ    */
                 pcireg_intr_addr_addr_set(pcibus_info, bit, xtalk_addr);
 
                 /* Re-enable the device's IRQ */
-                pcireg_intr_enable_bit_set(pcibus_info, bit);
+                pcireg_intr_enable_bit_set(pcibus_info, (1 << bit));
 
                 pcibr_force_interrupt(sn_irq_info);
         }
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_reg.c b/arch/ia64/sn/pci/pcibr/pcibr_reg.c
index 4f718c3e93d3..5d534091262c 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_reg.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_reg.c
@@ -131,7 +131,7 @@ void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits)
                         __sn_clrq_relaxed(&ptr->tio.cp_int_enable, bits);
                         break;
                 case PCIBR_BRIDGETYPE_PIC:
-                        __sn_clrq_relaxed(&ptr->pic.p_int_enable, ~bits);
+                        __sn_clrq_relaxed(&ptr->pic.p_int_enable, bits);
                         break;
                 default:
                         panic