From 2564a0257ec1e7514fc3510c19396b6b116f9876 Mon Sep 17 00:00:00 2001 From: Zwane Mwaikambo Date: Thu, 18 Aug 2005 11:24:07 -0700 Subject: [PATCH] --- yaml --- r: 5864 b: refs/heads/master c: 3c7bf1eaee1255315fc7c2c4c300295e556ef768 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 3 +-- trunk/MAINTAINERS | 4 ++-- trunk/arch/ia64/hp/sim/boot/bootloader.c | 6 +----- trunk/include/asm-ia64/io.h | 8 ++++++++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 56a7cd62ff0b..422a9097d93b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eaefb39528b3a78fb6a784162200b198d3e16ee +refs/heads/master: 3c7bf1eaee1255315fc7c2c4c300295e556ef768 diff --git a/trunk/CREDITS b/trunk/CREDITS index 50121d432b62..f553f8cfaa62 100644 --- 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 index 33122b1519ca..564a03e61a0c 100644 --- 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 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/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) {