diff --git a/[refs] b/[refs]
index c458b80262fb..8350a1c57fbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a931d4cca1b6dabe1085cc04e909575df9219ae
+refs/heads/master: ac9af7cba9e642961bfdee1a1fac6060405597e5
diff --git a/trunk/arch/ia64/hp/sim/boot/bootloader.c b/trunk/arch/ia64/hp/sim/boot/bootloader.c
index a7bed60b69f9..51a7b7b4dd0e 100644
--- a/trunk/arch/ia64/hp/sim/boot/bootloader.c
+++ b/trunk/arch/ia64/hp/sim/boot/bootloader.c
@@ -30,14 +30,10 @@ struct disk_req {
 	unsigned len;
 };
 
-/* SSC_WAIT_COMPLETION appears to want this large alignment.  gcc < 4
- * seems to give it by default, however gcc > 4 is smarter and may
- * not.
- */
 struct disk_stat {
 	int fd;
 	unsigned count;
-} __attribute__ ((aligned (16)));
+};
 
 extern void jmp_to_kernel (unsigned long bp, unsigned long e_entry);
 extern struct ia64_boot_param *sys_fw_init (const char *args, int arglen);
diff --git a/trunk/arch/ppc64/kernel/iommu.c b/trunk/arch/ppc64/kernel/iommu.c
index 8316426ccaf6..845eebd1e28d 100644
--- a/trunk/arch/ppc64/kernel/iommu.c
+++ b/trunk/arch/ppc64/kernel/iommu.c
@@ -242,7 +242,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
 	dma_addr_t dma_next = 0, dma_addr;
 	unsigned long flags;
 	struct scatterlist *s, *outs, *segstart;
-	int outcount;
+	int outcount, incount;
 	unsigned long handle;
 
 	BUG_ON(direction == DMA_NONE);
@@ -252,6 +252,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
 
 	outs = s = segstart = &sglist[0];
 	outcount = 1;
+	incount = nelems;
 	handle = 0;
 
 	/* Init first segment length for backout at failure */
@@ -338,10 +339,10 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
 
 	DBG("mapped %d elements:\n", outcount);
 
-	/* For the sake of iommu_free_sg, we clear out the length in the
+	/* For the sake of iommu_unmap_sg, we clear out the length in the
 	 * next entry of the sglist if we didn't fill the list completely
 	 */
-	if (outcount < nelems) {
+	if (outcount < incount) {
 		outs++;
 		outs->dma_address = DMA_ERROR_CODE;
 		outs->dma_length = 0;
diff --git a/trunk/include/asm-ia64/io.h b/trunk/include/asm-ia64/io.h
index 54e7637a326c..491e9d1fc538 100644
--- a/trunk/include/asm-ia64/io.h
+++ b/trunk/include/asm-ia64/io.h
@@ -120,6 +120,14 @@ static inline void ___ia64_mmiowb(void)
 	ia64_mfa();
 }
 
+static inline const unsigned long
+__ia64_get_io_port_base (void)
+{
+	extern unsigned long ia64_iobase;
+
+	return ia64_iobase;
+}
+
 static inline void*
 __ia64_mk_io_addr (unsigned long port)
 {