diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 18:48:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 18:48:55 -0400 |
| commit | 45701e2636a02ab1c5305ead5236f05bda64c15f (patch) | |
| tree | 1a447dfd3b1779254bafc14b092ec2371b2206c3 /arch/c6x/include | |
| parent | 497a5df7bf6ffd136ae21c49d1a01292930d7ca2 (diff) | |
| parent | 3083ca2376a76072dc0071fb211de80b0ac44bd1 (diff) | |
| download | linux-45701e2636a02ab1c5305ead5236f05bda64c15f.tar.gz linux-45701e2636a02ab1c5305ead5236f05bda64c15f.tar.bz2 linux-45701e2636a02ab1c5305ead5236f05bda64c15f.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull arch/c6x fixes from Mark Salter.
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback
c6x: kernel: setup: Export symbol memory_end
c6x: kernel: setup: Add screen_info global variable
c6x: include: asm: Kbuild: Add generic serial.h
c6x: include: asm: dma-mapping: Add dummy dma_sync_single_range_for_device
c6x: include: asm: setup: Include "linux/types.h"
c6x: asm: Add default flat.h according to xtensa architecture
c6x: kernel: setup: Remove 'const' for local variables in machine_init
c6x: Makefile: Add -D__linux__
C6x: time: Ensure consistency in __init
c6x: kernel: setup: Include "linux/console.h"
Diffstat (limited to 'arch/c6x/include')
| -rw-r--r-- | arch/c6x/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/c6x/include/asm/dma-mapping.h | 8 | ||||
| -rw-r--r-- | arch/c6x/include/asm/flat.h | 12 | ||||
| -rw-r--r-- | arch/c6x/include/asm/setup.h | 1 |
4 files changed, 22 insertions, 0 deletions
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 2de73391b81e..ae0a51f5376c 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -41,6 +41,7 @@ generic-y += resource.h generic-y += scatterlist.h generic-y += segment.h generic-y += sembuf.h +generic-y += serial.h generic-y += shmbuf.h generic-y += shmparam.h generic-y += siginfo.h diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h index 88bd0d899bdb..bbd7774e4d4e 100644 --- a/arch/c6x/include/asm/dma-mapping.h +++ b/arch/c6x/include/asm/dma-mapping.h @@ -17,6 +17,14 @@ #define dma_supported(d, m) 1 +static inline void dma_sync_single_range_for_device(struct device *dev, + dma_addr_t addr, + unsigned long offset, + size_t size, + enum dma_data_direction dir) +{ +} + static inline int dma_set_mask(struct device *dev, u64 dma_mask) { if (!dev->dma_mask || !dma_supported(dev, dma_mask)) diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h new file mode 100644 index 000000000000..a1858bd5f6c8 --- /dev/null +++ b/arch/c6x/include/asm/flat.h @@ -0,0 +1,12 @@ +#ifndef __ASM_C6X_FLAT_H +#define __ASM_C6X_FLAT_H + +#define flat_argvp_envp_on_stack() 0 +#define flat_old_ram_flag(flags) (flags) +#define flat_reloc_valid(reloc, size) ((reloc) <= (size)) +#define flat_get_addr_from_rp(rp, relval, flags, p) get_unaligned(rp) +#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val, rp) +#define flat_get_relocate_addr(rel) (rel) +#define flat_set_persistent(relval, p) 0 + +#endif /* __ASM_C6X_FLAT_H */ diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h index 696804475f55..852afb209afb 100644 --- a/arch/c6x/include/asm/setup.h +++ b/arch/c6x/include/asm/setup.h @@ -12,6 +12,7 @@ #define _ASM_C6X_SETUP_H #include <uapi/asm/setup.h> +#include <linux/types.h> #ifndef __ASSEMBLY__ extern int c6x_add_memory(phys_addr_t start, unsigned long size); |