| Message ID | 20210323062916.295346-1-wanjiabing@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] arch: powerpc: Remove duplicate includes | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (87d76f542a24ecfa797e9bd3bb56c0f19aabff57) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 29 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Wan Jiabing <wanjiabing@vivo.com> writes: > mmu-hash.h: asm/bug.h has been included at line 12, so remove > the duplicate one at line 21. Looking at the file I had wondered if this was due to a #ifdef being removed, but no, the second one was just added in commit 891121e6c02c ("powerpc/mm: Differentiate between hugetlb and THP during page walk"). How odd! Anyway, all of these look good to me, and the automated checks at http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210323062916.295346-1-wanjiabing@vivo.com/ have all passed. Reviewed-by: Daniel Axtens <dja@axtens.net> Kind regards, Daniel
On Tue, 23 Mar 2021 14:29:05 +0800, Wan Jiabing wrote: > mmu-hash.h: asm/bug.h has been included at line 12, so remove > the duplicate one at line 21. > interrupt.c: asm/interrupt.h has been included at line 12, so > remove the duplicate one at line 10. > time.c: linux/sched/clock.h has been included at line 33,so > remove the duplicate one at line 56 and move sched/cputime.h > under sched including segament. > > [...] Applied to powerpc/next. [1/1] arch: powerpc: Remove duplicate includes https://git.kernel.org/powerpc/c/e225c4d6bc389701f2f63fc246420a1da3465ab5 cheers
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index f911bdb68d8b..3004f3323144 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -18,7 +18,6 @@ * complete pgtable.h but only a portion of it. */ #include <asm/book3s/64/pgtable.h> -#include <asm/bug.h> #include <asm/task_size_64.h> #include <asm/cpu_has_feature.h> diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c index c475a229a42a..11d456896772 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -7,7 +7,6 @@ #include <asm/asm-prototypes.h> #include <asm/kup.h> #include <asm/cputime.h> -#include <asm/interrupt.h> #include <asm/hw_irq.h> #include <asm/interrupt.h> #include <asm/kprobes.h> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index b67d93a609a2..e2766e0e2a3a 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -31,6 +31,7 @@ #include <linux/export.h> #include <linux/sched.h> #include <linux/sched/clock.h> +#include <linux/sched/cputime.h> #include <linux/kernel.h> #include <linux/param.h> #include <linux/string.h> @@ -52,8 +53,6 @@ #include <linux/irq_work.h> #include <linux/of_clk.h> #include <linux/suspend.h> -#include <linux/sched/cputime.h> -#include <linux/sched/clock.h> #include <linux/processor.h> #include <asm/trace.h>
mmu-hash.h: asm/bug.h has been included at line 12, so remove the duplicate one at line 21. interrupt.c: asm/interrupt.h has been included at line 12, so remove the duplicate one at line 10. time.c: linux/sched/clock.h has been included at line 33,so remove the duplicate one at line 56 and move sched/cputime.h under sched including segament. Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> --- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 - arch/powerpc/kernel/interrupt.c | 1 - arch/powerpc/kernel/time.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-)