7 files changed, 28 insertions, 20 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c84c88bbbbd7..536d13b0bea6 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -11,7 +11,6 @@ config IA64
         select PCI if (!IA64_HP_SIM)
         select ACPI if (!IA64_HP_SIM)
         select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
-        select PM if (!IA64_HP_SIM)
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
         select HAVE_OPROFILE
@@ -233,6 +232,7 @@ config IA64_SGI_UV
 config IA64_HP_SIM
         bool "Ski-simulator"
         select SWIOTLB
+        depends on !PM_RUNTIME
 
 endchoice
 
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index bee0acd52f7e..80a7e34be009 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -393,6 +393,10 @@ __writeq (unsigned long val, volatile void __iomem *addr)
 #define writew(v,a)     __writew((v), (a))
 #define writel(v,a)     __writel((v), (a))
 #define writeq(v,a)     __writeq((v), (a))
+#define writeb_relaxed(v,a)     __writeb((v), (a))
+#define writew_relaxed(v,a)     __writew((v), (a))
+#define writel_relaxed(v,a)     __writel((v), (a))
+#define writeq_relaxed(v,a)     __writeq((v), (a))
 #define __raw_writeb    writeb
 #define __raw_writew    writew
 #define __raw_writel    writel
diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
index 449c8c0fa2bd..103bedc59644 100644
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
@@ -365,15 +365,15 @@ ia64_done_with_exception (struct pt_regs *regs)
 }
 
 #define ARCH_HAS_TRANSLATE_MEM_PTR      1
-static __inline__ char *
-xlate_dev_mem_ptr (unsigned long p)
+static __inline__ void *
+xlate_dev_mem_ptr(phys_addr_t p)
 {
         struct page *page;
-        char * ptr;
+        void *ptr;
 
         page = pfn_to_page(p >> PAGE_SHIFT);
         if (PageUncached(page))
-                ptr = (char *)p + __IA64_UNCACHED_OFFSET;
+                ptr = (void *)p + __IA64_UNCACHED_OFFSET;
         else
                 ptr = __va(p);
 
@@ -383,15 +383,15 @@ xlate_dev_mem_ptr (unsigned long p)
 /*
  * Convert a virtual cached kernel memory pointer to an uncached pointer
  */
-static __inline__ char *
-xlate_dev_kmem_ptr (char * p)
+static __inline__ void *
+xlate_dev_kmem_ptr(void *p)
 {
         struct page *page;
-        char * ptr;
+        void *ptr;
 
         page = virt_to_page((unsigned long)p);
         if (PageUncached(page))
-                ptr = (char *)__pa(p) + __IA64_UNCACHED_OFFSET;
+                ptr = (void *)__pa(p) + __IA64_UNCACHED_OFFSET;
         else
                 ptr = p;
 
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index 4ea6225196bb..bce9bc1a66c4 100644
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -63,6 +63,10 @@ typedef struct siginfo {
                         unsigned int _flags;    /* see below */
                         unsigned long _isr;     /* isr */
                         short _addr_lsb;        /* lsb of faulting address */
+                        struct {
+                                void __user *_lower;
+                                void __user *_upper;
+                        } _addr_bnd;
                 } _sigfault;
 
                 /* SIGPOLL */
@@ -110,9 +114,9 @@ typedef struct siginfo {
 /*
  * SIGSEGV si_codes
  */
-#define __SEGV_PSTKOVF  (__SI_FAULT|3)  /* paragraph stack overflow */
+#define __SEGV_PSTKOVF  (__SI_FAULT|4)  /* paragraph stack overflow */
 #undef NSIGSEGV
-#define NSIGSEGV        3
+#define NSIGSEGV        4
 
 #undef NSIGTRAP
 #define NSIGTRAP        4
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 8c3730c3c63d..8ae36ea177d3 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -35,7 +35,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
         data |= MSI_DATA_VECTOR(irq_to_vector(irq));
         msg.data = data;
 
-        write_msi_msg(irq, &msg);
+        pci_write_msi_msg(irq, &msg);
         cpumask_copy(idata->affinity, cpumask_of(cpu));
 
         return 0;
@@ -71,7 +71,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
                 MSI_DATA_DELIVERY_FIXED |
                 MSI_DATA_VECTOR(vector);
 
-        write_msi_msg(irq, &msg);
+        pci_write_msi_msg(irq, &msg);
         irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
 
         return 0;
@@ -102,8 +102,8 @@ static int ia64_msi_retrigger_irq(struct irq_data *data)
  */
 static struct irq_chip ia64_msi_chip = {
         .name                   = "PCI-MSI",
-        .irq_mask               = mask_msi_irq,
-        .irq_unmask             = unmask_msi_irq,
+        .irq_mask               = pci_msi_mask_irq,
+        .irq_unmask             = pci_msi_unmask_irq,
         .irq_ack                = ia64_ack_msi_irq,
 #ifdef CONFIG_SMP
         .irq_set_affinity       = ia64_set_msi_irq_affinity,
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 5845ffea67c3..dc063fe6646a 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2662,7 +2662,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
 
         ret = -ENOMEM;
 
-        fd = get_unused_fd();
+        fd = get_unused_fd_flags(0);
         if (fd < 0)
                 return fd;
 
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 446e7799928c..a0eb27b66d13 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -145,7 +145,7 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
         msg.data = 0x100 + irq;
 
         irq_set_msi_desc(irq, entry);
-        write_msi_msg(irq, &msg);
+        pci_write_msi_msg(irq, &msg);
         irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
 
         return 0;
@@ -205,7 +205,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
         msg.address_hi = (u32)(bus_addr >> 32);
         msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);
 
-        write_msi_msg(irq, &msg);
+        pci_write_msi_msg(irq, &msg);
         cpumask_copy(data->affinity, cpu_mask);
 
         return 0;
@@ -228,8 +228,8 @@ static int sn_msi_retrigger_irq(struct irq_data *data)
 
 static struct irq_chip sn_msi_chip = {
         .name                   = "PCI-MSI",
-        .irq_mask               = mask_msi_irq,
-        .irq_unmask             = unmask_msi_irq,
+        .irq_mask               = pci_msi_mask_irq,
+        .irq_unmask             = pci_msi_unmask_irq,
         .irq_ack                = sn_ack_msi_irq,
 #ifdef CONFIG_SMP
         .irq_set_affinity       = sn_set_msi_irq_affinity,