diff options
author | Linus Torvalds | 2010-08-08 19:08:26 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-08-08 19:08:26 +0200 |
commit | 53bcef60633086ad73683d01a4ef9ca678484d2d (patch) | |
tree | 8b14cc031124d0aa0da6cd3b60115bc7eaa80061 /arch/cris/include/arch-v32/mach-fs/mach/startup.inc | |
parent | Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra (diff) | |
parent | CRIS: Fix alignment problem for older ld (diff) | |
download | kernel-qcow2-linux-53bcef60633086ad73683d01a4ef9ca678484d2d.tar.gz kernel-qcow2-linux-53bcef60633086ad73683d01a4ef9ca678484d2d.tar.xz kernel-qcow2-linux-53bcef60633086ad73683d01a4ef9ca678484d2d.zip |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: (51 commits)
CRIS: Fix alignment problem for older ld
CRIS: Always dump registers for segfaulting process.
CRIS: Add config for pausing a seg-faulting process
CRIS: Don't take faults while in_atomic
CRIS: Fixup lookup for delay slot faults
CRIS: Discard exit.text and .data at runtime
CRIS: Add cache aligned and read mostly data sections
CRIS: Return something from profile write
CRIS: Add ARTPEC-3 and timestamps for sync-serial
CRIS: Better ARTPEC-3 support for gpio
CRIS: Add include guard
CRIS: Better handling of pinmux settings
CRIS: New DMA defines for ARTPEC-3
CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil
CRIS: Pagetable for ARTPEC-3
CRIS: Machine dependent memmap.h
CRIS: Check if pointer is set before using it
CRIS: Machine dependent dma.h
CRIS: Define __read_mostly for CRISv32
CRIS: Discard .note.gnu.build-id section
...
Diffstat (limited to 'arch/cris/include/arch-v32/mach-fs/mach/startup.inc')
-rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/startup.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc index 4a10ccbd6cc1..dd1abbdcbc7a 100644 --- a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc +++ b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc @@ -1,3 +1,6 @@ +#ifndef STARTUP_INC_INCLUDED +#define STARTUP_INC_INCLUDED + #include <hwregs/asm/reg_map_asm.h> #include <hwregs/asm/bif_core_defs_asm.h> #include <hwregs/asm/gio_defs_asm.h> @@ -75,3 +78,5 @@ move.d $r10, [$r11] #endif .endm + +#endif |