---

yaml --- r: 5864 b: refs/heads/master c: 3c7bf1e h: refs/heads/master v: v3
git-mirror · Aug 18, 2005 · 2564a02 · 2564a02
1 parent bbfb73c
commit 2564a02
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eaefb39528b3a78fb6a784162200b198d3e16ee
+refs/heads/master: 3c7bf1eaee1255315fc7c2c4c300295e556ef768
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
 S: Canada
 
 N: Zwane Mwaikambo
-E: zwane@linuxpower.ca
-W: http://function.linuxpower.ca
+E: zwane@arm.linux.org.uk
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1739,7 +1739,7 @@ S:	Maintained
 
 OPL3-SA2, SA3, and SAx DRIVER
 P:	Zwane Mwaikambo
-M:	zwane@commfireservices.com
+M:	zwane@arm.linux.org.uk
 L:	linux-sound@vger.kernel.org
 S:	Maintained
 
@@ -1995,7 +1995,7 @@ S:	Maintained
 
 SC1200 WDT DRIVER
 P:	Zwane Mwaikambo
-M:	zwane@commfireservices.com
+M:	zwane@arm.linux.org.uk
 S:	Maintained
 
 SCHEDULER

diff --git 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/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)
 {