diff options
| author |   Geoff Levand <geoff@infradead.org> | 2016-04-27 17:47:00 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2016-04-28 12:05:45 +0100 |
| commit | 7b7293ae3dbd0a1965bf310b77fed5f9bb37bb93 (patch) | |
| tree | 067d79bbbe9743a832e4f29e6a406e35db874c15 /arch/arm64/mm/proc.S | |
| parent | arm64: acpi: add acpi=on cmdline option to prefer ACPI boot over DT (diff) | |
| download | linux-dev-7b7293ae3dbd0a1965bf310b77fed5f9bb37bb93.tar.xz linux-dev-7b7293ae3dbd0a1965bf310b77fed5f9bb37bb93.zip | |
arm64: Fold proc-macros.S into assembler.h
To allow the assembler macros defined in arch/arm64/mm/proc-macros.S to
be used outside the mm code move the contents of proc-macros.S to
asm/assembler.h. Also, delete proc-macros.S, and fix up all references
to proc-macros.S.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
[rebased, included dcache_by_line_op]
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm/proc.S')
| -rw-r--r-- | arch/arm64/mm/proc.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 543f5198005a..9f6deacf41d2 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -23,13 +23,10 @@ #include <asm/assembler.h> #include <asm/asm-offsets.h> #include <asm/hwcap.h> -#include <asm/pgtable-hwdef.h> #include <asm/pgtable.h> #include <asm/cpufeature.h> #include <asm/alternative.h> -#include "proc-macros.S" - #ifdef CONFIG_ARM64_64K_PAGES #define TCR_TG_FLAGS TCR_TG0_64K | TCR_TG1_64K #elif defined(CONFIG_ARM64_16K_PAGES) |