Skip to content

Commit

Permalink
UAPI: (Scripted) Convert #include "..." to #include <path/...> in ker…
Browse files Browse the repository at this point in the history
…nel system headers

Convert #include "..." to #include <path/...> in kernel system headers.

Signed-off-by: David Howells <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Acked-by: Thomas Gleixner <[email protected]>
Acked-by: Paul E. McKenney <[email protected]>
Acked-by: Dave Jones <[email protected]>
  • Loading branch information
dhowells committed Oct 2, 2012
1 parent 760285e commit a1ce392
Show file tree
Hide file tree
Showing 176 changed files with 350 additions and 350 deletions.
2 changes: 1 addition & 1 deletion arch/arm/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#ifndef CONFIG_MMU

#include "page-nommu.h"
#include <asm/page-nommu.h>

#else

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef CONFIG_MMU

#include <asm-generic/4level-fixup.h>
#include "pgtable-nommu.h"
#include <asm/pgtable-nommu.h>

#else

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/vfpmacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#include <asm/hwcap.h>

#include "vfp.h"
#include <asm/vfp.h>

@ Macros to allow building with old toolkits (with no VFP support)
.macro VFPFMRX, rd, sysreg, cond
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/include/arch-v10/arch/sv_addr_ag.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

/*------------------------------------------------------------*/

#include "sv_addr.agh"
#include <arch/sv_addr.agh>

#if __test_sv_addr__
/* IO_MASK( R_BUS_CONFIG , CE ) */
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/include/arch-v10/arch/svinto.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _ASM_CRIS_SVINTO_H
#define _ASM_CRIS_SVINTO_H

#include "sv_addr_ag.h"
#include <arch/sv_addr_ag.h>

extern unsigned int genconfig_shadow; /* defined and set in head.S */

Expand Down
2 changes: 1 addition & 1 deletion arch/cris/include/arch-v32/arch/dma.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include "mach/dma.h"
#include <mach/dma.h>
2 changes: 1 addition & 1 deletion arch/cris/include/arch-v32/arch/hwregs/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define dma_h

/* registers */ /* Really needed, since both are listed in sw.list? */
#include "dma_defs.h"
#include <arch/hwregs/dma_defs.h>


/* descriptors */
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/cacheflush.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "cacheflush_no.h"
#include <asm/cacheflush_no.h>
#else
#include "cacheflush_mm.h"
#include <asm/cacheflush_mm.h>
#endif
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/io.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "io_no.h"
#include <asm/io_no.h>
#else
#include "io_mm.h"
#include <asm/io_mm.h>
#endif
8 changes: 4 additions & 4 deletions arch/m68k/include/asm/m68360.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "m68360_regs.h"
#include "m68360_pram.h"
#include "m68360_quicc.h"
#include "m68360_enet.h"
#include <asm/m68360_regs.h>
#include <asm/m68360_pram.h>
#include <asm/m68360_quicc.h>
#include <asm/m68360_enet.h>

#ifdef CONFIG_M68360

Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/m68360_enet.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#ifndef __ETHER_H
#define __ETHER_H

#include "quicc_simple.h"
#include <asm/quicc_simple.h>

/*
* transmit BD's
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ extern unsigned long _ramend;
#endif /* !__ASSEMBLY__ */

#ifdef CONFIG_MMU
#include "page_mm.h"
#include <asm/page_mm.h>
#else
#include "page_no.h"
#include <asm/page_no.h>
#endif

#include <asm-generic/getorder.h>
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/pgtable.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "pgtable_no.h"
#include <asm/pgtable_no.h>
#else
#include "pgtable_mm.h"
#include <asm/pgtable_mm.h>
#endif
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/q40_master.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#define Q40_RTC_WRITE 128

/* define some Q40 specific ints */
#include "q40ints.h"
#include <asm/q40ints.h>

/* misc defs */
#define DAC_LEFT ((unsigned char *)0xff008000)
Expand Down
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/uaccess.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "uaccess_no.h"
#include <asm/uaccess_no.h>
#else
#include "uaccess_mm.h"
#include <asm/uaccess_mm.h>
#endif
2 changes: 1 addition & 1 deletion arch/microblaze/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef CONFIG_MMU
# include "mmu_context_mm.h"
# include <asm/mmu_context_mm.h>
#else
# include <asm-generic/mmu_context.h>
#endif
2 changes: 1 addition & 1 deletion arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BCM63XX_IO_H_
#define BCM63XX_IO_H_

#include "bcm63xx_cpu.h"
#include <asm/mach-bcm63xx/bcm63xx_cpu.h>

