Commit a1ce3928 authored by David Howells's avatar David Howells

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

Convert #include "..." to #include <path/...> in kernel system headers.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarDave Jones <davej@redhat.com>
parent 760285e7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
#include "page-nommu.h" #include <asm/page-nommu.h>
#else #else
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
#include <asm-generic/4level-fixup.h> #include <asm-generic/4level-fixup.h>
#include "pgtable-nommu.h" #include <asm/pgtable-nommu.h>
#else #else
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*/ */
#include <asm/hwcap.h> #include <asm/hwcap.h>
#include "vfp.h" #include <asm/vfp.h>
@ Macros to allow building with old toolkits (with no VFP support) @ Macros to allow building with old toolkits (with no VFP support)
.macro VFPFMRX, rd, sysreg, cond .macro VFPFMRX, rd, sysreg, cond
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#include "sv_addr.agh" #include <arch/sv_addr.agh>
#if __test_sv_addr__ #if __test_sv_addr__
/* IO_MASK( R_BUS_CONFIG , CE ) */ /* IO_MASK( R_BUS_CONFIG , CE ) */
......
#ifndef _ASM_CRIS_SVINTO_H #ifndef _ASM_CRIS_SVINTO_H
#define _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 */ extern unsigned int genconfig_shadow; /* defined and set in head.S */
......
#include "mach/dma.h" #include <mach/dma.h>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define dma_h #define dma_h
/* registers */ /* Really needed, since both are listed in sw.list? */ /* registers */ /* Really needed, since both are listed in sw.list? */
#include "dma_defs.h" #include <arch/hwregs/dma_defs.h>
/* descriptors */ /* descriptors */
......
#ifdef __uClinux__ #ifdef __uClinux__
#include "cacheflush_no.h" #include <asm/cacheflush_no.h>
#else #else
#include "cacheflush_mm.h" #include <asm/cacheflush_mm.h>
#endif #endif
#ifdef __uClinux__ #ifdef __uClinux__
#include "io_no.h" #include <asm/io_no.h>
#else #else
#include "io_mm.h" #include <asm/io_mm.h>
#endif #endif
#include "m68360_regs.h" #include <asm/m68360_regs.h>
#include "m68360_pram.h" #include <asm/m68360_pram.h>
#include "m68360_quicc.h" #include <asm/m68360_quicc.h>
#include "m68360_enet.h" #include <asm/m68360_enet.h>
#ifdef CONFIG_M68360 #ifdef CONFIG_M68360
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef __ETHER_H #ifndef __ETHER_H
#define __ETHER_H #define __ETHER_H
#include "quicc_simple.h" #include <asm/quicc_simple.h>
/* /*
* transmit BD's * transmit BD's
......
...@@ -43,9 +43,9 @@ extern unsigned long _ramend; ...@@ -43,9 +43,9 @@ extern unsigned long _ramend;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#include "page_mm.h" #include <asm/page_mm.h>
#else #else
#include "page_no.h" #include <asm/page_no.h>
#endif #endif
#include <asm-generic/getorder.h> #include <asm-generic/getorder.h>
......
#ifdef __uClinux__ #ifdef __uClinux__
#include "pgtable_no.h" #include <asm/pgtable_no.h>
#else #else
#include "pgtable_mm.h" #include <asm/pgtable_mm.h>
#endif #endif
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#define Q40_RTC_WRITE 128 #define Q40_RTC_WRITE 128
/* define some Q40 specific ints */ /* define some Q40 specific ints */
#include "q40ints.h" #include <asm/q40ints.h>
/* misc defs */ /* misc defs */
#define DAC_LEFT ((unsigned char *)0xff008000) #define DAC_LEFT ((unsigned char *)0xff008000)
......
#ifdef __uClinux__ #ifdef __uClinux__
#include "uaccess_no.h" #include <asm/uaccess_no.h>
#else #else
#include "uaccess_mm.h" #include <asm/uaccess_mm.h>
#endif #endif
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
# include "mmu_context_mm.h" # include <asm/mmu_context_mm.h>
#else #else
# include <asm-generic/mmu_context.h> # include <asm-generic/mmu_context.h>
#endif #endif
#ifndef BCM63XX_IO_H_ #ifndef BCM63XX_IO_H_
#define 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. * Physical memory map, RAM is mapped at 0x0.
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
- including locking between different uses - 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 SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0)
#define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0) #define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0)
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef __CVMX_ASM_H__ #ifndef __CVMX_ASM_H__
#define __CVMX_ASM_H__ #define __CVMX_ASM_H__
#include "octeon-model.h" #include <asm/octeon/octeon-model.h>
/* other useful stuff */ /* other useful stuff */
#define CVMX_SYNC asm volatile ("sync" : : : "memory") #define CVMX_SYNC asm volatile ("sync" : : : "memory")
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include "cvmx-fpa.h" #include <asm/octeon/cvmx-fpa.h>
/** /**
* By default we disable the max depth support. Most programs * By default we disable the max depth support. Most programs
* don't use it and it slows down the command queue processing * don't use it and it slows down the command queue processing
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#ifndef __CVMX_FPA_H__ #ifndef __CVMX_FPA_H__
#define __CVMX_FPA_H__ #define __CVMX_FPA_H__
#include "cvmx-address.h" #include <asm/octeon/cvmx-address.h>
#include "cvmx-fpa-defs.h" #include <asm/octeon/cvmx-fpa-defs.h>
#define CVMX_FPA_NUM_POOLS 8 #define CVMX_FPA_NUM_POOLS 8
#define CVMX_FPA_MIN_BLOCK_SIZE 128 #define CVMX_FPA_MIN_BLOCK_SIZE 128
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef __CVMX_HELPER_BOARD_H__ #ifndef __CVMX_HELPER_BOARD_H__
#define __CVMX_HELPER_BOARD_H__ #define __CVMX_HELPER_BOARD_H__
#include "cvmx-helper.h" #include <asm/octeon/cvmx-helper.h>
typedef enum { typedef enum {
set_phy_link_flags_autoneg = 0x1, set_phy_link_flags_autoneg = 0x1,
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#ifndef __CVMX_HELPER_H__ #ifndef __CVMX_HELPER_H__
#define __CVMX_HELPER_H__ #define __CVMX_HELPER_H__
#include "cvmx-config.h" #include <asm/octeon/cvmx-config.h>
#include "cvmx-fpa.h" #include <asm/octeon/cvmx-fpa.h>
#include "cvmx-wqe.h" #include <asm/octeon/cvmx-wqe.h>
typedef enum { typedef enum {
CVMX_HELPER_INTERFACE_MODE_DISABLED, CVMX_HELPER_INTERFACE_MODE_DISABLED,
...@@ -62,13 +62,13 @@ typedef union { ...@@ -62,13 +62,13 @@ typedef union {
} cvmx_helper_link_info_t; } cvmx_helper_link_info_t;
#include <asm/octeon/cvmx-helper-errata.h> #include <asm/octeon/cvmx-helper-errata.h>
#include "cvmx-helper-loop.h" #include <asm/octeon/cvmx-helper-loop.h>
#include "cvmx-helper-npi.h" #include <asm/octeon/cvmx-helper-npi.h>
#include "cvmx-helper-rgmii.h" #include <asm/octeon/cvmx-helper-rgmii.h>
#include "cvmx-helper-sgmii.h" #include <asm/octeon/cvmx-helper-sgmii.h>
#include "cvmx-helper-spi.h" #include <asm/octeon/cvmx-helper-spi.h>
#include "cvmx-helper-util.h" #include <asm/octeon/cvmx-helper-util.h>
#include "cvmx-helper-xaui.h" #include <asm/octeon/cvmx-helper-xaui.h>
/** /**
* cvmx_override_pko_queue_priority(int ipd_port, uint64_t * cvmx_override_pko_queue_priority(int ipd_port, uint64_t
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifndef __CVMX_MIO_H__ #ifndef __CVMX_MIO_H__
#define __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 * PHY register 0 from the 802.3 spec
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#ifndef __CVMX_PIP_H__ #ifndef __CVMX_PIP_H__
#define __CVMX_PIP_H__ #define __CVMX_PIP_H__
#include "cvmx-wqe.h" #include <asm/octeon/cvmx-wqe.h>
#include "cvmx-fpa.h" #include <asm/octeon/cvmx-fpa.h>
#include "cvmx-pip-defs.h" #include <asm/octeon/cvmx-pip-defs.h>
#define CVMX_PIP_NUM_INPUT_PORTS 40 #define CVMX_PIP_NUM_INPUT_PORTS 40
#define CVMX_PIP_NUM_WATCHERS 4 #define CVMX_PIP_NUM_WATCHERS 4
......
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
#ifndef __CVMX_PKO_H__ #ifndef __CVMX_PKO_H__
#define __CVMX_PKO_H__ #define __CVMX_PKO_H__
#include "cvmx-fpa.h" #include <asm/octeon/cvmx-fpa.h>
#include "cvmx-pow.h" #include <asm/octeon/cvmx-pow.h>
#include "cvmx-cmd-queue.h" #include <asm/octeon/cvmx-cmd-queue.h>
#include "cvmx-pko-defs.h" #include <asm/octeon/cvmx-pko-defs.h>
/* Adjust the command buffer size by 1 word so that in the case of using only /* 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 * two word PKO commands no command words stradle buffers. The useful values
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#include <asm/octeon/cvmx-pow-defs.h> #include <asm/octeon/cvmx-pow-defs.h>
#include "cvmx-scratch.h" #include <asm/octeon/cvmx-scratch.h>
#include "cvmx-wqe.h" #include <asm/octeon/cvmx-wqe.h>
/* Default to having all POW constancy checks turned on */ /* Default to having all POW constancy checks turned on */
#ifndef CVMX_ENABLE_POW_CHECKS #ifndef CVMX_ENABLE_POW_CHECKS
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef __CVMX_SPI_H__ #ifndef __CVMX_SPI_H__
#define __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 */ /* CSR typedefs have been moved to cvmx-csr-*.h */
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifndef __CVMX_SPINLOCK_H__ #ifndef __CVMX_SPINLOCK_H__
#define __CVMX_SPINLOCK_H__ #define __CVMX_SPINLOCK_H__
#include "cvmx-asm.h" #include <asm/octeon/cvmx-asm.h>
/* Spinlocks for Octeon */ /* Spinlocks for Octeon */
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#ifndef __CVMX_WQE_H__ #ifndef __CVMX_WQE_H__
#define __CVMX_WQE_H__ #define __CVMX_WQE_H__
#include "cvmx-packet.h" #include <asm/octeon/cvmx-packet.h>
#define OCT_TAG_TYPE_STRING(x) \ #define OCT_TAG_TYPE_STRING(x) \
......
...@@ -52,24 +52,24 @@ enum cvmx_mips_space { ...@@ -52,24 +52,24 @@ enum cvmx_mips_space {
#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add)) #define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))
#endif #endif
#include "cvmx-asm.h" #include <asm/octeon/cvmx-asm.h>
#include "cvmx-packet.h" #include <asm/octeon/cvmx-packet.h>
#include "cvmx-sysinfo.h" #include <asm/octeon/cvmx-sysinfo.h>
#include "cvmx-ciu-defs.h" #include <asm/octeon/cvmx-ciu-defs.h>
#include "cvmx-gpio-defs.h" #include <asm/octeon/cvmx-gpio-defs.h>
#include "cvmx-iob-defs.h" #include <asm/octeon/cvmx-iob-defs.h>
#include "cvmx-ipd-defs.h" #include <asm/octeon/cvmx-ipd-defs.h>
#include "cvmx-l2c-defs.h" #include <asm/octeon/cvmx-l2c-defs.h>
#include "cvmx-l2d-defs.h" #include <asm/octeon/cvmx-l2d-defs.h>
#include "cvmx-l2t-defs.h" #include <asm/octeon/cvmx-l2t-defs.h>
#include "cvmx-led-defs.h" #include <asm/octeon/cvmx-led-defs.h>
#include "cvmx-mio-defs.h" #include <asm/octeon/cvmx-mio-defs.h>
#include "cvmx-pow-defs.h" #include <asm/octeon/cvmx-pow-defs.h>
#include "cvmx-bootinfo.h" #include <asm/octeon/cvmx-bootinfo.h>
#include "cvmx-bootmem.h" #include <asm/octeon/cvmx-bootmem.h>
#include "cvmx-l2c.h" #include <asm/octeon/cvmx-l2c.h>
#ifndef CVMX_ENABLE_DEBUG_PRINTS #ifndef CVMX_ENABLE_DEBUG_PRINTS
#define CVMX_ENABLE_DEBUG_PRINTS 1 #define CVMX_ENABLE_DEBUG_PRINTS 1
......
...@@ -313,6 +313,6 @@ static inline int __octeon_is_model_runtime__(uint32_t model) ...@@ -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(uint32_t chip_id);
const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer); 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__ */ #endif /* __OCTEON_MODEL_H__ */
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#ifndef __ASM_OCTEON_OCTEON_H #ifndef __ASM_OCTEON_OCTEON_H
#define __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, extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
uint64_t alignment, uint64_t alignment,
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef _BCM1480_INT_H #ifndef _BCM1480_INT_H
#define _BCM1480_INT_H #define _BCM1480_INT_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* Interrupt Mapper Constants * Interrupt Mapper Constants
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _BCM1480_L2C_H #ifndef _BCM1480_L2C_H
#define _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) * Format of level 2 cache management address (Table 55)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _BCM1480_MC_H #ifndef _BCM1480_MC_H
#define _BCM1480_MC_H #define _BCM1480_MC_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* Memory Channel Configuration Register (Table 81) * Memory Channel Configuration Register (Table 81)
......
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
#ifndef _BCM1480_REGS_H #ifndef _BCM1480_REGS_H
#define _BCM1480_REGS_H #define _BCM1480_REGS_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* Pull in the BCM1250's registers since a great deal of the 1480's * Pull in the BCM1250's registers since a great deal of the 1480's
* functions are the same as the BCM1250. * functions are the same as the BCM1250.
********************************************************************* */ ********************************************************************* */
#include "sb1250_regs.h" #include <asm/sibyte/sb1250_regs.h>
/* ********************************************************************* /* *********************************************************************
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
#ifndef _BCM1480_SCD_H #ifndef _BCM1480_SCD_H
#define _BCM1480_SCD_H #define _BCM1480_SCD_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* Pull in the BCM1250's SCD since lots of stuff is the same. * Pull in the BCM1250's SCD since lots of stuff is the same.
********************************************************************* */ ********************************************************************* */
#include "sb1250_scd.h" #include <asm/sibyte/sb1250_scd.h>
/* ********************************************************************* /* *********************************************************************
* Some general notes: * Some general notes:
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define _SB1250_DMA_H #define _SB1250_DMA_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* DMA Registers * DMA Registers
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef _SB1250_GENBUS_H #ifndef _SB1250_GENBUS_H
#define _SB1250_GENBUS_H #define _SB1250_GENBUS_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* Generic Bus Region Configuration Registers (Table 11-4) * Generic Bus Region Configuration Registers (Table 11-4)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_INT_H #ifndef _SB1250_INT_H
#define _SB1250_INT_H #define _SB1250_INT_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* Interrupt Mapper Constants * Interrupt Mapper Constants
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_L2C_H #ifndef _SB1250_L2C_H
#define _SB1250_L2C_H #define _SB1250_L2C_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* Level 2 Cache Tag register (Table 5-3) * Level 2 Cache Tag register (Table 5-3)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_LDT_H #ifndef _SB1250_LDT_H
#define _SB1250_LDT_H #define _SB1250_LDT_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
#define K_LDT_VENDOR_SIBYTE 0x166D #define K_LDT_VENDOR_SIBYTE 0x166D
#define K_LDT_DEVICE_SB1250 0x0002 #define K_LDT_DEVICE_SB1250 0x0002
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_MAC_H #ifndef _SB1250_MAC_H
#define _SB1250_MAC_H #define _SB1250_MAC_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* Ethernet MAC Registers * Ethernet MAC Registers
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_MC_H #ifndef _SB1250_MC_H
#define _SB1250_MC_H #define _SB1250_MC_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* Memory Channel Config Register (table 6-14) * Memory Channel Config Register (table 6-14)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_REGS_H #ifndef _SB1250_REGS_H
#define _SB1250_REGS_H #define _SB1250_REGS_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef _SB1250_SCD_H #ifndef _SB1250_SCD_H
#define _SB1250_SCD_H #define _SB1250_SCD_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************* /* *********************************************************************
* System control/debug registers * System control/debug registers
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef _SB1250_SMBUS_H #ifndef _SB1250_SMBUS_H
#define _SB1250_SMBUS_H #define _SB1250_SMBUS_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* SMBus Clock Frequency Register (Table 14-2) * SMBus Clock Frequency Register (Table 14-2)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_SYNCSER_H #ifndef _SB1250_SYNCSER_H
#define _SB1250_SYNCSER_H #define _SB1250_SYNCSER_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* /*
* Serial Mode Configuration Register * Serial Mode Configuration Register
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef _SB1250_UART_H #ifndef _SB1250_UART_H
#define _SB1250_UART_H #define _SB1250_UART_H
#include "sb1250_defs.h" #include <asm/sibyte/sb1250_defs.h>
/* ********************************************************************** /* **********************************************************************
* DUART Registers * DUART Registers
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/device.h> #include <linux/device.h>
#include "cell-pmu.h" #include <asm/cell-pmu.h>
union ps3_firmware_version { union ps3_firmware_version {
u64 raw; u64 raw;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/immap_qe.h> #include <asm/immap_qe.h>
#include <asm/qe.h> #include <asm/qe.h>
#include "ucc.h" #include <asm/ucc.h>
/* Receive BD's status */ /* Receive BD's status */
#define R_E 0x80000000 /* buffer empty */ #define R_E 0x80000000 /* buffer empty */
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/immap_qe.h> #include <asm/immap_qe.h>
#include <asm/qe.h> #include <asm/qe.h>
#include "ucc.h" #include <asm/ucc.h>
/* transmit BD's status */ /* transmit BD's status */
#define T_R 0x80000000 /* ready bit */ #define T_R 0x80000000 /* ready bit */
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define __ASM_SH_BL_BIT_H #define __ASM_SH_BL_BIT_H
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "bl_bit_32.h" # include <asm/bl_bit_32.h>
#else #else
# include "bl_bit_64.h" # include <asm/bl_bit_64.h>
#endif #endif
#endif /* __ASM_SH_BL_BIT_H */ #endif /* __ASM_SH_BL_BIT_H */
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "cache_insns_32.h" # include <asm/cache_insns_32.h>
#else #else
# include "cache_insns_64.h" # include <asm/cache_insns_64.h>
#endif #endif
#endif /* __ASM_SH_CACHE_INSNS_H */ #endif /* __ASM_SH_CACHE_INSNS_H */
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "checksum_32.h" # include <asm/checksum_32.h>
#else #else
# include <asm-generic/checksum.h> # include <asm-generic/checksum.h>
#endif #endif
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#define MMU_VPN_MASK 0xfffff000 #define MMU_VPN_MASK 0xfffff000
#if defined(CONFIG_SUPERH32) #if defined(CONFIG_SUPERH32)
#include "mmu_context_32.h" #include <asm/mmu_context_32.h>
#else #else
#include "mmu_context_64.h" #include <asm/mmu_context_64.h>
#endif #endif
/* /*
......
#ifdef __KERNEL__ #ifdef __KERNEL__
# ifdef CONFIG_SUPERH32 # ifdef CONFIG_SUPERH32
# include "posix_types_32.h" # include <asm/posix_types_32.h>
# else # else
# include "posix_types_64.h" # include <asm/posix_types_64.h>
# endif # endif
#else #else
# ifdef __SH5__ # ifdef __SH5__
# include "posix_types_64.h" # include <asm/posix_types_64.h>
# else # else
# include "posix_types_32.h" # include <asm/posix_types_32.h>
# endif # endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
...@@ -175,9 +175,9 @@ extern unsigned int instruction_size(unsigned int insn); ...@@ -175,9 +175,9 @@ extern unsigned int instruction_size(unsigned int insn);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "processor_32.h" # include <asm/processor_32.h>
#else #else
# include "processor_64.h" # include <asm/processor_64.h>
#endif #endif
#endif /* __ASM_SH_PROCESSOR_H */ #endif /* __ASM_SH_PROCESSOR_H */
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#define PT_TEXT_LEN 252 #define PT_TEXT_LEN 252
#if defined(__SH5__) || defined(CONFIG_CPU_SH5) #if defined(__SH5__) || defined(CONFIG_CPU_SH5)
#include "ptrace_64.h" #include <asm/ptrace_64.h>
#else #else
#include "ptrace_32.h" #include <asm/ptrace_32.h>
#endif #endif
#ifdef __KERNEL__ #ifdef __KERNEL__
......
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "string_32.h" # include <asm/string_32.h>
#else #else
# include "string_64.h" # include <asm/string_64.h>
#endif #endif
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#define __ASM_SH_SWITCH_TO_H #define __ASM_SH_SWITCH_TO_H
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "switch_to_32.h" # include <asm/switch_to_32.h>
#else #else
# include "switch_to_64.h" # include <asm/switch_to_64.h>
#endif #endif
#endif /* __ASM_SH_SWITCH_TO_H */ #endif /* __ASM_SH_SWITCH_TO_H */
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
extern const unsigned long sys_call_table[]; extern const unsigned long sys_call_table[];
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "syscall_32.h" # include <asm/syscall_32.h>
#else #else
# include "syscall_64.h" # include <asm/syscall_64.h>
#endif #endif
#endif /* __ASM_SH_SYSCALL_H */ #endif /* __ASM_SH_SYSCALL_H */
...@@ -11,9 +11,9 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, ...@@ -11,9 +11,9 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
unsigned long fd, unsigned long pgoff); unsigned long fd, unsigned long pgoff);
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "syscalls_32.h" # include <asm/syscalls_32.h>
#else #else
# include "syscalls_64.h" # include <asm/syscalls_64.h>
#endif #endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __ASM_SH_TLB_H #define __ASM_SH_TLB_H
#ifdef CONFIG_SUPERH64 #ifdef CONFIG_SUPERH64
# include "tlb_64.h" # include <asm/tlb_64.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "traps_32.h" # include <asm/traps_32.h>
#else #else
# include "traps_64.h" # include <asm/traps_64.h>
#endif #endif
BUILD_TRAP_HANDLER(address_error); BUILD_TRAP_HANDLER(address_error);
......
...@@ -97,9 +97,9 @@ struct __large_struct { unsigned long buf[100]; }; ...@@ -97,9 +97,9 @@ struct __large_struct { unsigned long buf[100]; };
}) })
#ifdef CONFIG_SUPERH32 #ifdef CONFIG_SUPERH32
# include "uaccess_32.h" # include <asm/uaccess_32.h>
#else #else
# include "uaccess_64.h" # include <asm/uaccess_64.h>
#endif #endif
extern long strncpy_from_user(char *dest, const char __user *src, long count); extern long strncpy_from_user(char *dest, const char __user *src, long count);
......
#ifdef __KERNEL__ #ifdef __KERNEL__
# ifdef CONFIG_SUPERH32 # ifdef CONFIG_SUPERH32
# include "unistd_32.h" # include <asm/unistd_32.h>
# else # else
# include "unistd_64.h" # include <asm/unistd_64.h>
# endif # endif
# define __ARCH_WANT_SYS_RT_SIGSUSPEND # define __ARCH_WANT_SYS_RT_SIGSUSPEND
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#else #else
# ifdef __SH5__ # ifdef __SH5__
# include "unistd_64.h" # include <asm/unistd_64.h>
# else # else
# include "unistd_32.h" # include <asm/unistd_32.h>
# endif # endif
#endif #endif
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include <asm/romimage-macros.h> #include <asm/romimage-macros.h>
#include "partner-jet-setup.txt" #include <mach/partner-jet-setup.txt>
/* execute icbi after enabling cache */ /* execute icbi after enabling cache */
mov.l 1f, r0 mov.l 1f, r0
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include <asm/romimage-macros.h> #include <asm/romimage-macros.h>
#include "partner-jet-setup.txt" #include <mach/partner-jet-setup.txt>
/* execute icbi after enabling cache */ /* execute icbi after enabling cache */
mov.l 1f, r0 mov.l 1f, r0
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* DMA queue management APIs shared between TRIO and mPIPE. * DMA queue management APIs shared between TRIO and mPIPE.
*/ */
#include "common.h" #include <gxio/common.h>
/* The credit counter lives in the high 32 bits. */ /* The credit counter lives in the high 32 bits. */
#define DMA_QUEUE_CREDIT_SHIFT 32 #define DMA_QUEUE_CREDIT_SHIFT 32
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* resources. * resources.
*/ */
#include "common.h" #include <gxio/common.h>
#include "dma_queue.h" #include <gxio/dma_queue.h>
#include <linux/time.h> #include <linux/time.h>
......
...@@ -140,8 +140,8 @@ ...@@ -140,8 +140,8 @@
#include <linux/types.h> #include <linux/types.h>
#include "common.h" #include <gxio/common.h>
#include "dma_queue.h" #include <gxio/dma_queue.h>
#include <arch/trio_constants.h> #include <arch/trio_constants.h>
#include <arch/trio.h> #include <arch/trio.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef _GXIO_USB_H_ #ifndef _GXIO_USB_H_
#define _GXIO_USB_H_ #define _GXIO_USB_H_
#include "common.h" #include <gxio/common.h>
#include <hv/drv_usb_host_intf.h> #include <hv/drv_usb_host_intf.h>
#include <hv/iorpc.h> #include <hv/iorpc.h>
......
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
#if defined(__HV__) #if defined(__HV__)
#include <hv/hypervisor.h> #include <hv/hypervisor.h>
#elif defined(__KERNEL__) #elif defined(__KERNEL__)
#include "hypervisor.h" #include <hv/hypervisor.h>
#include <linux/types.h> #include <linux/types.h>
#else #else
#include <stdint.h> #include <stdint.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#error You must include hardware.h not PKUnity.h #error You must include hardware.h not PKUnity.h
#endif #endif
#include "bitfield.h" #include <mach/bitfield.h>
/* /*
* Memory Definitions * Memory Definitions
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping * 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping
*/ */
#define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */ #define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */
#include "regs-pci.h" #include <mach/regs-pci.h>
#define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0) #define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0)
#define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000) #define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000)
...@@ -50,18 +50,18 @@ ...@@ -50,18 +50,18 @@
#define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */ #define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */
#define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */ #define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */
#define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */ #define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */
#include "regs-dmac.h" #include <mach/regs-dmac.h>
#define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */ #define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */
#include "regs-umal.h" #include <mach/regs-umal.h>
#define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */ #define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */
#define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */ #define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */
#define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */ #define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */
/* AHB-9 is for APB bridge */ /* AHB-9 is for APB bridge */
#define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */ #define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */
#define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */ #define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */
#include "regs-unigfx.h" #include <mach/regs-unigfx.h>
#define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */ #define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */
#include "regs-nand.h" #include <mach/regs-nand.h>
#define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */ #define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */
#define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */ #define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */
...@@ -72,27 +72,27 @@ ...@@ -72,27 +72,27 @@
#define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */ #define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */
#define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */ #define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */
#include "regs-uart.h" #include <mach/regs-uart.h>
#define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */ #define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */
#include "regs-i2c.h" #include <mach/regs-i2c.h>
#define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */ #define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */
#include "regs-spi.h" #include <mach/regs-spi.h>
#define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */ #define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */
#include "regs-ac97.h" #include <mach/regs-ac97.h>
#define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */ #define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */
#include "regs-gpio.h" #include <mach/regs-gpio.h>
#define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */ #define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */
#include "regs-intc.h" #include <mach/regs-intc.h>
#define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */ #define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */
#include "regs-rtc.h" #include <mach/regs-rtc.h>
#define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */ #define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */
#include "regs-ost.h" #include <mach/regs-ost.h>
#define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */ #define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */
#include "regs-resetc.h" #include <mach/regs-resetc.h>
#define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */ #define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */
#include "regs-pm.h" #include <mach/regs-pm.h>
#define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */ #define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */
#include "regs-ps2.h" #include <mach/regs-ps2.h>
#define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */ #define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */
#include "regs-sdc.h" #include <mach/regs-sdc.h>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef __MACH_PUV3_HARDWARE_H__ #ifndef __MACH_PUV3_HARDWARE_H__
#define __MACH_PUV3_HARDWARE_H__ #define __MACH_PUV3_HARDWARE_H__
#include "PKUnity.h" #include <mach/PKUnity.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE) #define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE)
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#ifndef __MACH_PUV3_UNCOMPRESS_H__ #ifndef __MACH_PUV3_UNCOMPRESS_H__
#define __MACH_PUV3_UNCOMPRESS_H__ #define __MACH_PUV3_UNCOMPRESS_H__
#include "hardware.h" #include <mach/hardware.h>
#include "ocd.h" #include <mach/ocd.h>
extern char input_data[]; extern char input_data[];
extern char input_data_end[]; extern char input_data_end[];
......
...@@ -309,9 +309,9 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2) ...@@ -309,9 +309,9 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "atomic64_32.h" # include <asm/atomic64_32.h>
#else #else
# include "atomic64_64.h" # include <asm/atomic64_64.h>
#endif #endif
#endif /* _ASM_X86_ATOMIC_H */ #endif /* _ASM_X86_ATOMIC_H */
...@@ -46,7 +46,7 @@ For 32-bit we have the following conventions - kernel is built with ...@@ -46,7 +46,7 @@ For 32-bit we have the following conventions - kernel is built with
*/ */
#include "dwarf2.h" #include <asm/dwarf2.h>
/* /*
* 64-bit system call stack frame layout defines and helpers, * 64-bit system call stack frame layout defines and helpers,
......
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "checksum_32.h" # include <asm/checksum_32.h>
#else #else
# include "checksum_64.h" # include <asm/checksum_64.h>
#endif #endif
...@@ -138,9 +138,9 @@ extern void __add_wrong_size(void) ...@@ -138,9 +138,9 @@ extern void __add_wrong_size(void)
__raw_cmpxchg((ptr), (old), (new), (size), "") __raw_cmpxchg((ptr), (old), (new), (size), "")
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "cmpxchg_32.h" # include <asm/cmpxchg_32.h>
#else #else
# include "cmpxchg_64.h" # include <asm/cmpxchg_64.h>
#endif #endif
#ifdef __HAVE_ARCH_CMPXCHG #ifdef __HAVE_ARCH_CMPXCHG
......
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "mmzone_32.h" # include <asm/mmzone_32.h>
#else #else
# include "mmzone_64.h" # include <asm/mmzone_64.h>
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "mutex_32.h" # include <asm/mutex_32.h>
#else #else
# include "mutex_64.h" # include <asm/mutex_64.h>
#endif #endif
...@@ -53,9 +53,9 @@ static inline int numa_cpu_node(int cpu) ...@@ -53,9 +53,9 @@ static inline int numa_cpu_node(int cpu)
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "numa_32.h" # include <asm/numa_32.h>
#else #else
# include "numa_64.h" # include <asm/numa_64.h>
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
......
...@@ -141,7 +141,7 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); ...@@ -141,7 +141,7 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
#include "pci_64.h" #include <asm/pci_64.h>
#endif #endif
/* implement the pci_ DMA API in terms of the generic device dma_ one */ /* implement the pci_ DMA API in terms of the generic device dma_ one */
......
...@@ -384,9 +384,9 @@ pte_t *populate_extra_pte(unsigned long vaddr); ...@@ -384,9 +384,9 @@ pte_t *populate_extra_pte(unsigned long vaddr);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "pgtable_32.h" # include <asm/pgtable_32.h>
#else #else
# include "pgtable_64.h" # include <asm/pgtable_64.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -174,9 +174,9 @@ ...@@ -174,9 +174,9 @@
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "pgtable_32_types.h" # include <asm/pgtable_32_types.h>
#else #else
# include "pgtable_64_types.h" # include <asm/pgtable_64_types.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
#ifdef __KERNEL__ #ifdef __KERNEL__
# ifdef CONFIG_X86_32 # ifdef CONFIG_X86_32
# include "posix_types_32.h" # include <asm/posix_types_32.h>
# else # else
# include "posix_types_64.h" # include <asm/posix_types_64.h>
# endif # endif
#else #else
# ifdef __i386__ # ifdef __i386__
# include "posix_types_32.h" # include <asm/posix_types_32.h>
# elif defined(__ILP32__) # elif defined(__ILP32__)
# include "posix_types_x32.h" # include <asm/posix_types_x32.h>
# else # else
# include "posix_types_64.h" # include <asm/posix_types_64.h>
# endif # endif
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "seccomp_32.h" # include <asm/seccomp_32.h>
#else #else
# include "seccomp_64.h" # include <asm/seccomp_64.h>
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "string_32.h" # include <asm/string_32.h>
#else #else
# include "string_64.h" # include <asm/string_64.h>
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "suspend_32.h" # include <asm/suspend_32.h>
#else #else
# include "suspend_64.h" # include <asm/suspend_64.h>
#endif #endif
...@@ -589,9 +589,9 @@ extern struct movsl_mask { ...@@ -589,9 +589,9 @@ extern struct movsl_mask {
#define ARCH_HAS_NOCACHE_UACCESS 1 #define ARCH_HAS_NOCACHE_UACCESS 1
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "uaccess_32.h" # include <asm/uaccess_32.h>
#else #else
# include "uaccess_64.h" # include <asm/uaccess_64.h>
#endif #endif
#endif /* _ASM_X86_UACCESS_H */ #endif /* _ASM_X86_UACCESS_H */
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define _ASM_X86_USER_H #define _ASM_X86_USER_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "user_32.h" # include <asm/user_32.h>
#else #else
# include "user_64.h" # include <asm/user_64.h>
#endif #endif
#include <asm/types.h> #include <asm/types.h>
......
...@@ -116,9 +116,9 @@ struct arch_shared_info { ...@@ -116,9 +116,9 @@ struct arch_shared_info {
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
#include "interface_32.h" #include <asm/xen/interface_32.h>
#else #else
#include "interface_64.h" #include <asm/xen/interface_64.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# include <asm-generic/xor.h> # include <asm-generic/xor.h>
#else #else
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "xor_32.h" # include <asm/xor_32.h>
#else #else
# include "xor_64.h" # include <asm/xor_64.h>
#endif #endif
#endif #endif
...@@ -822,7 +822,7 @@ static struct xor_block_template xor_block_pIII_sse = { ...@@ -822,7 +822,7 @@ static struct xor_block_template xor_block_pIII_sse = {
}; };
/* Also try the AVX routines */ /* Also try the AVX routines */
#include "xor_avx.h" #include <asm/xor_avx.h>
/* Also try the generic routines. */ /* Also try the generic routines. */
#include <asm-generic/xor.h> #include <asm-generic/xor.h>
......
...@@ -306,7 +306,7 @@ static struct xor_block_template xor_block_sse = { ...@@ -306,7 +306,7 @@ static struct xor_block_template xor_block_sse = {
/* Also try the AVX routines */ /* Also try the AVX routines */
#include "xor_avx.h" #include <asm/xor_avx.h>
#undef XOR_TRY_TEMPLATES #undef XOR_TRY_TEMPLATES
#define XOR_TRY_TEMPLATES \ #define XOR_TRY_TEMPLATES \
......
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
* *
* Note: The order of these include files is important. * Note: The order of these include files is important.
*/ */
#include "platform/acenv.h" /* Environment-specific items */ #include <acpi/platform/acenv.h> /* Environment-specific items */
#include "acnames.h" /* Common ACPI names and strings */ #include <acpi/acnames.h> /* Common ACPI names and strings */
#include "actypes.h" /* ACPICA data types and structures */ #include <acpi/actypes.h> /* ACPICA data types and structures */
#include "acexcep.h" /* ACPICA exceptions */ #include <acpi/acexcep.h> /* ACPICA exceptions */
#include "actbl.h" /* ACPI table definitions */ #include <acpi/actbl.h> /* ACPI table definitions */
#include "acoutput.h" /* Error output and Debug macros */ #include <acpi/acoutput.h> /* Error output and Debug macros */
#include "acrestyp.h" /* Resource Descriptor structs */ #include <acpi/acrestyp.h> /* Resource Descriptor structs */
#include "acpiosxf.h" /* OSL interfaces (ACPICA-to-OS) */ #include <acpi/acpiosxf.h> /* OSL interfaces (ACPICA-to-OS) */
#include "acpixf.h" /* ACPI core subsystem external interfaces */ #include <acpi/acpixf.h> /* ACPI core subsystem external interfaces */
#endif /* __ACPI_H__ */ #endif /* __ACPI_H__ */
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
#ifndef __ACPIOSXF_H__ #ifndef __ACPIOSXF_H__
#define __ACPIOSXF_H__ #define __ACPIOSXF_H__
#include "platform/acenv.h" #include <acpi/platform/acenv.h>
#include "actypes.h" #include <acpi/actypes.h>
/* Types for acpi_os_execute */ /* Types for acpi_os_execute */
......
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
#define ACPI_CA_VERSION 0x20120711 #define ACPI_CA_VERSION 0x20120711
#include "acconfig.h" #include <acpi/acconfig.h>
#include "actypes.h" #include <acpi/actypes.h>
#include "actbl.h" #include <acpi/actbl.h>
extern u8 acpi_gbl_permanent_mmap; extern u8 acpi_gbl_permanent_mmap;
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
/*! [Begin] no source code translation */ /*! [Begin] no source code translation */
#if defined(_LINUX) || defined(__linux__) #if defined(_LINUX) || defined(__linux__)
#include "aclinux.h" #include <acpi/platform/aclinux.h>
#elif defined(_AED_EFI) #elif defined(_AED_EFI)
#include "acefi.h" #include "acefi.h"
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
/* Linux uses GCC */ /* Linux uses GCC */
#include "acgcc.h" #include <acpi/platform/acgcc.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
......
...@@ -628,7 +628,7 @@ struct drm_prime_handle { ...@@ -628,7 +628,7 @@ struct drm_prime_handle {
__s32 fd; __s32 fd;
}; };
#include "drm_mode.h" #include <drm/drm_mode.h>
#define DRM_IOCTL_BASE 'd' #define DRM_IOCTL_BASE 'd'
#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
......
...@@ -85,9 +85,9 @@ struct module; ...@@ -85,9 +85,9 @@ struct module;
struct drm_file; struct drm_file;
struct drm_device; struct drm_device;
#include "drm_os_linux.h" #include <drm/drm_os_linux.h>
#include "drm_hashtab.h" #include <drm/drm_hashtab.h>
#include "drm_mm.h" #include <drm/drm_mm.h>
#define DRM_UT_CORE 0x01 #define DRM_UT_CORE 0x01
#define DRM_UT_DRIVER 0x02 #define DRM_UT_DRIVER 0x02
...@@ -676,7 +676,7 @@ struct drm_gem_object { ...@@ -676,7 +676,7 @@ struct drm_gem_object {
struct dma_buf_attachment *import_attach; struct dma_buf_attachment *import_attach;
}; };
#include "drm_crtc.h" #include <drm/drm_crtc.h>
/* per-master structure */ /* per-master structure */
struct drm_master { struct drm_master {
...@@ -1304,7 +1304,7 @@ extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *v ...@@ -1304,7 +1304,7 @@ extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *v
extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
/* Memory management support (drm_memory.h) */ /* Memory management support (drm_memory.h) */
#include "drm_memory.h" #include <drm/drm_memory.h>
extern void drm_free_agp(DRM_AGP_MEM * handle, int pages); extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
...@@ -1613,7 +1613,7 @@ void drm_gem_vm_open(struct vm_area_struct *vma); ...@@ -1613,7 +1613,7 @@ void drm_gem_vm_open(struct vm_area_struct *vma);
void drm_gem_vm_close(struct vm_area_struct *vma); void drm_gem_vm_close(struct vm_area_struct *vma);
int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
#include "drm_global.h" #include <drm/drm_global.h>
static inline void static inline void
drm_gem_object_reference(struct drm_gem_object *obj) drm_gem_object_reference(struct drm_gem_object *obj)
...@@ -1722,7 +1722,7 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map) ...@@ -1722,7 +1722,7 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map)
{ {
} }
#include "drm_mem_util.h" #include <drm/drm_mem_util.h>
extern int drm_fill_in_dev(struct drm_device *dev, extern int drm_fill_in_dev(struct drm_device *dev,
const struct pci_device_id *ent, const struct pci_device_id *ent,
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifndef _DRM_BUFFER_H_ #ifndef _DRM_BUFFER_H_
#define _DRM_BUFFER_H_ #define _DRM_BUFFER_H_
#include "drmP.h" #include <drm/drmP.h>
struct drm_buffer { struct drm_buffer {
int iterator; int iterator;
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#ifndef __DRM_ENCODER_SLAVE_H__ #ifndef __DRM_ENCODER_SLAVE_H__
#define __DRM_ENCODER_SLAVE_H__ #define __DRM_ENCODER_SLAVE_H__
#include "drmP.h" #include <drm/drmP.h>
#include "drm_crtc.h" #include <drm/drm_crtc.h>
/** /**
* struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include "drmP.h" #include <drm/drmP.h>
/** /**
* Cut down version of drm_memory_debug.h, which used to be called * Cut down version of drm_memory_debug.h, which used to be called
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef _DRM_SAREA_H_ #ifndef _DRM_SAREA_H_
#define _DRM_SAREA_H_ #define _DRM_SAREA_H_
#include "drm.h" #include <drm/drm.h>
/* SAREA area needs to be at least a page */ /* SAREA area needs to be at least a page */
#if defined(__alpha__) #if defined(__alpha__)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef _EXYNOS_DRM_H_ #ifndef _EXYNOS_DRM_H_
#define _EXYNOS_DRM_H_ #define _EXYNOS_DRM_H_
#include "drm.h" #include <drm/drm.h>
/** /**
* User-desired buffer creation information structure. * User-desired buffer creation information structure.
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef _I915_DRM_H_ #ifndef _I915_DRM_H_
#define _I915_DRM_H_ #define _I915_DRM_H_
#include "drm.h" #include <drm/drm.h>
/* Please note that modifications to all structs defined here are /* Please note that modifications to all structs defined here are
* subject to backwards-compatibility constraints. * subject to backwards-compatibility constraints.
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifndef __MGA_DRM_H__ #ifndef __MGA_DRM_H__
#define __MGA_DRM_H__ #define __MGA_DRM_H__
#include "drm.h" #include <drm/drm.h>
/* WARNING: If you change any of these defines, make sure to change the /* WARNING: If you change any of these defines, make sure to change the
* defines in the Xserver file (mga_sarea.h) * defines in the Xserver file (mga_sarea.h)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#ifndef __RADEON_DRM_H__ #ifndef __RADEON_DRM_H__
#define __RADEON_DRM_H__ #define __RADEON_DRM_H__
#include "drm.h" #include <drm/drm.h>
/* WARNING: If you change any of these defines, make sure to change the /* WARNING: If you change any of these defines, make sure to change the
* defines in the X server file (radeon_sarea.h) * defines in the X server file (radeon_sarea.h)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef _TTM_BO_API_H_ #ifndef _TTM_BO_API_H_
#define _TTM_BO_API_H_ #define _TTM_BO_API_H_
#include "drm_hashtab.h" #include <drm/drm_hashtab.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/wait.h> #include <linux/wait.h>
......
...@@ -30,14 +30,14 @@ ...@@ -30,14 +30,14 @@
#ifndef _TTM_BO_DRIVER_H_ #ifndef _TTM_BO_DRIVER_H_
#define _TTM_BO_DRIVER_H_ #define _TTM_BO_DRIVER_H_
#include "ttm/ttm_bo_api.h" #include <ttm/ttm_bo_api.h>
#include "ttm/ttm_memory.h" #include <ttm/ttm_memory.h>
#include "ttm/ttm_module.h" #include <ttm/ttm_module.h>
#include "drm_mm.h" #include <drm/drm_mm.h>
#include "drm_global.h" #include <drm/drm_global.h>
#include "linux/workqueue.h" #include <linux/workqueue.h>
#include "linux/fs.h" #include <linux/fs.h>
#include "linux/spinlock.h" #include <linux/spinlock.h>
struct ttm_backend_func { struct ttm_backend_func {
/** /**
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef _TTM_EXECBUF_UTIL_H_ #ifndef _TTM_EXECBUF_UTIL_H_
#define _TTM_EXECBUF_UTIL_H_ #define _TTM_EXECBUF_UTIL_H_
#include "ttm/ttm_bo_api.h" #include <ttm/ttm_bo_api.h>
#include <linux/list.h> #include <linux/list.h>
/** /**
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#ifndef _TTM_LOCK_H_ #ifndef _TTM_LOCK_H_
#define _TTM_LOCK_H_ #define _TTM_LOCK_H_
#include "ttm/ttm_object.h" #include <ttm/ttm_object.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/atomic.h> #include <linux/atomic.h>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define _TTM_OBJECT_H_ #define _TTM_OBJECT_H_
#include <linux/list.h> #include <linux/list.h>
#include "drm_hashtab.h" #include <drm/drm_hashtab.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <ttm/ttm_memory.h> #include <ttm/ttm_memory.h>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#ifndef TTM_PAGE_ALLOC #ifndef TTM_PAGE_ALLOC
#define TTM_PAGE_ALLOC #define TTM_PAGE_ALLOC
#include "ttm_bo_driver.h" #include <drm/ttm/ttm_bo_driver.h>
#include "ttm_memory.h" #include <drm/ttm/ttm_memory.h>
/** /**
* Initialize pool allocator. * Initialize pool allocator.
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef _VIA_DRM_H_ #ifndef _VIA_DRM_H_
#define _VIA_DRM_H_ #define _VIA_DRM_H_
#include "drm.h" #include <drm/drm.h>
/* WARNING: These defines must be the same as what the Xserver uses. /* WARNING: These defines must be the same as what the Xserver uses.
* if you change them, you must change the defines in the Xserver. * if you change them, you must change the defines in the Xserver.
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/bcma/bcma_driver_gmac_cmn.h> #include <linux/bcma/bcma_driver_gmac_cmn.h>
#include <linux/ssb/ssb.h> /* SPROM sharing */ #include <linux/ssb/ssb.h> /* SPROM sharing */
#include "bcma_regs.h" #include <linux/bcma/bcma_regs.h>
struct bcma_device; struct bcma_device;
struct bcma_bus; struct bcma_bus;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#ifndef CEPH_FS_H #ifndef CEPH_FS_H
#define CEPH_FS_H #define CEPH_FS_H
#include "msgr.h" #include <linux/ceph/msgr.h>
#include "rados.h" #include <linux/ceph/rados.h>
/* /*
* subprotocol versions. when specific messages types or high-level * subprotocol versions. when specific messages types or high-level
......
#ifndef _FS_CEPH_DEBUGFS_H #ifndef _FS_CEPH_DEBUGFS_H
#define _FS_CEPH_DEBUGFS_H #define _FS_CEPH_DEBUGFS_H
#include "ceph_debug.h" #include <linux/ceph/ceph_debug.h>
#include "types.h" #include <linux/ceph/types.h>
#define CEPH_DEFINE_SHOW_FUNC(name) \ #define CEPH_DEFINE_SHOW_FUNC(name) \
static int name##_open(struct inode *inode, struct file *file) \ static int name##_open(struct inode *inode, struct file *file) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "types.h" #include <linux/ceph/types.h>
/* /*
* in all cases, * in all cases,
......
#ifndef _FS_CEPH_LIBCEPH_H #ifndef _FS_CEPH_LIBCEPH_H
#define _FS_CEPH_LIBCEPH_H #define _FS_CEPH_LIBCEPH_H
#include "ceph_debug.h" #include <linux/ceph/ceph_debug.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/backing-dev.h> #include <linux/backing-dev.h>
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "types.h" #include <linux/ceph/types.h>
#include "messenger.h" #include <linux/ceph/messenger.h>
#include "msgpool.h" #include <linux/ceph/msgpool.h>
#include "mon_client.h" #include <linux/ceph/mon_client.h>
#include "osd_client.h" #include <linux/ceph/osd_client.h>
#include "ceph_fs.h" #include <linux/ceph/ceph_fs.h>
/* /*
* mount options * mount options
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _FS_CEPH_MDSMAP_H #define _FS_CEPH_MDSMAP_H
#include <linux/bug.h> #include <linux/bug.h>
#include "types.h" #include <linux/ceph/types.h>
/* /*
* mds map - describe servers in the mds cluster. * mds map - describe servers in the mds cluster.
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "types.h" #include <linux/ceph/types.h>
#include "buffer.h" #include <linux/ceph/buffer.h>
struct ceph_msg; struct ceph_msg;
struct ceph_connection; struct ceph_connection;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include "messenger.h" #include <linux/ceph/messenger.h>
struct ceph_client; struct ceph_client;
struct ceph_mount_args; struct ceph_mount_args;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _FS_CEPH_MSGPOOL #define _FS_CEPH_MSGPOOL
#include <linux/mempool.h> #include <linux/mempool.h>
#include "messenger.h" #include <linux/ceph/messenger.h>
/* /*
* we use memory pools for preallocating messages we may receive, to * we use memory pools for preallocating messages we may receive, to
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define _FS_CEPH_OSDMAP_H #define _FS_CEPH_OSDMAP_H
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include "types.h" #include <linux/ceph/types.h>
#include "ceph_fs.h" #include <linux/ceph/ceph_fs.h>
#include <linux/crush/crush.h> #include <linux/crush/crush.h>
/* /*
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* (Reliable Autonomic Distributed Object Store). * (Reliable Autonomic Distributed Object Store).
*/ */
#include "msgr.h" #include <linux/ceph/msgr.h>
/* /*
* osdmap encoding versions * osdmap encoding versions
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/string.h> #include <linux/string.h>
#include "ceph_fs.h" #include <linux/ceph/ceph_fs.h>
#include "ceph_frag.h" #include <linux/ceph/ceph_frag.h>
#include "ceph_hash.h" #include <linux/ceph/ceph_hash.h>
/* /*
* Identify inodes by both their ino AND snapshot id (a u64). * Identify inodes by both their ino AND snapshot id (a u64).
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* LGPL2 * LGPL2
*/ */
#include "crush.h" #include <linux/crush/crush.h>
extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size); extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);
extern int crush_do_rule(const struct crush_map *map, extern int crush_do_rule(const struct crush_map *map,
......
...@@ -12,7 +12,7 @@ enum packet_types { ...@@ -12,7 +12,7 @@ enum packet_types {
#define NL_INT64(pn, pr, member) #define NL_INT64(pn, pr, member)
#define NL_BIT(pn, pr, member) #define NL_BIT(pn, pr, member)
#define NL_STRING(pn, pr, member, len) #define NL_STRING(pn, pr, member, len)
#include "drbd_nl.h" #include <linux/drbd_nl.h>
P_nl_after_last_packet, P_nl_after_last_packet,
}; };
...@@ -37,7 +37,7 @@ static const int tag_list_sizes[] = { ...@@ -37,7 +37,7 @@ static const int tag_list_sizes[] = {
#define NL_INT64(pn, pr, member) + 4 + 8 #define NL_INT64(pn, pr, member) + 4 + 8
#define NL_BIT(pn, pr, member) + 4 + 1 #define NL_BIT(pn, pr, member) + 4 + 1
#define NL_STRING(pn, pr, member, len) + 4 + (len) #define NL_STRING(pn, pr, member, len) + 4 + (len)
#include "drbd_nl.h" #include <linux/drbd_nl.h>
}; };
/* The two highest bits are used for the tag type */ /* The two highest bits are used for the tag type */
...@@ -62,7 +62,7 @@ enum drbd_tags { ...@@ -62,7 +62,7 @@ enum drbd_tags {
#define NL_INT64(pn, pr, member) T_ ## member = pn | TT_INT64 | pr , #define NL_INT64(pn, pr, member) T_ ## member = pn | TT_INT64 | pr ,
#define NL_BIT(pn, pr, member) T_ ## member = pn | TT_BIT | pr , #define NL_BIT(pn, pr, member) T_ ## member = pn | TT_BIT | pr ,
#define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING | pr , #define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING | pr ,
#include "drbd_nl.h" #include <linux/drbd_nl.h>
}; };
struct tag { struct tag {
...@@ -78,7 +78,7 @@ static const struct tag tag_descriptions[] = { ...@@ -78,7 +78,7 @@ static const struct tag tag_descriptions[] = {
#define NL_INT64(pn, pr, member) [ pn ] = { #member, TT_INT64 | pr, sizeof(__u64) }, #define NL_INT64(pn, pr, member) [ pn ] = { #member, TT_INT64 | pr, sizeof(__u64) },
#define NL_BIT(pn, pr, member) [ pn ] = { #member, TT_BIT | pr, sizeof(int) }, #define NL_BIT(pn, pr, member) [ pn ] = { #member, TT_BIT | pr, sizeof(int) },
#define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING | pr, (len) }, #define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING | pr, (len) },
#include "drbd_nl.h" #include <linux/drbd_nl.h>
}; };
#endif #endif
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _INCLUDE_LIBFDT_H_ #define _INCLUDE_LIBFDT_H_
#include <linux/libfdt_env.h> #include <linux/libfdt_env.h>
#include "../../scripts/dtc/libfdt/fdt.h" #include <>
#include "../../scripts/dtc/libfdt/libfdt.h" #include <>
#endif /* _INCLUDE_LIBFDT_H_ */ #endif /* _INCLUDE_LIBFDT_H_ */
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
/***************************************************************************** /*****************************************************************************
* H.323 Types * H.323 Types
****************************************************************************/ ****************************************************************************/
#include "nf_conntrack_h323_types.h" #include <linux/netfilter/nf_conntrack_h323_types.h>
typedef struct { typedef struct {
enum { enum {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "pinctrl-state.h" #include <linux/pinctrl/pinctrl-state.h>
/* This struct is private to the core and should be regarded as a cookie */ /* This struct is private to the core and should be regarded as a cookie */
struct pinctrl; struct pinctrl;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/bug.h> #include <linux/bug.h>
#include "pinctrl-state.h" #include <linux/pinctrl/pinctrl-state.h>
enum pinctrl_map_type { enum pinctrl_map_type {
PIN_MAP_TYPE_INVALID, PIN_MAP_TYPE_INVALID,
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "pinctrl-state.h" #include <linux/pinctrl/pinctrl-state.h>
struct device; struct device;
struct pinctrl_dev; struct pinctrl_dev;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "pinctrl.h" #include <linux/pinctrl/pinctrl.h>
#ifdef CONFIG_PINMUX #ifdef CONFIG_PINMUX
......
#ifndef __OSD_ATTRIBUTES_H__ #ifndef __OSD_ATTRIBUTES_H__
#define __OSD_ATTRIBUTES_H__ #define __OSD_ATTRIBUTES_H__
#include "osd_protocol.h" #include <scsi/osd_protocol.h>
/* /*
* Contains types and constants that define attribute pages and attribute * Contains types and constants that define attribute pages and attribute
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#ifndef __OSD_INITIATOR_H__ #ifndef __OSD_INITIATOR_H__
#define __OSD_INITIATOR_H__ #define __OSD_INITIATOR_H__
#include "osd_protocol.h" #include <scsi/osd_protocol.h>
#include "osd_types.h" #include <scsi/osd_types.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#ifndef __OSD_SEC_H__ #ifndef __OSD_SEC_H__
#define __OSD_SEC_H__ #define __OSD_SEC_H__
#include "osd_protocol.h" #include <scsi/osd_protocol.h>
#include "osd_types.h" #include <scsi/osd_types.h>
/* /*
* Contains types and constants of osd capabilities and security * Contains types and constants of osd capabilities and security
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "pcm.h" #include <sound/pcm.h>
#include "control.h" #include <sound/control.h>
#include "info.h" #include <sound/info.h>
/* maximum number of devices on the AC97 bus */ /* maximum number of devices on the AC97 bus */
#define AC97_BUS_MAX_DEVICES 4 #define AC97_BUS_MAX_DEVICES 4
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "control.h" #include <sound/control.h>
#include "pcm.h" #include <sound/pcm.h>
#include "timer.h" #include <sound/timer.h>
#define AD1816A_REG(r) (chip->port + r) #define AD1816A_REG(r) (chip->port + r)
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
* *
*/ */
#include "info.h" #include <sound/info.h>
#include "control.h" #include <sound/control.h>
/* /*
* ASAHI KASEI - AK4531 codec * ASAHI KASEI - AK4531 codec
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "emu10k1.h" #include <sound/emu10k1.h>
#include "emux_synth.h" #include <sound/emux_synth.h>
/* sequencer device id */ /* sequencer device id */
#define SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH "emu10k1-synth" #define SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH "emu10k1-synth"
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "emux_synth.h" #include <sound/emux_synth.h>
#include "seq_kernel.h" #include <sound/seq_kernel.h>
/* /*
* Hardware parameters. * Hardware parameters.
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#include "seq_oss_legacy.h" #include <sound/seq_oss_legacy.h>
/* /*
* awe hardware controls * awe hardware controls
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "seq_kernel.h" #include <sound/seq_kernel.h>
#include "seq_device.h" #include <sound/seq_device.h>
#include "soundfont.h" #include <sound/soundfont.h>
#include "seq_midi_emul.h" #include <sound/seq_midi_emul.h>
#ifdef CONFIG_SND_SEQUENCER_OSS #ifdef CONFIG_SND_SEQUENCER_OSS
#include "seq_oss.h" #include <sound/seq_oss.h>
#endif #endif
#include "emux_legacy.h" #include <sound/emux_legacy.h>
#include "seq_virmidi.h" #include <sound/seq_virmidi.h>
/* /*
* compile flags * compile flags
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
*/ */
#include "control.h" #include <sound/control.h>
#include "pcm.h" #include <sound/pcm.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#define ES1688_HW_AUTO 0x0000 #define ES1688_HW_AUTO 0x0000
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
* *
*/ */
#include "pcm.h" #include <sound/pcm.h>
#include "rawmidi.h" #include <sound/rawmidi.h>
#include "timer.h" #include <sound/timer.h>
#include "seq_midi_emul.h" #include <sound/seq_midi_emul.h>
#include "seq_device.h" #include <sound/seq_device.h>
#include <asm/io.h> #include <asm/io.h>
/* IO ports */ /* IO ports */
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#include "rawmidi.h" #include <sound/rawmidi.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#define MPU401_HW_MPU401 1 /* native MPU401 */ #define MPU401_HW_MPU401 1 /* native MPU401 */
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define snd_pcm_chip(pcm) ((pcm)->private_data) #define snd_pcm_chip(pcm) ((pcm)->private_data)
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
#include "pcm_oss.h" #include <sound/pcm_oss.h>
#endif #endif
/* /*
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
#include "seq_device.h" #include <sound/seq_device.h>
#endif #endif
/* /*
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
*/ */
#include "pcm.h" #include <sound/pcm.h>
#include "rawmidi.h" #include <sound/rawmidi.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -119,8 +119,8 @@ struct snd_sb_csp_info { ...@@ -119,8 +119,8 @@ struct snd_sb_csp_info {
#define SNDRV_SB_CSP_IOCTL_RESTART _IO('H', 0x16) #define SNDRV_SB_CSP_IOCTL_RESTART _IO('H', 0x16)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include "sb.h" #include <sound/sb.h>
#include "hwdep.h" #include <sound/hwdep.h>
#include <linux/firmware.h> #include <linux/firmware.h>
struct snd_sb_csp; struct snd_sb_csp;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#include <linux/time.h> #include <linux/time.h>
#include "asequencer.h" #include <sound/asequencer.h>
typedef struct snd_seq_real_time snd_seq_real_time_t; typedef struct snd_seq_real_time snd_seq_real_time_t;
typedef union snd_seq_timestamp snd_seq_timestamp_t; typedef union snd_seq_timestamp snd_seq_timestamp_t;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#include "seq_kernel.h" #include <sound/seq_kernel.h>
/* /*
* This structure is used to keep track of the current state on each * This structure is used to keep track of the current state on each
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "asequencer.h" #include <sound/asequencer.h>
#define MAX_MIDI_EVENT_BUF 256 #define MAX_MIDI_EVENT_BUF 256
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "asequencer.h" #include <sound/asequencer.h>
#include "seq_kernel.h" #include <sound/seq_kernel.h>
/* /*
* argument structure for synthesizer operations * argument structure for synthesizer operations
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
*/ */
#include "rawmidi.h" #include <sound/rawmidi.h>
#include "seq_midi_event.h" #include <sound/seq_midi_event.h>
/* /*
* device file instance: * device file instance:
......
#ifndef __SOUND_SND_WAVEFRONT_H__ #ifndef __SOUND_SND_WAVEFRONT_H__
#define __SOUND_SND_WAVEFRONT_H__ #define __SOUND_SND_WAVEFRONT_H__
#include "mpu401.h" #include <sound/mpu401.h>
#include "hwdep.h" #include <sound/hwdep.h>
#include "rawmidi.h" #include <sound/rawmidi.h>
#include "wavefront.h" /* generic OSS/ALSA/user-level wavefront header */ #include <sound/wavefront.h> /* generic OSS/ALSA/user-level wavefront header */
/* MIDI interface */ /* MIDI interface */
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "sfnt_info.h" #include <sound/sfnt_info.h>
#include "util_mem.h" #include <sound/util_mem.h>
#define SF_MAX_INSTRUMENTS 128 /* maximum instrument number */ #define SF_MAX_INSTRUMENTS 128 /* maximum instrument number */
#define SF_MAX_PRESETS 256 /* drums are mapped from 128 to 256 */ #define SF_MAX_PRESETS 256 /* drums are mapped from 128 to 256 */
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
#include "i2c.h" /* generic i2c support */ #include <sound/i2c.h> /* generic i2c support */
int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer); int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer);
int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *bus, int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *bus,
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
* *
*/ */
#include "control.h" #include <sound/control.h>
#include "pcm.h" #include <sound/pcm.h>
#include "timer.h" #include <sound/timer.h>
#include "cs4231-regs.h" #include <sound/cs4231-regs.h>
/* defines for codec.mode */ /* defines for codec.mode */
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include "gfpflags.h" #include <trace/events/gfpflags.h>
DECLARE_EVENT_CLASS(mm_compaction_isolate_template, DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include "gfpflags.h" #include <trace/events/gfpflags.h>
DECLARE_EVENT_CLASS(kmem_alloc, DECLARE_EVENT_CLASS(kmem_alloc,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/memcontrol.h> #include <linux/memcontrol.h>
#include "gfpflags.h" #include <trace/events/gfpflags.h>
#define RECLAIM_WB_ANON 0x0001u #define RECLAIM_WB_ANON 0x0001u
#define RECLAIM_WB_FILE 0x0002u #define RECLAIM_WB_FILE 0x0002u
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef __XEN_PUBLIC_CALLBACK_H__ #ifndef __XEN_PUBLIC_CALLBACK_H__
#define __XEN_PUBLIC_CALLBACK_H__ #define __XEN_PUBLIC_CALLBACK_H__
#include "xen.h" #include <xen/interface/xen.h>
/* /*
* Prototype for this hypercall is: * Prototype for this hypercall is:
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __XEN_PUBLIC_HVM_PARAMS_H__ #ifndef __XEN_PUBLIC_HVM_PARAMS_H__
#define __XEN_PUBLIC_HVM_PARAMS_H__ #define __XEN_PUBLIC_HVM_PARAMS_H__
#include "hvm_op.h" #include <xen/interface/hvm/hvm_op.h>
/* /*
* Parameter space for HVMOP_{set,get}_param. * Parameter space for HVMOP_{set,get}_param.
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#ifndef __XEN_PUBLIC_IO_BLKIF_H__ #ifndef __XEN_PUBLIC_IO_BLKIF_H__
#define __XEN_PUBLIC_IO_BLKIF_H__ #define __XEN_PUBLIC_IO_BLKIF_H__
#include "ring.h" #include <xen/interface/io/ring.h>
#include "../grant_table.h" #include <xen/interface/grant_table.h>
/* /*
* Front->back notifications: When enqueuing a new request, sending a * Front->back notifications: When enqueuing a new request, sending a
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#ifndef __XEN_PUBLIC_IO_NETIF_H__ #ifndef __XEN_PUBLIC_IO_NETIF_H__
#define __XEN_PUBLIC_IO_NETIF_H__ #define __XEN_PUBLIC_IO_NETIF_H__
#include "ring.h" #include <xen/interface/io/ring.h>
#include "../grant_table.h" #include <xen/interface/grant_table.h>
/* /*
* Notifications after enqueuing any type of message should be conditional on * Notifications after enqueuing any type of message should be conditional on
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef __XEN_PUBLIC_PLATFORM_H__ #ifndef __XEN_PUBLIC_PLATFORM_H__
#define __XEN_PUBLIC_PLATFORM_H__ #define __XEN_PUBLIC_PLATFORM_H__
#include "xen.h" #include <xen/interface/xen.h>
#define XENPF_INTERFACE_VERSION 0x03000001 #define XENPF_INTERFACE_VERSION 0x03000001
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __XEN_PUBLIC_SCHED_H__ #ifndef __XEN_PUBLIC_SCHED_H__
#define __XEN_PUBLIC_SCHED_H__ #define __XEN_PUBLIC_SCHED_H__
#include "event_channel.h" #include <xen/interface/event_channel.h>
/* /*
* The prototype for this hypercall is: * The prototype for this hypercall is:
......
...@@ -55,7 +55,7 @@ struct xen_feature_info { ...@@ -55,7 +55,7 @@ struct xen_feature_info {
}; };
/* Declares the features reported by XENVER_get_features. */ /* Declares the features reported by XENVER_get_features. */
#include "features.h" #include <xen/interface/features.h>
/* arg == NULL; returns host memory page size. */ /* arg == NULL; returns host memory page size. */
#define XENVER_pagesize 7 #define XENVER_pagesize 7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment