Kevin, > -----Original Message----- > From: Tony Lindgren [mailto:tony@xxxxxxxxxxx] > Sent: Monday, August 24, 2009 7:41 PM > To: Shilimkar, Santosh > Cc: rmk@xxxxxxxxxxxxxxxx; khilman@xxxxxxxxxxxxxxxxxxx; linux-arm- > kernel@xxxxxxxxxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx; Syed, Rafiuddin > Subject: Re: [PATCH 1/2] ARM: OMAP4: Fix NULL pointer dereference crash. > > * Santosh Shilimkar <santosh.shilimkar@xxxxxx> [090821 12:15]: > > After the patch series "[PATCH 00/14] OMAP PM fixes for .31-rc" > > merge in 2.6.31-rc5, the kernel crashed during boot on OMAP4430. > > This patch fixes it by adding UART4 support and related code. > > Without this patch omap_serial_init() would produce " NULL pointer > > dereference" and kernel crashes in the bootup on OMAP4430 platform. > > > > Some more info on the merge issue can be found here. > > More info- http://lkml.org/lkml/2009/8/20/192 > > > > Note: While merging this patch,"IO_ADDRESS" needs to be changed > > to "OMAP2_IO_ADDRESS" if the Tony's below series is already merged in. > > http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg15072.html > > > > Signed-off-by: Syed Rafiuddin <rafiuddin.syed@xxxxxx> > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > > --- > > arch/arm/mach-omap2/board-4430sdp.c | 2 +- > > arch/arm/mach-omap2/serial.c | 27 ++++++++++++++++++++++++++- > > 2 files changed, 27 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach- > omap2/board-4430sdp.c > > index b0c7402..1b22307 100644 > > --- a/arch/arm/mach-omap2/board-4430sdp.c > > +++ b/arch/arm/mach-omap2/board-4430sdp.c > > @@ -39,7 +39,7 @@ static struct platform_device *sdp4430_devices[] > __initdata = { > > }; > > > > static struct omap_uart_config sdp4430_uart_config __initdata = { > > - .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2), > > + .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3), > > }; > > > > This part above won't be needed any longer with patches in omap for next. Will you fix this in your branch or shall I post v4. Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html