Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+38
-27
+3
-1
arch/hexagon/include/asm/cache.h
+3
-1
arch/hexagon/include/asm/cache.h
···
1
1
/*
2
2
* Cache definitions for the Hexagon architecture
3
3
*
4
-
* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
4
+
* Copyright (c) 2010-2011,2014 The Linux Foundation. All rights reserved.
5
5
*
6
6
* This program is free software; you can redistribute it and/or modify
7
7
* it under the terms of the GNU General Public License version 2 and
···
24
24
/* Bytes per L1 cache line */
25
25
#define L1_CACHE_SHIFT (5)
26
26
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
27
+
28
+
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
27
29
28
30
#define __cacheline_aligned __aligned(L1_CACHE_BYTES)
29
31
#define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
+19
-17
arch/hexagon/include/asm/cacheflush.h
+19
-17
arch/hexagon/include/asm/cacheflush.h
···
21
21
#ifndef _ASM_CACHEFLUSH_H
22
22
#define _ASM_CACHEFLUSH_H
23
23
24
-
#include <linux/cache.h>
25
-
#include <linux/mm.h>
26
-
#include <asm/string.h>
27
-
#include <asm-generic/cacheflush.h>
24
+
#include <linux/mm_types.h>
28
25
29
26
/* Cache flushing:
30
27
*
···
38
41
#define LINESIZE 32
39
42
#define LINEBITS 5
40
43
44
+
#define flush_cache_all() do { } while (0)
45
+
#define flush_cache_mm(mm) do { } while (0)
46
+
#define flush_cache_dup_mm(mm) do { } while (0)
47
+
#define flush_cache_range(vma, start, end) do { } while (0)
48
+
#define flush_cache_page(vma, vmaddr, pfn) do { } while (0)
49
+
#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
50
+
#define flush_dcache_page(page) do { } while (0)
51
+
#define flush_dcache_mmap_lock(mapping) do { } while (0)
52
+
#define flush_dcache_mmap_unlock(mapping) do { } while (0)
53
+
#define flush_icache_page(vma, pg) do { } while (0)
54
+
#define flush_icache_user_range(vma, pg, adr, len) do { } while (0)
55
+
#define flush_cache_vmap(start, end) do { } while (0)
56
+
#define flush_cache_vunmap(start, end) do { } while (0)
57
+
41
58
/*
42
59
* Flush Dcache range through current map.
43
60
*/
···
60
49
/*
61
50
* Flush Icache range through current map.
62
51
*/
63
-
#undef flush_icache_range
64
52
extern void flush_icache_range(unsigned long start, unsigned long end);
65
53
66
54
/*
···
89
79
/* generic_ptrace_pokedata doesn't wind up here, does it? */
90
80
}
91
81
92
-
#undef copy_to_user_page
93
-
static inline void copy_to_user_page(struct vm_area_struct *vma,
94
-
struct page *page,
95
-
unsigned long vaddr,
96
-
void *dst, void *src, int len)
97
-
{
98
-
memcpy(dst, src, len);
99
-
if (vma->vm_flags & VM_EXEC) {
100
-
flush_icache_range((unsigned long) dst,
101
-
(unsigned long) dst + len);
102
-
}
103
-
}
82
+
void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
83
+
unsigned long vaddr, void *dst, void *src, int len);
104
84
85
+
#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
86
+
memcpy(dst, src, len)
105
87
106
88
extern void hexagon_inv_dcache_range(unsigned long start, unsigned long end);
107
89
extern void hexagon_clean_dcache_range(unsigned long start, unsigned long end);
-5
arch/hexagon/include/asm/io.h
-5
arch/hexagon/include/asm/io.h
···
24
24
#ifdef __KERNEL__
25
25
26
26
#include <linux/types.h>
27
-
#include <linux/delay.h>
28
-
#include <linux/vmalloc.h>
29
-
#include <asm/string.h>
30
-
#include <asm/mem-layout.h>
31
27
#include <asm/iomap.h>
32
28
#include <asm/page.h>
33
29
#include <asm/cacheflush.h>
34
-
#include <asm/tlbflush.h>
35
30
36
31
/*
37
32
* We don't have PCI yet.
+1
arch/hexagon/kernel/setup.c
+1
arch/hexagon/kernel/setup.c
+2
-2
arch/hexagon/kernel/traps.c
+2
-2
arch/hexagon/kernel/traps.c
···
1
1
/*
2
2
* Kernel traps/events for Hexagon processor
3
3
*
4
-
* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
4
+
* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
5
5
*
6
6
* This program is free software; you can redistribute it and/or modify
7
7
* it under the terms of the GNU General Public License version 2 and
···
423
423
*/
424
424
info.si_code = TRAP_BRKPT;
425
425
info.si_addr = (void __user *) pt_elr(regs);
426
-
send_sig_info(SIGTRAP, &info, current);
426
+
force_sig_info(SIGTRAP, &info, current);
427
427
} else {
428
428
#ifdef CONFIG_KGDB
429
429
kgdb_handle_exception(pt_cause(regs), SIGTRAP,
+2
-2
arch/hexagon/kernel/vmlinux.lds.S
+2
-2
arch/hexagon/kernel/vmlinux.lds.S
···
1
1
/*
2
2
* Linker script for Hexagon kernel
3
3
*
4
-
* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
4
+
* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
5
5
*
6
6
* This program is free software; you can redistribute it and/or modify
7
7
* it under the terms of the GNU General Public License version 2 and
···
59
59
INIT_DATA_SECTION(PAGE_SIZE)
60
60
61
61
_sdata = .;
62
-
RW_DATA_SECTION(32,PAGE_SIZE,PAGE_SIZE)
62
+
RW_DATA_SECTION(32,PAGE_SIZE,_THREAD_SIZE)
63
63
RO_DATA_SECTION(PAGE_SIZE)
64
64
_edata = .;
65
65
+10
arch/hexagon/mm/cache.c
+10
arch/hexagon/mm/cache.c
···
127
127
local_irq_restore(flags);
128
128
mb();
129
129
}
130
+
131
+
void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
132
+
unsigned long vaddr, void *dst, void *src, int len)
133
+
{
134
+
memcpy(dst, src, len);
135
+
if (vma->vm_flags & VM_EXEC) {
136
+
flush_icache_range((unsigned long) dst,
137
+
(unsigned long) dst + len);
138
+
}
139
+
}