/*
* Physical memory map, RAM is mapped at 0x0.
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/mach-pnx833x/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- including locking between different uses
*/

#include "pnx833x.h"
#include <asm/mach-pnx833x/pnx833x.h>

#define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0)
#define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0)
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-asm.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef __CVMX_ASM_H__
#define __CVMX_ASM_H__

#include "octeon-model.h"
#include <asm/octeon/octeon-model.h>

/* other useful stuff */
#define CVMX_SYNC asm volatile ("sync" : : : "memory")
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-cmd-queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

#include <linux/prefetch.h>

#include "cvmx-fpa.h"
#include <asm/octeon/cvmx-fpa.h>
/**
* By default we disable the max depth support. Most programs
* don't use it and it slows down the command queue processing
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/include/asm/octeon/cvmx-fpa.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#ifndef __CVMX_FPA_H__
#define __CVMX_FPA_H__

#include "cvmx-address.h"
#include "cvmx-fpa-defs.h"
#include <asm/octeon/cvmx-address.h>
#include <asm/octeon/cvmx-fpa-defs.h>

#define CVMX_FPA_NUM_POOLS 8
#define CVMX_FPA_MIN_BLOCK_SIZE 128
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-helper-board.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#ifndef __CVMX_HELPER_BOARD_H__
#define __CVMX_HELPER_BOARD_H__

#include "cvmx-helper.h"
#include <asm/octeon/cvmx-helper.h>

typedef enum {
set_phy_link_flags_autoneg = 0x1,
Expand Down
20 changes: 10 additions & 10 deletions arch/mips/include/asm/octeon/cvmx-helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#ifndef __CVMX_HELPER_H__
#define __CVMX_HELPER_H__

#include "cvmx-config.h"
#include "cvmx-fpa.h"
#include "cvmx-wqe.h"
#include <asm/octeon/cvmx-config.h>
#include <asm/octeon/cvmx-fpa.h>
#include <asm/octeon/cvmx-wqe.h>

typedef enum {
CVMX_HELPER_INTERFACE_MODE_DISABLED,
Expand All @@ -62,13 +62,13 @@ typedef union {
} cvmx_helper_link_info_t;

#include <asm/octeon/cvmx-helper-errata.h>
#include "cvmx-helper-loop.h"
#include "cvmx-helper-npi.h"
#include "cvmx-helper-rgmii.h"
#include "cvmx-helper-sgmii.h"
#include "cvmx-helper-spi.h"
#include "cvmx-helper-util.h"
#include "cvmx-helper-xaui.h"
#include <asm/octeon/cvmx-helper-loop.h>
#include <asm/octeon/cvmx-helper-npi.h>
#include <asm/octeon/cvmx-helper-rgmii.h>
#include <asm/octeon/cvmx-helper-sgmii.h>
#include <asm/octeon/cvmx-helper-spi.h>
#include <asm/octeon/cvmx-helper-util.h>
#include <asm/octeon/cvmx-helper-xaui.h>

/**
* cvmx_override_pko_queue_priority(int ipd_port, uint64_t
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-mdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#ifndef __CVMX_MIO_H__
#define __CVMX_MIO_H__

#include "cvmx-smix-defs.h"
#include <asm/octeon/cvmx-smix-defs.h>

/**
* PHY register 0 from the 802.3 spec
Expand Down
6 changes: 3 additions & 3 deletions arch/mips/include/asm/octeon/cvmx-pip.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#ifndef __CVMX_PIP_H__
#define __CVMX_PIP_H__

#include "cvmx-wqe.h"
#include "cvmx-fpa.h"
#include "cvmx-pip-defs.h"
#include <asm/octeon/cvmx-wqe.h>
#include <asm/octeon/cvmx-fpa.h>
#include <asm/octeon/cvmx-pip-defs.h>

#define CVMX_PIP_NUM_INPUT_PORTS 40
#define CVMX_PIP_NUM_WATCHERS 4
Expand Down
8 changes: 4 additions & 4 deletions arch/mips/include/asm/octeon/cvmx-pko.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
#ifndef __CVMX_PKO_H__
#define __CVMX_PKO_H__

#include "cvmx-fpa.h"
#include "cvmx-pow.h"
#include "cvmx-cmd-queue.h"
#include "cvmx-pko-defs.h"
#include <asm/octeon/cvmx-fpa.h>
#include <asm/octeon/cvmx-pow.h>
#include <asm/octeon/cvmx-cmd-queue.h>
#include <asm/octeon/cvmx-pko-defs.h>

/* Adjust the command buffer size by 1 word so that in the case of using only
* two word PKO commands no command words stradle buffers. The useful values
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/include/asm/octeon/cvmx-pow.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@

#include <asm/octeon/cvmx-pow-defs.h>

#include "cvmx-scratch.h"
#include "cvmx-wqe.h"
#include <asm/octeon/cvmx-scratch.h>
#include <asm/octeon/cvmx-wqe.h>

/* Default to having all POW constancy checks turned on */
#ifndef CVMX_ENABLE_POW_CHECKS
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-spi.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef __CVMX_SPI_H__
#define __CVMX_SPI_H__

