On Tuesday 13 November 2007 21:37, Sergei Shtylyov wrote:
> The mpsc_kgdb.c driver can only work with the old PPC kernels -- make it
> also work for the PowerPC kernels as well...
Unfortunately, the patch used CONFIG_PPC to differ arch/ppc and arch/powerpc
kernels which rendered the whole patch broken and useless -- fix this by using
CONFIG_PPC_MERGE to correctly differ between the old and new kernels...
---
The patch is against the linux_2_6_24_uprev branch...
drivers/serial/mpsc_kgdb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-2.6/drivers/serial/mpsc_kgdb.c
===================================================================
--- linux-2.6.orig/drivers/serial/mpsc_kgdb.c
+++ linux-2.6/drivers/serial/mpsc_kgdb.c
@@ -7,7 +7,7 @@
*
* Author: Randy Vinson <[EMAIL PROTECTED]>
*
- * Copyright (C) 2005-2006 MontaVista Software, Inc.
+ * Copyright (C) 2005-2007 MontaVista Software, Inc.
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
@@ -273,7 +273,7 @@ static void __init kgdbmpsc_local_exit(v
MPSC_BASE_ORDER, mpsc_base);
}
-#ifdef CONFIG_PPC
+#ifndef CONFIG_PPC_MERGE
static void __init kgdbmpsc_update_pdata(struct platform_device *pdev)
{
@@ -319,11 +319,11 @@ void kgdbmpsc_set_mpsc_dev(struct platfo
if (id == kgdbmpsc_ttyMM)
memcpy(&mpsc_dev, pdev, sizeof(struct platform_device));
}
-#endif /* CONFIG_PPC */
+#endif /* CONFIG_PPC_MERGE */
static int __init kgdbmpsc_init_io(void)
{
-#ifdef CONFIG_PPC
+#ifndef CONFIG_PPC_MERGE
kgdbmpsc_pdev_init();
#endif
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Kgdb-bugreport mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kgdb-bugreport
