forked from mirrors/linux
		
	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
Convert #include "..." to #include <path/...> in kernel system headers. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
This commit is contained in:
		
							parent
							
								
									760285e7e7
								
							
						
					
					
						commit
						a1ce39288e
					
				
					 176 changed files with 348 additions and 348 deletions
				
			
		|  | @ -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 @@ | ||||||
| #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 @@ | ||||||
|  */ |  */ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| /*------------------------------------------------------------*/ | /*------------------------------------------------------------*/ | ||||||
| 
 | 
 | ||||||
| #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 ) */ | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #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 */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1 +1 @@ | ||||||
| #include "mach/dma.h" | #include <mach/dma.h> | ||||||
|  |  | ||||||
|  | @ -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 */ | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #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 @@ | ||||||
| #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; | ||||||
| #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> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 @@ | ||||||
| #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) | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #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 @@ | ||||||
|    - 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 @@ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 { | ||||||
| } 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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 { | ||||||
| #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) | ||||||
| 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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #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 */ | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 @@ | ||||||
| #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 | ||||||
| 
 | 
 | ||||||
| /*
 | /*
 | ||||||
|  |  | ||||||
|  | @ -1,13 +1,13 @@ | ||||||
| #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); | ||||||
| #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 @@ | ||||||
| #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__ | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| 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, | ||||||
| 			  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 @@ | ||||||
| #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 @@ | ||||||
| #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]; }; | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
| #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); | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
|  * 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 @@ | ||||||
|  * 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 @@ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
|  * 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 @@ | ||||||
| #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 @@ | ||||||
| 
 | 
 | ||||||
| #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 @@ | ||||||
| #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 @@ | ||||||
| #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) | ||||||
| #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 | ||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #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, | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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) | ||||||
| 	__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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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) | ||||||
| #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); | ||||||
| #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); | ||||||
| #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 @@ | ||||||
| #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__ | ||||||
|  |  | ||||||
|  | @ -1,15 +1,15 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| #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 { | ||||||
| #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 @@ | ||||||
| #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 { | ||||||
| #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 @@ | ||||||
| # 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 = { | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| /* 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 = { | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| /* 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 @@ | ||||||
|  * |  * | ||||||
|  * 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 @@ | ||||||
| #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 */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
Some files were not shown because too many files have changed in this diff Show more
		Loading…
	
		Reference in a new issue
	
	 David Howells
						David Howells