| Message ID | 20180531043349.24783-2-benh@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3bad719b495467a7e7023c5b26f0f5a523a4a193 |
| Headers | show |
| Series | [RFC,01/11] powerpc/prom_init: Make of_workarounds static | expand |
Benjamin Herrenschmidt <benh@kernel.crashing.org> writes: > It's not used anywhere else > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > arch/powerpc/kernel/prom_init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c > index f9d6befb55a6..d6f52cc141c3 100644 > --- a/arch/powerpc/kernel/prom_init.c > +++ b/arch/powerpc/kernel/prom_init.c > @@ -88,7 +88,7 @@ > #define OF_WORKAROUNDS 0 > #else > #define OF_WORKAROUNDS of_workarounds > -int of_workarounds; > +static int of_workarounds __promdata; I don't have __promdata: arch/powerpc/kernel/prom_init.c:90:27: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__promdata’ static int of_workarounds __promdata; ^~~~~~~~~~ arch/powerpc/kernel/prom_init.c: In function ‘prom_claim’: arch/powerpc/kernel/prom_init.c:89:24: error: ‘of_workarounds’ undeclared (first use in this function); did you mean ‘of_irq_workarounds’? #define OF_WORKAROUNDS of_workarounds ^ arch/powerpc/kernel/prom_init.c:438:21: note: in expansion of macro ‘OF_WORKAROUNDS’ if (align == 0 && (OF_WORKAROUNDS & OF_WA_CLAIM)) { ^~~~~~~~~~~~~~ arch/powerpc/kernel/prom_init.c:89:24: note: each undeclared identifier is reported only once for each function it appears in #define OF_WORKAROUNDS of_workarounds ^ arch/powerpc/kernel/prom_init.c:438:21: note: in expansion of macro ‘OF_WORKAROUNDS’ if (align == 0 && (OF_WORKAROUNDS & OF_WA_CLAIM)) { ^~~~~~~~~~~~~~ arch/powerpc/kernel/prom_init.c: In function ‘prom_setprop’: arch/powerpc/kernel/prom_init.c:89:24: error: ‘of_workarounds’ undeclared (first use in this function); did you mean ‘of_irq_workarounds’? #define OF_WORKAROUNDS of_workarounds ^ arch/powerpc/kernel/prom_init.c:544:8: note: in expansion of macro ‘OF_WORKAROUNDS’ if (!(OF_WORKAROUNDS & OF_WA_LONGTRAIL)) ^~~~~~~~~~~~~~ arch/powerpc/kernel/prom_init.c: In function ‘prom_find_mmu’: arch/powerpc/kernel/prom_init.c:2072:3: error: ‘of_workarounds’ undeclared (first use in this function); did you mean ‘of_irq_workarounds’? of_workarounds = OF_WA_CLAIM; ^~~~~~~~~~~~~~ of_irq_workarounds cheers
On Thu, 2018-05-31 at 04:33:39 UTC, Benjamin Herrenschmidt wrote: > It's not used anywhere else > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/3bad719b495467a7e7023c5b26f0f5 cheers
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index f9d6befb55a6..d6f52cc141c3 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -88,7 +88,7 @@ #define OF_WORKAROUNDS 0 #else #define OF_WORKAROUNDS of_workarounds -int of_workarounds; +static int of_workarounds __promdata; #endif #define OF_WA_CLAIM 1 /* do phys/virt claim separately, then map */
It's not used anywhere else Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/kernel/prom_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)