mirror of https://gitee.com/openkylin/linux.git
powerpc: Remove duplicate includes
asm/tm.h included in traps.c is duplicated. It is also included on the 62nd line. asm/udbg.h included in setup-common.c is duplicated. It is also included on the 61st line. asm/bug.h included in arch/powerpc/include/asm/book3s/64/mmu-hash.h is duplicated. It is also included on the 12th line. asm/tlbflush.h included in arch/powerpc/include/asm/pgtable.h is duplicated. It is also included on the 11th line. asm/page.h included in arch/powerpc/include/asm/thread_info.h is duplicated. It is also included on the 13th line. Signed-off-by: Zhang Yunkai <zhang.yunkai@zte.com.cn> [mpe: Squash together from multiple commits] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
1ef1dd9c7e
commit
1a0e4550fb
|
@ -18,7 +18,6 @@
|
||||||
* complete pgtable.h but only a portion of it.
|
* complete pgtable.h but only a portion of it.
|
||||||
*/
|
*/
|
||||||
#include <asm/book3s/64/pgtable.h>
|
#include <asm/book3s/64/pgtable.h>
|
||||||
#include <asm/bug.h>
|
|
||||||
#include <asm/task_size_64.h>
|
#include <asm/task_size_64.h>
|
||||||
#include <asm/cpu_has_feature.h>
|
#include <asm/cpu_has_feature.h>
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,6 @@ struct mm_struct;
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
#include <asm/tlbflush.h>
|
|
||||||
|
|
||||||
/* Keep these as a macros to avoid include dependency mess */
|
/* Keep these as a macros to avoid include dependency mess */
|
||||||
#define pte_page(x) pfn_to_page(pte_pfn(x))
|
#define pte_page(x) pfn_to_page(pte_pfn(x))
|
||||||
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
|
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
#include <linux/cache.h>
|
#include <linux/cache.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/page.h>
|
|
||||||
#include <asm/accounting.h>
|
#include <asm/accounting.h>
|
||||||
|
|
||||||
#define SLB_PRELOAD_NR 16U
|
#define SLB_PRELOAD_NR 16U
|
||||||
|
|
|
@ -69,7 +69,6 @@
|
||||||
#include "setup.h"
|
#include "setup.h"
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#include <asm/udbg.h>
|
|
||||||
#define DBG(fmt...) udbg_printf(fmt)
|
#define DBG(fmt...) udbg_printf(fmt)
|
||||||
#else
|
#else
|
||||||
#define DBG(fmt...)
|
#define DBG(fmt...)
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
#ifdef CONFIG_PPC64
|
#ifdef CONFIG_PPC64
|
||||||
#include <asm/firmware.h>
|
#include <asm/firmware.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/tm.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include <asm/kexec.h>
|
#include <asm/kexec.h>
|
||||||
#include <asm/ppc-opcode.h>
|
#include <asm/ppc-opcode.h>
|
||||||
|
|
Loading…
Reference in New Issue