Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

6 files changed, 18 insertions, 20 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 1bec55d63ef6..a0f642b6a4b9 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,7 @@
 config ALPHA
         bool
         default y
+        select HAVE_AOUT
         select HAVE_IDE
         select HAVE_OPROFILE
         help
@@ -68,9 +69,6 @@ config AUTO_IRQ_AFFINITY
         depends on SMP
         default y
 
-config ARCH_SUPPORTS_AOUT
-        def_bool y
-
 source "init/Kconfig"
 
 
@@ -224,8 +222,7 @@ config ALPHA_MIATA
         bool "Miata"
         help
           The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,
-          or 600au).  There is an Installation HOWTO for this hardware at
-          <http://eijk.homelinux.org/~stefan/miata.html>.
+          or 600au).
 
 config ALPHA_MIKASA
         bool "Mikasa"
diff --git a/arch/alpha/include/asm/a.out.h b/arch/alpha/include/asm/a.out.h
index 02ce8473870a..acdc681231cb 100644
--- a/arch/alpha/include/asm/a.out.h
+++ b/arch/alpha/include/asm/a.out.h
@@ -95,7 +95,7 @@ struct exec
    Worse, we have to notice the start address before swapping to use
    /sbin/loader, which of course is _not_ a TASO application.  */
 #define SET_AOUT_PERSONALITY(BFPM, EX) \
-        set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000L \
+        set_personality (((BFPM->taso || EX.ah.entry < 0x100000000L \
                            ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))
 
 #endif /* __KERNEL__ */
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index fc1002ea1e0c..5c75c1b2352a 100644
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
@@ -144,9 +144,9 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
         : amask (AMASK_CIX) ? "ev6" : "ev67");  \
 })
 
-#define SET_PERSONALITY(EX, IBCS2)                              \
+#define SET_PERSONALITY(EX)                                     \
         set_personality(((EX).e_flags & EF_ALPHA_32BIT)         \
-           ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
+           ? PER_LINUX_32BIT : PER_LINUX)
 
 extern int alpha_l1i_cacheshape;
 extern int alpha_l1d_cacheshape;
diff --git a/arch/alpha/include/asm/statfs.h b/arch/alpha/include/asm/statfs.h
index ad15830baefe..de35cd438a10 100644
--- a/arch/alpha/include/asm/statfs.h
+++ b/arch/alpha/include/asm/statfs.h
@@ -1,6 +1,10 @@
 #ifndef _ALPHA_STATFS_H
 #define _ALPHA_STATFS_H
 
+/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't
+   even seem to implement statfs64 */
+#define __statfs_word __u32
+
 #include <asm-generic/statfs.h>
 
 #endif
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 2179c602032a..b9094da05d7a 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -41,13 +41,6 @@ mk_iommu_pte(unsigned long paddr)
         return (paddr >> (PAGE_SHIFT-1)) | 1;
 }
 
-static inline long
-calc_npages(long bytes)
-{
-        return (bytes + PAGE_SIZE - 1) >> PAGE_SHIFT;
-}
-
-
 /* Return the minimum of MAX or the first power of two larger
    than main memory.  */
 
@@ -287,7 +280,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,
         if (!arena || arena->dma_base + arena->size - 1 > max_dma)
                 arena = hose->sg_isa;
 
-        npages = calc_npages((paddr & ~PAGE_MASK) + size);
+        npages = iommu_num_pages(paddr, size, PAGE_SIZE);
 
         /* Force allocation to 64KB boundary for ISA bridges. */
         if (pdev && pdev == isa_bridge)
@@ -387,7 +380,7 @@ pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,
                 BUG();
         }
 
-        npages = calc_npages((dma_addr & ~PAGE_MASK) + size);
+        npages = iommu_num_pages(dma_addr, size, PAGE_SIZE);
 
         spin_lock_irqsave(&arena->lock, flags);
 
@@ -580,7 +573,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end,
            contiguous.  */
 
         paddr &= ~PAGE_MASK;
-        npages = calc_npages(paddr + size);
+        npages = iommu_num_pages(paddr, size, PAGE_SIZE);
         dma_ofs = iommu_arena_alloc(dev, arena, npages, 0);
         if (dma_ofs < 0) {
                 /* If we attempted a direct map above but failed, die.  */
@@ -616,7 +609,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end,
                         sg++;
                 }
 
-                npages = calc_npages((paddr & ~PAGE_MASK) + size);
+                npages = iommu_num_pages(paddr, size, PAGE_SIZE);
 
                 paddr &= PAGE_MASK;
                 for (i = 0; i < npages; ++i, paddr += PAGE_SIZE)
@@ -775,7 +768,7 @@ pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,
                 DBGA("    (%ld) sg [%lx,%lx]\n",
                      sg - end + nents, addr, size);
 
-                npages = calc_npages((addr & ~PAGE_MASK) + size);
+                npages = iommu_num_pages(addr, size, PAGE_SIZE);
                 ofs = (addr - arena->dma_base) >> PAGE_SHIFT;
                 iommu_arena_free(arena, ofs, npages);
 
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 83df541650fc..e657c45d91d2 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -27,6 +27,7 @@
 #include <linux/cache.h>
 #include <linux/profile.h>
 #include <linux/bitops.h>
+#include <linux/cpu.h>
 
 #include <asm/hwrpb.h>
 #include <asm/ptrace.h>
@@ -149,6 +150,9 @@ smp_callin(void)
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
 
+        /* inform the notifiers about the new cpu */
+        notify_cpu_starting(cpuid);
+
         /* Must have completely accurate bogos.  */
         local_irq_enable();