Files in lib/arm including "asm/someheader.h" will get
lib/arm/asm/someheader.h, not lib/asm/someheader.h. So we
need to use <> instead of "" in order to prepare for headers
of the same name, but for a different arch. We change all
'#include's of all arm files, as consistency looks better.
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
arm/cstart.S | 6 +++---
arm/selftest.c | 14 +++++++-------
lib/arm/asm-offsets.c | 4 ++--
lib/arm/asm/asm-offsets.h | 2 +-
lib/arm/asm/io.h | 8 ++++----
lib/arm/asm/mmu.h | 6 +++---
lib/arm/asm/page.h | 2 +-
lib/arm/asm/processor.h | 2 +-
lib/arm/asm/ptrace.h | 2 +-
lib/arm/asm/setup.h | 4 ++--
lib/arm/eabi_compat.c | 2 +-
lib/arm/io.c | 10 +++++-----
lib/arm/mmu.c | 6 +++---
lib/arm/processor.c | 6 +++---
lib/arm/setup.c | 14 +++++++-------
lib/arm/spinlock.c | 8 ++++----
16 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/arm/cstart.S b/arm/cstart.S
index a1ccfb24bb4e0..1e3c3a32375fd 100644
--- a/arm/cstart.S
+++ b/arm/cstart.S
@@ -6,9 +6,9 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
#define __ASSEMBLY__
-#include "asm/asm-offsets.h"
-#include "asm/ptrace.h"
-#include "asm/cp15.h"
+#include <asm/asm-offsets.h>
+#include <asm/ptrace.h>
+#include <asm/cp15.h>
.arm
diff --git a/arm/selftest.c b/arm/selftest.c
index 0f70e1dcb3b0e..0de794ea7d696 100644
--- a/arm/selftest.c
+++ b/arm/selftest.c
@@ -5,13 +5,13 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "alloc.h"
-#include "asm/setup.h"
-#include "asm/ptrace.h"
-#include "asm/asm-offsets.h"
-#include "asm/processor.h"
-#include "asm/page.h"
+#include <libcflat.h>
+#include <alloc.h>
+#include <asm/setup.h>
+#include <asm/ptrace.h>
+#include <asm/asm-offsets.h>
+#include <asm/processor.h>
+#include <asm/page.h>
#define TESTGRP "selftest"
diff --git a/lib/arm/asm-offsets.c b/lib/arm/asm-offsets.c
index a9c349d2d427c..76380dfa15ab8 100644
--- a/lib/arm/asm-offsets.c
+++ b/lib/arm/asm-offsets.c
@@ -5,8 +5,8 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "asm/ptrace.h"
+#include <libcflat.h>
+#include <asm/ptrace.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
diff --git a/lib/arm/asm/asm-offsets.h b/lib/arm/asm/asm-offsets.h
index c2ff2ba6ec417..d370ee36a182b 100644
--- a/lib/arm/asm/asm-offsets.h
+++ b/lib/arm/asm/asm-offsets.h
@@ -1 +1 @@
-#include "generated/asm-offsets.h"
+#include <generated/asm-offsets.h>
diff --git a/lib/arm/asm/io.h b/lib/arm/asm/io.h
index bbcbcd0542490..ba3b0b2412adb 100644
--- a/lib/arm/asm/io.h
+++ b/lib/arm/asm/io.h
@@ -1,8 +1,8 @@
#ifndef _ASMARM_IO_H_
#define _ASMARM_IO_H_
-#include "libcflat.h"
-#include "asm/barrier.h"
-#include "asm/page.h"
+#include <libcflat.h>
+#include <asm/barrier.h>
+#include <asm/page.h>
#define __iomem
#define __force
@@ -89,6 +89,6 @@ static inline void *phys_to_virt(phys_addr_t x)
return (void *)__phys_to_virt(x);
}
-#include "asm-generic/io.h"
+#include <asm-generic/io.h>
#endif /* _ASMARM_IO_H_ */
diff --git a/lib/arm/asm/mmu.h b/lib/arm/asm/mmu.h
index 451c7493c2aba..1117aeaf06a57 100644
--- a/lib/arm/asm/mmu.h
+++ b/lib/arm/asm/mmu.h
@@ -5,9 +5,9 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "asm/page.h"
-#include "asm/barrier.h"
-#include "alloc.h"
+#include <asm/page.h>
+#include <asm/barrier.h>
+#include <alloc.h>
#define PTRS_PER_PGD 4
#define PGDIR_SHIFT 30
diff --git a/lib/arm/asm/page.h b/lib/arm/asm/page.h
index 6ff849a0c0e3b..304c80b9ddfd7 100644
--- a/lib/arm/asm/page.h
+++ b/lib/arm/asm/page.h
@@ -6,7 +6,7 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "const.h"
+#include <const.h>
#define PAGE_SHIFT 12
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h
index 883cab89622f7..a56f8d1fc9797 100644
--- a/lib/arm/asm/processor.h
+++ b/lib/arm/asm/processor.h
@@ -5,7 +5,7 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "ptrace.h"
+#include <asm/ptrace.h>
enum vector {
EXCPTN_RST,
diff --git a/lib/arm/asm/ptrace.h b/lib/arm/asm/ptrace.h
index 3a4c7532258f6..9ee71c760d22f 100644
--- a/lib/arm/asm/ptrace.h
+++ b/lib/arm/asm/ptrace.h
@@ -49,7 +49,7 @@
#define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
#ifndef __ASSEMBLY__
-#include "libcflat.h"
+#include <libcflat.h>
struct pt_regs {
unsigned long uregs[18];
diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h
index 21445ef2085fc..3ef3b2c99a9de 100644
--- a/lib/arm/asm/setup.h
+++ b/lib/arm/asm/setup.h
@@ -5,8 +5,8 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "alloc.h"
+#include <libcflat.h>
+#include <alloc.h>
#define NR_CPUS 8
extern u32 cpus[NR_CPUS];
diff --git a/lib/arm/eabi_compat.c b/lib/arm/eabi_compat.c
index 59d624dcd9277..8133ce7995cb0 100644
--- a/lib/arm/eabi_compat.c
+++ b/lib/arm/eabi_compat.c
@@ -1,7 +1,7 @@
/*
* Adapted from u-boot's arch/arm/lib/eabi_compat.c
*/
-#include "libcflat.h"
+#include <libcflat.h>
int raise(int signum __unused)
{
diff --git a/lib/arm/io.c b/lib/arm/io.c
index 60c0fdba2bff6..8b1501886736a 100644
--- a/lib/arm/io.c
+++ b/lib/arm/io.c
@@ -8,11 +8,11 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "devicetree.h"
-#include "chr-testdev.h"
-#include "asm/spinlock.h"
-#include "asm/io.h"
+#include <libcflat.h>
+#include <devicetree.h>
+#include <chr-testdev.h>
+#include <asm/spinlock.h>
+#include <asm/io.h>
extern void halt(int code);
diff --git a/lib/arm/mmu.c b/lib/arm/mmu.c
index c9d39bf6464b8..a42ae84bcec1f 100644
--- a/lib/arm/mmu.c
+++ b/lib/arm/mmu.c
@@ -5,9 +5,9 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "asm/setup.h"
-#include "asm/mmu.h"
-#include "asm/pgtable-hwdef.h"
+#include <asm/setup.h>
+#include <asm/mmu.h>
+#include <asm/pgtable-hwdef.h>
static bool mmu_on;
static pgd_t idmap[PTRS_PER_PGD] __attribute__((aligned(L1_CACHE_BYTES)));
diff --git a/lib/arm/processor.c b/lib/arm/processor.c
index 866d11975b23b..da4163664a835 100644
--- a/lib/arm/processor.c
+++ b/lib/arm/processor.c
@@ -5,9 +5,9 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "asm/ptrace.h"
-#include "asm/processor.h"
+#include <libcflat.h>
+#include <asm/ptrace.h>
+#include <asm/processor.h>
static const char *processor_modes[] = {
"USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" ,
diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index 50ca4cb9ff99e..9d2094da8a29c 100644
--- a/lib/arm/setup.c
+++ b/lib/arm/setup.c
@@ -10,13 +10,13 @@
*
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-#include "libcflat.h"
-#include "libfdt/libfdt.h"
-#include "devicetree.h"
-#include "alloc.h"
-#include "asm/setup.h"
-#include "asm/page.h"
-#include "asm/mmu.h"
+#include <libcflat.h>
+#include <libfdt/libfdt.h>
+#include <devicetree.h>
+#include <alloc.h>
+#include <asm/setup.h>
+#include <asm/page.h>
+#include <asm/mmu.h>
extern unsigned long stacktop;
extern void io_init(void);
diff --git a/lib/arm/spinlock.c b/lib/arm/spinlock.c
index e2bb1ace43c4e..3b023ceaebf71 100644
--- a/lib/arm/spinlock.c
+++ b/lib/arm/spinlock.c
@@ -1,7 +1,7 @@
-#include "libcflat.h"
-#include "asm/spinlock.h"
-#include "asm/barrier.h"
-#include "asm/mmu.h"
+#include <libcflat.h>
+#include <asm/spinlock.h>
+#include <asm/barrier.h>
+#include <asm/mmu.h>
void spin_lock(struct spinlock *lock)
{
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