#include "cvmx-gmxx-defs.h"
#include <asm/octeon/cvmx-gmxx-defs.h>

/* CSR typedefs have been moved to cvmx-csr-*.h */

Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-spinlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#ifndef __CVMX_SPINLOCK_H__
#define __CVMX_SPINLOCK_H__

#include "cvmx-asm.h"
#include <asm/octeon/cvmx-asm.h>

/* Spinlocks for Octeon */

Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/cvmx-wqe.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifndef __CVMX_WQE_H__
#define __CVMX_WQE_H__

#include "cvmx-packet.h"
#include <asm/octeon/cvmx-packet.h>


#define OCT_TAG_TYPE_STRING(x) \
Expand Down
36 changes: 18 additions & 18 deletions arch/mips/include/asm/octeon/cvmx.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,24 @@ enum cvmx_mips_space {
#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))
#endif

#include "cvmx-asm.h"
#include "cvmx-packet.h"
#include "cvmx-sysinfo.h"

#include "cvmx-ciu-defs.h"
#include "cvmx-gpio-defs.h"
#include "cvmx-iob-defs.h"
#include "cvmx-ipd-defs.h"
#include "cvmx-l2c-defs.h"
#include "cvmx-l2d-defs.h"
#include "cvmx-l2t-defs.h"
#include "cvmx-led-defs.h"
#include "cvmx-mio-defs.h"
#include "cvmx-pow-defs.h"

#include "cvmx-bootinfo.h"
#include "cvmx-bootmem.h"
#include "cvmx-l2c.h"
#include <asm/octeon/cvmx-asm.h>
#include <asm/octeon/cvmx-packet.h>
#include <asm/octeon/cvmx-sysinfo.h>

#include <asm/octeon/cvmx-ciu-defs.h>
#include <asm/octeon/cvmx-gpio-defs.h>
#include <asm/octeon/cvmx-iob-defs.h>
#include <asm/octeon/cvmx-ipd-defs.h>
#include <asm/octeon/cvmx-l2c-defs.h>
#include <asm/octeon/cvmx-l2d-defs.h>
#include <asm/octeon/cvmx-l2t-defs.h>
#include <asm/octeon/cvmx-led-defs.h>
#include <asm/octeon/cvmx-mio-defs.h>
#include <asm/octeon/cvmx-pow-defs.h>

#include <asm/octeon/cvmx-bootinfo.h>
#include <asm/octeon/cvmx-bootmem.h>
#include <asm/octeon/cvmx-l2c.h>

#ifndef CVMX_ENABLE_DEBUG_PRINTS
#define CVMX_ENABLE_DEBUG_PRINTS 1
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/octeon-model.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,6 @@ static inline int __octeon_is_model_runtime__(uint32_t model)
const char *octeon_model_get_string(uint32_t chip_id);
const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);

#include "octeon-feature.h"
#include <asm/octeon/octeon-feature.h>

#endif /* __OCTEON_MODEL_H__ */
2 changes: 1 addition & 1 deletion arch/mips/include/asm/octeon/octeon.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef __ASM_OCTEON_OCTEON_H
#define __ASM_OCTEON_OCTEON_H

#include "cvmx.h"
#include <asm/octeon/cvmx.h>

extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
uint64_t alignment,
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/sibyte/bcm1480_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#ifndef _BCM1480_INT_H
#define _BCM1480_INT_H

#include "sb1250_defs.h"
#include <asm/sibyte/sb1250_defs.h>

/* *********************************************************************
* Interrupt Mapper Constants
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/sibyte/bcm1480_l2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef _BCM1480_L2C_H
#define _BCM1480_L2C_H

#include "sb1250_defs.h"
#include <asm/sibyte/sb1250_defs.h>

/*
* Format of level 2 cache management address (Table 55)
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/sibyte/bcm1480_mc.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef _BCM1480_MC_H
#define _BCM1480_MC_H

#include "sb1250_defs.h"
#include <asm/sibyte/sb1250_defs.h>

/*
* Memory Channel Configuration Register (Table 81)
Expand Down
Loading

0 comments on commit a1ce392

Please sign in to comment.