Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45701e26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 497a5df7 3083ca23

arch/c6x/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


KBUILD_DEFCONFIG := dsk6455_defconfig



cflags-y += -mno-dsbt -msdata=none

cflags-y += -mno-dsbt -msdata=none -D__linux__



cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/c6x/include/asm/dma-mapping.h

+8 −0
Original line number Diff line number Diff line
@@ -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))

arch/c6x/include/asm/flat.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#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 */

arch/c6x/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -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);