lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 Oct 2009 11:46:42 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Janusz Krzysztofik <jkrzyszt@....icnet.pl>, Alexander Shishkin <virtuoso@...nd.org>, Ladislav Michl <ladis@...ux-mips.org> Subject: linux-next: manual merge of the omap tree with Linus' tree Hi all, Today's linux-next merge of the omap tree got a conflict in arch/arm/mach-omap1/serial.c between commit c33da3a80074094303d643a90ef589330b491270 ("omap1: Fix redundant UARTs pin muxing that can break other hardware support") from Linus' tree and commits 84f90c9cc81d8db172d4f768fc4010f508897366 ("omap: Change low-level serial init to use ioremap") and acb1aed4a5f23c545073b0d65302e5949f239fa0 ("omap: Eliminate OMAP_MAX_NR_PORTS") from the omap tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc arch/arm/mach-omap1/serial.c index d23979b,f82f66e..0000000 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@@ -130,7 -120,17 +120,15 @@@ void __init omap_serial_init(void serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16; } - for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { + for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) { - unsigned char reg; - + /* Static mapping, never released */ + serial_platform_data[i].membase = + ioremap(serial_platform_data[i].mapbase, SZ_2K); + if (!serial_platform_data[i].membase) { + printk(KERN_ERR "Could not ioremap uart%i\n", i); + continue; + } + switch (i) { case 0: uart1_ck = clk_get(NULL, "uart1_ck"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists