"Peter 'p2' De Schrijver" <peter.de-schrijver@xxxxxxxxx> writes: > This patch restores the observability settings after resuming from off mode. > > Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx> I decided not to pull this one into PM branch, because... > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index 553fe02..20c7ea2 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -42,6 +42,7 @@ > #include <mach/dma.h> > #include <mach/gpmc.h> > #include <mach/dma.h> > +#include <mach/debobs.h> > #include <asm/tlbflush.h> > > #include "cm.h" > @@ -124,6 +125,9 @@ static void omap3_core_restore_context(void) > /* Restore the interrupt controller context */ > omap3_intc_restore_context(); > omap_dma_global_context_restore(); > + /* restore debobs context */ > + debobs_restore(); > + of compile failure when CONFIG_PM_DEBOBS is not enabled. And, debobs should now go upstream indepenent of PM branch. When I posted my PM debug series for the last merge window, I originally included the debobs series. It recieved some comments on the list that need to be addressed before this can go upstream. Now that the main PM debug stuff is in mainline, this series has no more dependencies on the PM branch. I think you should address the the comments/questions raised on the list[1,2] and resubmit as a series against mainline. A quick test shows that the current set of 3 debobs patches currently in the PM branch rebase easily against omap/master so should be easy to rework for upstream acceptance. Thanks, Kevin [1] http://marc.info/?l=linux-omap&m=125049645823777&w=2 [2] http://marc.info/?l=linux-omap&m=125049651623911&w=2 -- 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
