Prepared for main script
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAUGsfSBOxKuMESys7AQIQug/+LyViiXFmCSlM+lCGkp64/BfUvy0QHqN4
K/dMvbZKOQbvmgps/xj8G+6diDzeO4hz8e1I3c/SEZ3M9TTz/Ppv1slfET9uUZ4X
aLLHKqXihsxEOslw7mgp91KTd1Nr+e41f/5hr3j5Ap1HQB4yJa2mmj3reb48VfjD
jmXo/dID66c2ExaVO7C8yyZXWgMGTfiy27qmEnMTxW7xQPt1oYsV2Bq0PCC/zEcq
JgnwMatDVMy9en9wuEVMNelImE+XLm1T3XpLHL2WkV2JWSai98TcvGZnNKIxpFqu
PueHWWCs5F5bZfn4bf6QOEstRTW76NL2qFNYrBPi0Zuq8Pm53ucnnzJUY8JFPPoR
kXYmv8K73Jb10eHFuc3X4UyzvnhmJ7y3kG3jx7WoJVkW1KPgEFNmvMHkLyHgPZOU
nT1tZiO0QHF4zi0JWMfK+7aeEY7EKfqRSce0F3Jw91vaIlEOIqgMgVJ1Y/nMhu3s
92mpg8JDoAcgCghok4m4Pc1qO06Fe8Iw5Qap5KMdPutp5Br2ebLL5NrwdAE8LNpR
7826r9RTMhyVRgNJ71JMFDY1IBeLeY0bxipN8dh6VYqMiKgClUeNwv7/tIgI4YS7
acQ+GdcsgTtg5qx3xwX5N2TSJVvdwnXdnWhAw7wN48tbzH8LvMV61Pq8Ytc7iK3M
cAMgkbxdZRk=
=VtEQ
-----END PGP SIGNATURE-----
Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers
Pull preparatory patches for user API disintegration from David Howells:
"The patches herein prepare for the extraction of the Userspace API
bits from the various header files named in the Kbuild files.
New subdirectories are created under either include/uapi/ or
arch/x/include/uapi/ that correspond to the subdirectory containing
that file under include/ or arch/x/include/.
The new subdirs under the uapi/ directory are populated with Kbuild
files that mostly do nothing at this time. Further patches will
disintegrate the headers in each original directory and fill in the
Kbuild files as they do it.
These patches also:
(1) fix up #inclusions of "foo.h" rather than <foo.h>.
(2) Remove some redundant #includes from the DRM code.
(3) Make the kernel build infrastructure handle Kbuild files both in
the old places and the new UAPI place that both specify headers
to be exported.
(4) Fix some kernel tools that #include kernel headers during their
build.
I have compile tested this with allyesconfig against x86_64,
allmodconfig against i386 and a scattering of additional defconfigs of
other arches. Prepared for main script
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>"
* tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: Plumb the UAPI Kbuilds into the user header installation and checking
UAPI: x86: Differentiate the generated UAPI and internal headers
UAPI: Remove the objhdr-y export list
UAPI: Move linux/version.h
UAPI: Set up uapi/asm/Kbuild.asm
UAPI: x86: Fix insn_sanity build failure after UAPI split
UAPI: x86: Fix the test_get_len tool
UAPI: (Scripted) Set up UAPI Kbuild files
UAPI: Partition the header include path sets and add uapi/ header directories
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
UAPI: Refer to the DRM UAPI headers with <...> and from certain headers only
This commit is contained in:
Linus Torvalds
commit
9b2e077c42
|
|
@ -45,7 +45,7 @@ This document describes the Linux kernel Makefiles.
|
|||
|
||||
=== 7 Kbuild syntax for exported headers
|
||||
--- 7.1 header-y
|
||||
--- 7.2 objhdr-y
|
||||
--- 7.2 genhdr-y
|
||||
--- 7.3 destination-y
|
||||
--- 7.4 generic-y
|
||||
|
||||
|
|
@ -1282,15 +1282,15 @@ See subsequent chapter for the syntax of the Kbuild file.
|
|||
|
||||
Subdirectories are visited before their parent directories.
|
||||
|
||||
--- 7.2 objhdr-y
|
||||
--- 7.2 genhdr-y
|
||||
|
||||
objhdr-y specifies generated files to be exported.
|
||||
genhdr-y specifies generated files to be exported.
|
||||
Generated files are special as they need to be looked
|
||||
up in another directory when doing 'make O=...' builds.
|
||||
|
||||
Example:
|
||||
#include/linux/Kbuild
|
||||
objhdr-y += version.h
|
||||
genhdr-y += version.h
|
||||
|
||||
--- 7.3 destination-y
|
||||
|
||||
|
|
|
|||
43
Makefile
43
Makefile
|
|
@ -350,12 +350,22 @@ AFLAGS_KERNEL =
|
|||
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
|
||||
|
||||
|
||||
# Use USERINCLUDE when you must reference the UAPI directories only.
|
||||
USERINCLUDE := \
|
||||
-I$(srctree)/arch/$(hdr-arch)/include/uapi \
|
||||
-Iarch/$(hdr-arch)/include/generated/uapi \
|
||||
-I$(srctree)/include/uapi \
|
||||
-Iinclude/generated/uapi \
|
||||
-include $(srctree)/include/linux/kconfig.h
|
||||
|
||||
# Use LINUXINCLUDE when you must reference the include/ directory.
|
||||
# Needed to be compatible with the O= option
|
||||
LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \
|
||||
-Iarch/$(hdr-arch)/include/generated -Iinclude \
|
||||
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
||||
-include $(srctree)/include/linux/kconfig.h
|
||||
LINUXINCLUDE := \
|
||||
-I$(srctree)/arch/$(hdr-arch)/include \
|
||||
-Iarch/$(hdr-arch)/include/generated \
|
||||
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
||||
-Iinclude \
|
||||
$(USERINCLUDE)
|
||||
|
||||
KBUILD_CPPFLAGS := -D__KERNEL__
|
||||
|
||||
|
|
@ -437,9 +447,11 @@ asm-generic:
|
|||
# Detect when mixed targets is specified, and make a second invocation
|
||||
# of make so .config is not included in this case either (for *config).
|
||||
|
||||
version_h := include/generated/uapi/linux/version.h
|
||||
|
||||
no-dot-config-targets := clean mrproper distclean \
|
||||
cscope gtags TAGS tags help %docs check% coccicheck \
|
||||
include/linux/version.h headers_% archheaders archscripts \
|
||||
$(version_h) headers_% archheaders archscripts \
|
||||
kernelversion %src-pkg
|
||||
|
||||
config-targets := 0
|
||||
|
|
@ -809,7 +821,7 @@ endif
|
|||
# prepare2 creates a makefile if using a separate output directory
|
||||
prepare2: prepare3 outputmakefile asm-generic
|
||||
|
||||
prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
|
||||
prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
|
||||
include/config/auto.conf
|
||||
$(cmd_crmodverdir)
|
||||
|
||||
|
|
@ -842,7 +854,7 @@ define filechk_version.h
|
|||
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
|
||||
endef
|
||||
|
||||
include/linux/version.h: $(srctree)/Makefile FORCE
|
||||
$(version_h): $(srctree)/Makefile FORCE
|
||||
$(call filechk,version.h)
|
||||
|
||||
include/generated/utsrelease.h: include/config/kernel.release FORCE
|
||||
|
|
@ -887,7 +899,7 @@ PHONY += archscripts
|
|||
archscripts:
|
||||
|
||||
PHONY += __headers
|
||||
__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE
|
||||
__headers: $(version_h) scripts_basic asm-generic archheaders archscripts FORCE
|
||||
$(Q)$(MAKE) $(build)=scripts build_unifdef
|
||||
|
||||
PHONY += headers_install_all
|
||||
|
|
@ -896,10 +908,10 @@ headers_install_all:
|
|||
|
||||
PHONY += headers_install
|
||||
headers_install: __headers
|
||||
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild),, \
|
||||
$(error Headers not exportable for the $(SRCARCH) architecture))
|
||||
$(Q)$(MAKE) $(hdr-inst)=include
|
||||
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst)
|
||||
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
|
||||
$(error Headers not exportable for the $(SRCARCH) architecture))
|
||||
$(Q)$(MAKE) $(hdr-inst)=include/uapi
|
||||
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst)
|
||||
|
||||
PHONY += headers_check_all
|
||||
headers_check_all: headers_install_all
|
||||
|
|
@ -907,8 +919,8 @@ headers_check_all: headers_install_all
|
|||
|
||||
PHONY += headers_check
|
||||
headers_check: headers_install
|
||||
$(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1
|
||||
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) HDRCHECK=1
|
||||
$(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1
|
||||
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Modules
|
||||
|
|
@ -997,8 +1009,7 @@ CLEAN_DIRS += $(MODVERDIR)
|
|||
# Directories & files removed with 'make mrproper'
|
||||
MRPROPER_DIRS += include/config usr/include include/generated \
|
||||
arch/*/include/generated
|
||||
MRPROPER_FILES += .config .config.old .version .old_version \
|
||||
include/linux/version.h \
|
||||
MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
|
||||
Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
|
||||
|
||||
# clean - Delete most, but leave enough to build external modules
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#ifndef CONFIG_MMU
|
||||
|
||||
#include "page-nommu.h"
|
||||
#include <asm/page-nommu.h>
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#ifndef CONFIG_MMU
|
||||
|
||||
#include <asm-generic/4level-fixup.h>
|
||||
#include "pgtable-nommu.h"
|
||||
#include <asm/pgtable-nommu.h>
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
#include <asm/hwcap.h>
|
||||
|
||||
#include "vfp.h"
|
||||
#include <asm/vfp.h>
|
||||
|
||||
@ Macros to allow building with old toolkits (with no VFP support)
|
||||
.macro VFPFMRX, rd, sysreg, cond
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -23,7 +23,9 @@ mach-$(CONFIG_ETRAXFS) := fs
|
|||
|
||||
ifneq ($(arch-y),)
|
||||
SARCH := arch-$(arch-y)
|
||||
inc := -Iarch/cris/include/$(SARCH)
|
||||
inc := -Iarch/cris/include/uapi/$(SARCH)
|
||||
inc += -Iarch/cris/include/$(SARCH)
|
||||
inc += -Iarch/cris/include/uapi/$(SARCH)/arch
|
||||
inc += -Iarch/cris/include/$(SARCH)/arch
|
||||
else
|
||||
SARCH :=
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
|
||||
/*------------------------------------------------------------*/
|
||||
|
||||
#include "sv_addr.agh"
|
||||
#include <arch/sv_addr.agh>
|
||||
|
||||
#if __test_sv_addr__
|
||||
/* IO_MASK( R_BUS_CONFIG , CE ) */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _ASM_CRIS_SVINTO_H
|
||||
#define _ASM_CRIS_SVINTO_H
|
||||
|
||||
#include "sv_addr_ag.h"
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
extern unsigned int genconfig_shadow; /* defined and set in head.S */
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#include "mach/dma.h"
|
||||
#include <mach/dma.h>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#define dma_h
|
||||
|
||||
/* registers */ /* Really needed, since both are listed in sw.list? */
|
||||
#include "dma_defs.h"
|
||||
#include <arch/hwregs/dma_defs.h>
|
||||
|
||||
|
||||
/* descriptors */
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
# UAPI Header export list
|
||||
|
|
@ -0,0 +1 @@
|
|||
# UAPI Header export list
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
header-y += arch-v10/
|
||||
header-y += arch-v32/
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef __uClinux__
|
||||
#include "cacheflush_no.h"
|
||||
#include <asm/cacheflush_no.h>
|
||||
#else
|
||||
#include "cacheflush_mm.h"
|
||||
#include <asm/cacheflush_mm.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef __uClinux__
|
||||
#include "io_no.h"
|
||||
#include <asm/io_no.h>
|
||||
#else
|
||||
#include "io_mm.h"
|
||||
#include <asm/io_mm.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "m68360_regs.h"
|
||||
#include "m68360_pram.h"
|
||||
#include "m68360_quicc.h"
|
||||
#include "m68360_enet.h"
|
||||
#include <asm/m68360_regs.h>
|
||||
#include <asm/m68360_pram.h>
|
||||
#include <asm/m68360_quicc.h>
|
||||
#include <asm/m68360_enet.h>
|
||||
|
||||
#ifdef CONFIG_M68360
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef __ETHER_H
|
||||
#define __ETHER_H
|
||||
|
||||
#include "quicc_simple.h"
|
||||
#include <asm/quicc_simple.h>
|
||||
|
||||
/*
|
||||
* transmit BD's
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ extern unsigned long _ramend;
|
|||
#endif /* !__ASSEMBLY__ */
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
#include "page_mm.h"
|
||||
#include <asm/page_mm.h>
|
||||
#else
|
||||
#include "page_no.h"
|
||||
#include <asm/page_no.h>
|
||||
#endif
|
||||
|
||||
#include <asm-generic/getorder.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef __uClinux__
|
||||
#include "pgtable_no.h"
|
||||
#include <asm/pgtable_no.h>
|
||||
#else
|
||||
#include "pgtable_mm.h"
|
||||
#include <asm/pgtable_mm.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
#define Q40_RTC_WRITE 128
|
||||
|
||||
/* define some Q40 specific ints */
|
||||
#include "q40ints.h"
|
||||
#include <asm/q40ints.h>
|
||||
|
||||
/* misc defs */
|
||||
#define DAC_LEFT ((unsigned char *)0xff008000)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef __uClinux__
|
||||
#include "uaccess_no.h"
|
||||
#include <asm/uaccess_no.h>
|
||||
#else
|
||||
#include "uaccess_mm.h"
|
||||
#include <asm/uaccess_mm.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef CONFIG_MMU
|
||||
# include "mmu_context_mm.h"
|
||||
# include <asm/mmu_context_mm.h>
|
||||
#else
|
||||
# include <asm-generic/mmu_context.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef BCM63XX_IO_H_
|
||||
#define BCM63XX_IO_H_
|
||||
|
||||
#include "bcm63xx_cpu.h"
|
||||
#include <asm/mach-bcm63xx/bcm63xx_cpu.h>
|
||||
|
||||
/*
|
||||
* Physical memory map, RAM is mapped at 0x0.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
- including locking between different uses
|
||||
*/
|
||||
|
||||
#include "pnx833x.h"
|
||||
#include <asm/mach-pnx833x/pnx833x.h>
|
||||
|
||||
#define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0)
|
||||
#define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#ifndef __CVMX_ASM_H__
|
||||
#define __CVMX_ASM_H__
|
||||
|
||||
#include "octeon-model.h"
|
||||
#include <asm/octeon/octeon-model.h>
|
||||
|
||||
/* other useful stuff */
|
||||
#define CVMX_SYNC asm volatile ("sync" : : : "memory")
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
#include <linux/prefetch.h>
|
||||
|
||||
#include "cvmx-fpa.h"
|
||||
#include <asm/octeon/cvmx-fpa.h>
|
||||
/**
|
||||
* By default we disable the max depth support. Most programs
|
||||
* don't use it and it slows down the command queue processing
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@
|
|||
#ifndef __CVMX_FPA_H__
|
||||
#define __CVMX_FPA_H__
|
||||
|
||||
#include "cvmx-address.h"
|
||||
#include "cvmx-fpa-defs.h"
|
||||
#include <asm/octeon/cvmx-address.h>
|
||||
#include <asm/octeon/cvmx-fpa-defs.h>
|
||||
|
||||
#define CVMX_FPA_NUM_POOLS 8
|
||||
#define CVMX_FPA_MIN_BLOCK_SIZE 128
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef __CVMX_HELPER_BOARD_H__
|
||||
#define __CVMX_HELPER_BOARD_H__
|
||||
|
||||
#include "cvmx-helper.h"
|
||||
#include <asm/octeon/cvmx-helper.h>
|
||||
|
||||
typedef enum {
|
||||
set_phy_link_flags_autoneg = 0x1,
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@
|
|||
#ifndef __CVMX_HELPER_H__
|
||||
#define __CVMX_HELPER_H__
|
||||
|
||||
#include "cvmx-config.h"
|
||||
#include "cvmx-fpa.h"
|
||||
#include "cvmx-wqe.h"
|
||||
#include <asm/octeon/cvmx-config.h>
|
||||
#include <asm/octeon/cvmx-fpa.h>
|
||||
#include <asm/octeon/cvmx-wqe.h>
|
||||
|
||||
typedef enum {
|
||||
CVMX_HELPER_INTERFACE_MODE_DISABLED,
|
||||
|
|
@ -62,13 +62,13 @@ typedef union {
|
|||
} cvmx_helper_link_info_t;
|
||||
|
||||
#include <asm/octeon/cvmx-helper-errata.h>
|
||||
#include "cvmx-helper-loop.h"
|
||||
#include "cvmx-helper-npi.h"
|
||||
#include "cvmx-helper-rgmii.h"
|
||||
#include "cvmx-helper-sgmii.h"
|
||||
#include "cvmx-helper-spi.h"
|
||||
#include "cvmx-helper-util.h"
|
||||
#include "cvmx-helper-xaui.h"
|
||||
#include <asm/octeon/cvmx-helper-loop.h>
|
||||
#include <asm/octeon/cvmx-helper-npi.h>
|
||||
#include <asm/octeon/cvmx-helper-rgmii.h>
|
||||
#include <asm/octeon/cvmx-helper-sgmii.h>
|
||||
#include <asm/octeon/cvmx-helper-spi.h>
|
||||
#include <asm/octeon/cvmx-helper-util.h>
|
||||
#include <asm/octeon/cvmx-helper-xaui.h>
|
||||
|
||||
/**
|
||||
* cvmx_override_pko_queue_priority(int ipd_port, uint64_t
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef __CVMX_MIO_H__
|
||||
#define __CVMX_MIO_H__
|
||||
|
||||
#include "cvmx-smix-defs.h"
|
||||
#include <asm/octeon/cvmx-smix-defs.h>
|
||||
|
||||
/**
|
||||
* PHY register 0 from the 802.3 spec
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
#ifndef __CVMX_PIP_H__
|
||||
#define __CVMX_PIP_H__
|
||||
|
||||
#include "cvmx-wqe.h"
|
||||
#include "cvmx-fpa.h"
|
||||
#include "cvmx-pip-defs.h"
|
||||
#include <asm/octeon/cvmx-wqe.h>
|
||||
#include <asm/octeon/cvmx-fpa.h>
|
||||
#include <asm/octeon/cvmx-pip-defs.h>
|
||||
|
||||
#define CVMX_PIP_NUM_INPUT_PORTS 40
|
||||
#define CVMX_PIP_NUM_WATCHERS 4
|
||||
|
|
|
|||
|
|
@ -58,10 +58,10 @@
|
|||
#ifndef __CVMX_PKO_H__
|
||||
#define __CVMX_PKO_H__
|
||||
|
||||
#include "cvmx-fpa.h"
|
||||
#include "cvmx-pow.h"
|
||||
#include "cvmx-cmd-queue.h"
|
||||
#include "cvmx-pko-defs.h"
|
||||
#include <asm/octeon/cvmx-fpa.h>
|
||||
#include <asm/octeon/cvmx-pow.h>
|
||||
#include <asm/octeon/cvmx-cmd-queue.h>
|
||||
#include <asm/octeon/cvmx-pko-defs.h>
|
||||
|
||||
/* Adjust the command buffer size by 1 word so that in the case of using only
|
||||
* two word PKO commands no command words stradle buffers. The useful values
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@
|
|||
|
||||
#include <asm/octeon/cvmx-pow-defs.h>
|
||||
|
||||
#include "cvmx-scratch.h"
|
||||
#include "cvmx-wqe.h"
|
||||
#include <asm/octeon/cvmx-scratch.h>
|
||||
#include <asm/octeon/cvmx-wqe.h>
|
||||
|
||||
/* Default to having all POW constancy checks turned on */
|
||||
#ifndef CVMX_ENABLE_POW_CHECKS
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#ifndef __CVMX_SPI_H__
|
||||
#define __CVMX_SPI_H__
|
||||
|
||||
#include "cvmx-gmxx-defs.h"
|
||||
#include <asm/octeon/cvmx-gmxx-defs.h>
|
||||
|
||||
/* CSR typedefs have been moved to cvmx-csr-*.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef __CVMX_SPINLOCK_H__
|
||||
#define __CVMX_SPINLOCK_H__
|
||||
|
||||
#include "cvmx-asm.h"
|
||||
#include <asm/octeon/cvmx-asm.h>
|
||||
|
||||
/* Spinlocks for Octeon */
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#ifndef __CVMX_WQE_H__
|
||||
#define __CVMX_WQE_H__
|
||||
|
||||
#include "cvmx-packet.h"
|
||||
#include <asm/octeon/cvmx-packet.h>
|
||||
|
||||
|
||||
#define OCT_TAG_TYPE_STRING(x) \
|
||||
|
|
|
|||
|
|
@ -52,24 +52,24 @@ enum cvmx_mips_space {
|
|||
#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))
|
||||
#endif
|
||||
|
||||
#include "cvmx-asm.h"
|
||||
#include "cvmx-packet.h"
|
||||
#include "cvmx-sysinfo.h"
|
||||
#include <asm/octeon/cvmx-asm.h>
|
||||
#include <asm/octeon/cvmx-packet.h>
|
||||
#include <asm/octeon/cvmx-sysinfo.h>
|
||||
|
||||
#include "cvmx-ciu-defs.h"
|
||||
#include "cvmx-gpio-defs.h"
|
||||
#include "cvmx-iob-defs.h"
|
||||
#include "cvmx-ipd-defs.h"
|
||||
#include "cvmx-l2c-defs.h"
|
||||
#include "cvmx-l2d-defs.h"
|
||||
#include "cvmx-l2t-defs.h"
|
||||
#include "cvmx-led-defs.h"
|
||||
#include "cvmx-mio-defs.h"
|
||||
#include "cvmx-pow-defs.h"
|
||||
#include <asm/octeon/cvmx-ciu-defs.h>
|
||||
#include <asm/octeon/cvmx-gpio-defs.h>
|
||||
#include <asm/octeon/cvmx-iob-defs.h>
|
||||
#include <asm/octeon/cvmx-ipd-defs.h>
|
||||
#include <asm/octeon/cvmx-l2c-defs.h>
|
||||
#include <asm/octeon/cvmx-l2d-defs.h>
|
||||
#include <asm/octeon/cvmx-l2t-defs.h>
|
||||
#include <asm/octeon/cvmx-led-defs.h>
|
||||
#include <asm/octeon/cvmx-mio-defs.h>
|
||||
#include <asm/octeon/cvmx-pow-defs.h>
|
||||
|
||||
#include "cvmx-bootinfo.h"
|
||||
#include "cvmx-bootmem.h"
|
||||
#include "cvmx-l2c.h"
|
||||
#include <asm/octeon/cvmx-bootinfo.h>
|
||||
#include <asm/octeon/cvmx-bootmem.h>
|
||||
#include <asm/octeon/cvmx-l2c.h>
|
||||
|
||||
#ifndef CVMX_ENABLE_DEBUG_PRINTS
|
||||
#define CVMX_ENABLE_DEBUG_PRINTS 1
|
||||
|
|
|
|||
|
|
@ -313,6 +313,6 @@ static inline int __octeon_is_model_runtime__(uint32_t model)
|
|||
const char *octeon_model_get_string(uint32_t chip_id);
|
||||
const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
|
||||
|
||||
#include "octeon-feature.h"
|
||||
#include <asm/octeon/octeon-feature.h>
|
||||
|
||||
#endif /* __OCTEON_MODEL_H__ */
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef __ASM_OCTEON_OCTEON_H
|
||||
#define __ASM_OCTEON_OCTEON_H
|
||||
|
||||
#include "cvmx.h"
|
||||
#include <asm/octeon/cvmx.h>
|
||||
|
||||
extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
|
||||
uint64_t alignment,
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef _BCM1480_INT_H
|
||||
#define _BCM1480_INT_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* Interrupt Mapper Constants
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _BCM1480_L2C_H
|
||||
#define _BCM1480_L2C_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/*
|
||||
* Format of level 2 cache management address (Table 55)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _BCM1480_MC_H
|
||||
#define _BCM1480_MC_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/*
|
||||
* Memory Channel Configuration Register (Table 81)
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@
|
|||
#ifndef _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
|
||||
* 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
|
||||
#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.
|
||||
********************************************************************* */
|
||||
|
||||
#include "sb1250_scd.h"
|
||||
#include <asm/sibyte/sb1250_scd.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* Some general notes:
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#define _SB1250_DMA_H
|
||||
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* DMA Registers
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef _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)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _SB1250_INT_H
|
||||
#define _SB1250_INT_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* Interrupt Mapper Constants
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _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)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _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_DEVICE_SB1250 0x0002
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _SB1250_MAC_H
|
||||
#define _SB1250_MAC_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* Ethernet MAC Registers
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _SB1250_MC_H
|
||||
#define _SB1250_MC_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/*
|
||||
* Memory Channel Config Register (table 6-14)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _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
|
||||
#define _SB1250_SCD_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* *********************************************************************
|
||||
* System control/debug registers
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef _SB1250_SMBUS_H
|
||||
#define _SB1250_SMBUS_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/*
|
||||
* SMBus Clock Frequency Register (Table 14-2)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _SB1250_SYNCSER_H
|
||||
#define _SB1250_SYNCSER_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/*
|
||||
* Serial Mode Configuration Register
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef _SB1250_UART_H
|
||||
#define _SB1250_UART_H
|
||||
|
||||
#include "sb1250_defs.h"
|
||||
#include <asm/sibyte/sb1250_defs.h>
|
||||
|
||||
/* **********************************************************************
|
||||
* DUART Registers
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/device.h>
|
||||
#include "cell-pmu.h"
|
||||
#include <asm/cell-pmu.h>
|
||||
|
||||
union ps3_firmware_version {
|
||||
u64 raw;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <asm/immap_qe.h>
|
||||
#include <asm/qe.h>
|
||||
|
||||
#include "ucc.h"
|
||||
#include <asm/ucc.h>
|
||||
|
||||
/* Receive BD's status */
|
||||
#define R_E 0x80000000 /* buffer empty */
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <asm/immap_qe.h>
|
||||
#include <asm/qe.h>
|
||||
|
||||
#include "ucc.h"
|
||||
#include <asm/ucc.h>
|
||||
|
||||
/* transmit BD's status */
|
||||
#define T_R 0x80000000 /* ready bit */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
#define __ASM_SH_BL_BIT_H
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "bl_bit_32.h"
|
||||
# include <asm/bl_bit_32.h>
|
||||
#else
|
||||
# include "bl_bit_64.h"
|
||||
# include <asm/bl_bit_64.h>
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_SH_BL_BIT_H */
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "cache_insns_32.h"
|
||||
# include <asm/cache_insns_32.h>
|
||||
#else
|
||||
# include "cache_insns_64.h"
|
||||
# include <asm/cache_insns_64.h>
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_SH_CACHE_INSNS_H */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef CONFIG_SUPERH32
|
||||
# include "checksum_32.h"
|
||||
# include <asm/checksum_32.h>
|
||||
#else
|
||||
# include <asm-generic/checksum.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
#define MMU_VPN_MASK 0xfffff000
|
||||
|
||||
#if defined(CONFIG_SUPERH32)
|
||||
#include "mmu_context_32.h"
|
||||
#include <asm/mmu_context_32.h>
|
||||
#else
|
||||
#include "mmu_context_64.h"
|
||||
#include <asm/mmu_context_64.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
#ifdef __KERNEL__
|
||||
# ifdef CONFIG_SUPERH32
|
||||
# include "posix_types_32.h"
|
||||
# include <asm/posix_types_32.h>
|
||||
# else
|
||||
# include "posix_types_64.h"
|
||||
# include <asm/posix_types_64.h>
|
||||
# endif
|
||||
#else
|
||||
# ifdef __SH5__
|
||||
# include "posix_types_64.h"
|
||||
# include <asm/posix_types_64.h>
|
||||
# else
|
||||
# include "posix_types_32.h"
|
||||
# include <asm/posix_types_32.h>
|
||||
# endif
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
|
|||
|
|
@ -175,9 +175,9 @@ extern unsigned int instruction_size(unsigned int insn);
|
|||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "processor_32.h"
|
||||
# include <asm/processor_32.h>
|
||||
#else
|
||||
# include "processor_64.h"
|
||||
# include <asm/processor_64.h>
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_SH_PROCESSOR_H */
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
#define PT_TEXT_LEN 252
|
||||
|
||||
#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
|
||||
#include "ptrace_64.h"
|
||||
#include <asm/ptrace_64.h>
|
||||
#else
|
||||
#include "ptrace_32.h"
|
||||
#include <asm/ptrace_32.h>
|
||||
#endif
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef CONFIG_SUPERH32
|
||||
# include "string_32.h"
|
||||
# include <asm/string_32.h>
|
||||
#else
|
||||
# include "string_64.h"
|
||||
# include <asm/string_64.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
#define __ASM_SH_SWITCH_TO_H
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "switch_to_32.h"
|
||||
# include <asm/switch_to_32.h>
|
||||
#else
|
||||
# include "switch_to_64.h"
|
||||
# include <asm/switch_to_64.h>
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_SH_SWITCH_TO_H */
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
extern const unsigned long sys_call_table[];
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "syscall_32.h"
|
||||
# include <asm/syscall_32.h>
|
||||
#else
|
||||
# include "syscall_64.h"
|
||||
# include <asm/syscall_64.h>
|
||||
#endif
|
||||
|
||||
#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);
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "syscalls_32.h"
|
||||
# include <asm/syscalls_32.h>
|
||||
#else
|
||||
# include "syscalls_64.h"
|
||||
# include <asm/syscalls_64.h>
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#define __ASM_SH_TLB_H
|
||||
|
||||
#ifdef CONFIG_SUPERH64
|
||||
# include "tlb_64.h"
|
||||
# include <asm/tlb_64.h>
|
||||
#endif
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
#include <linux/compiler.h>
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "traps_32.h"
|
||||
# include <asm/traps_32.h>
|
||||
#else
|
||||
# include "traps_64.h"
|
||||
# include <asm/traps_64.h>
|
||||
#endif
|
||||
|
||||
BUILD_TRAP_HANDLER(address_error);
|
||||
|
|
|
|||
|
|
@ -97,9 +97,9 @@ struct __large_struct { unsigned long buf[100]; };
|
|||
})
|
||||
|
||||
#ifdef CONFIG_SUPERH32
|
||||
# include "uaccess_32.h"
|
||||
# include <asm/uaccess_32.h>
|
||||
#else
|
||||
# include "uaccess_64.h"
|
||||
# include <asm/uaccess_64.h>
|
||||
#endif
|
||||
|
||||
extern long strncpy_from_user(char *dest, const char __user *src, long count);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifdef __KERNEL__
|
||||
# ifdef CONFIG_SUPERH32
|
||||
# include "unistd_32.h"
|
||||
# include <asm/unistd_32.h>
|
||||
# else
|
||||
# include "unistd_64.h"
|
||||
# include <asm/unistd_64.h>
|
||||
# endif
|
||||
|
||||
# define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
||||
|
|
@ -40,8 +40,8 @@
|
|||
|
||||
#else
|
||||
# ifdef __SH5__
|
||||
# include "unistd_64.h"
|
||||
# include <asm/unistd_64.h>
|
||||
# else
|
||||
# include "unistd_32.h"
|
||||
# include <asm/unistd_32.h>
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <asm/romimage-macros.h>
|
||||
#include "partner-jet-setup.txt"
|
||||
#include <mach/partner-jet-setup.txt>
|
||||
|
||||
/* execute icbi after enabling cache */
|
||||
mov.l 1f, r0
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <asm/romimage-macros.h>
|
||||
#include "partner-jet-setup.txt"
|
||||
#include <mach/partner-jet-setup.txt>
|
||||
|
||||
/* execute icbi after enabling cache */
|
||||
mov.l 1f, r0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# UAPI Header export list
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# UAPI Header export list
|
||||
# User exported sparc header files
|
||||
|
||||
include include/uapi/asm-generic/Kbuild.asm
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
* 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. */
|
||||
#define DMA_QUEUE_CREDIT_SHIFT 32
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
* resources.
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "dma_queue.h"
|
||||
#include <gxio/common.h>
|
||||
#include <gxio/dma_queue.h>
|
||||
|
||||
#include <linux/time.h>
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue