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

Commit 5be95b7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel 

Pull arch/hexagon updates from Richard Kuo:
 "Build cleanup and a few misc fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  Hexagon: fix signal delivery for debug traps
  Hexagon: set ARCH_DMA_MINALIGN
  Hexagon: fix alignment of init_task in RW_DATA_SECTION
  hexagon: Fix build failures in linux-next
parents 971d9e07 8914d7e8

arch/hexagon/include/asm/cache.h

+3 −1
Original line number Diff line number Diff line 
/*

 * Cache definitions for the Hexagon architecture

 *

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2011,2014 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -25,6 +25,8 @@ 
#define L1_CACHE_SHIFT		(5)

#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)



#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES



#define __cacheline_aligned	__aligned(L1_CACHE_BYTES)

#define ____cacheline_aligned	__aligned(L1_CACHE_BYTES)

arch/hexagon/include/asm/cacheflush.h

+19 −17
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ 
#ifndef _ASM_CACHEFLUSH_H

#define _ASM_CACHEFLUSH_H



#include <linux/cache.h>

#include <linux/mm.h>

#include <asm/string.h>

#include <asm-generic/cacheflush.h>

#include <linux/mm_types.h>



/* Cache flushing:

 *
@@ -41,6 +38,20 @@ 
#define LINESIZE	32

#define LINEBITS	5



#define flush_cache_all()			do { } while (0)

#define flush_cache_mm(mm)			do { } while (0)

#define flush_cache_dup_mm(mm)			do { } while (0)

#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)

#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0

#define flush_dcache_page(page)			do { } while (0)

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_page(vma, pg)		do { } while (0)

#define flush_icache_user_range(vma, pg, adr, len)	do { } while (0)

#define flush_cache_vmap(start, end)		do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



/*

 * Flush Dcache range through current map.

 */
@@ -49,7 +60,6 @@ extern void flush_dcache_range(unsigned long start, unsigned long end); 
/*

 * Flush Icache range through current map.

 */

#undef flush_icache_range

extern void flush_icache_range(unsigned long start, unsigned long end);



/*
@@ -79,19 +89,11 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, 
	/*  generic_ptrace_pokedata doesn't wind up here, does it?  */

}



#undef copy_to_user_page

static inline void copy_to_user_page(struct vm_area_struct *vma,

					     struct page *page,

					     unsigned long vaddr,

					     void *dst, void *src, int len)

{

	memcpy(dst, src, len);

	if (vma->vm_flags & VM_EXEC) {

		flush_icache_range((unsigned long) dst,

		(unsigned long) dst + len);

	}

}

void copy_to_user_page(struct vm_area_struct *vma, struct page *page,

		       unsigned long vaddr, void *dst, void *src, int len);



#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)



extern void hexagon_inv_dcache_range(unsigned long start, unsigned long end);

extern void hexagon_clean_dcache_range(unsigned long start, unsigned long end);

arch/hexagon/include/asm/io.h

+0 −5
Original line number Diff line number Diff line
@@ -24,14 +24,9 @@ 
#ifdef __KERNEL__



#include <linux/types.h>

#include <linux/delay.h>

#include <linux/vmalloc.h>

#include <asm/string.h>

#include <asm/mem-layout.h>

#include <asm/iomap.h>

#include <asm/page.h>

#include <asm/cacheflush.h>

#include <asm/tlbflush.h>



/*

 * We don't have PCI yet.

arch/hexagon/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include <linux/init.h>

#include <linux/delay.h>

#include <linux/bootmem.h>

#include <linux/mmzone.h>

#include <linux/mm.h>

arch/hexagon/kernel/traps.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Kernel traps/events for Hexagon processor

 *

 * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -423,7 +423,7 @@ void do_trap0(struct pt_regs *regs) 
			 */

			info.si_code = TRAP_BRKPT;

			info.si_addr = (void __user *) pt_elr(regs);

			send_sig_info(SIGTRAP, &info, current);

			force_sig_info(SIGTRAP, &info, current);

		} else {

#ifdef CONFIG_KGDB

			kgdb_handle_exception(pt_cause(regs), SIGTRAP,