| Submitter | Stephen Rothwell |
|---|---|
| Date | Nov. 15, 2012, 7:06 a.m. |
| Message ID | <20121115180607.4a545ad6b6b6c8e3481a11e9@canb.auug.org.au> |
| Download | mbox | patch |
| Permalink | /patch/199197/ |
| State | Not Applicable |
| Headers | show |
Comments
On Thu, 2012-11-15 at 18:06 +1100, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > lib/pSeries-reconfig-notifier-error-inject.c:4:34: fatal error: asm/pSeries_reconfig.h: No such file or directory > > Caused by commit f459d63e1689 ("powerpc+of: Remove the pSeries_reconfig.h > file") and even if the file existed, things were removed by commit > 1cf3d8b3d24c ("powerpc+of: Add of node/property notification chain for > adds and removes") that would cause > lib/pSeries-reconfig-notifier-error-inject.c to fail to build. I have > marked it as broken for now using this patch: My bad, didn't notice, I don't have error injection enabled in my test configs. I think that stuff went in after the original patches were written I think. Not a big deal, nobody actually enables that error inject test stuff just yet, I'll put a fix patch into my "dt" and my "next" branch asap. Cheers, Ben. > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Thu, 15 Nov 2012 18:02:13 +1100 > Subject: [PATCH] lib: disable PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT > > It has been fundamentally broken by other changes. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > lib/Kconfig.debug | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index 41faf0b..ad84944 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -1195,6 +1195,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT > config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT > tristate "pSeries reconfig notifier error injection module" > depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION > + depends on BROKEN > help > This option provides the ability to inject artifical errors to > pSeries reconfig notifier chain callbacks. It is controlled > -- > 1.7.10.280.gaa39 >
Patch
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 41faf0b..ad84944 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1195,6 +1195,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT tristate "pSeries reconfig notifier error injection module" depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION + depends on BROKEN help This option provides the ability to inject artifical errors to pSeries reconfig notifier chain callbacks. It is controlled
Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: lib/pSeries-reconfig-notifier-error-inject.c:4:34: fatal error: asm/pSeries_reconfig.h: No such file or directory Caused by commit f459d63e1689 ("powerpc+of: Remove the pSeries_reconfig.h file") and even if the file existed, things were removed by commit 1cf3d8b3d24c ("powerpc+of: Add of node/property notification chain for adds and removes") that would cause lib/pSeries-reconfig-notifier-error-inject.c to fail to build. I have marked it as broken for now using this patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 15 Nov 2012 18:02:13 +1100 Subject: [PATCH] lib: disable PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT It has been fundamentally broken by other changes. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- lib/Kconfig.debug | 1 + 1 file changed, 1 insertion(+)