Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nios2-fixes-v4.0-final' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 fixes from Ley Foon Tan:
"There are 3 arch/nios2 fixes for 4.0 final:
- fix cache coherency issue when debugging with gdb
- move restart_block to struct task_struct (aligned with other
architectures)
- fix for missing registers defines for ptrace"
* tag 'nios2-fixes-v4.0-final' of git://git.rocketboards.org/linux-socfpga-next:
nios2: fix cache coherency issue when debug with gdb
nios2: add missing ptrace registers defines
nios2: signal: Move restart_block to struct task_struct
+9
-11
-4
arch/nios2/include/asm/thread_info.h
-4
arch/nios2/include/asm/thread_info.h
···
47
47
0-0x7FFFFFFF for user-thead
48
48
0-0xFFFFFFFF for kernel-thread
49
49
*/
50
-
struct restart_block restart_block;
51
50
struct pt_regs *regs;
52
51
};
53
52
···
63
64
.cpu = 0, \
64
65
.preempt_count = INIT_PREEMPT_COUNT, \
65
66
.addr_limit = KERNEL_DS, \
66
-
.restart_block = { \
67
-
.fn = do_no_restart_syscall, \
68
-
}, \
69
67
}
70
68
71
69
#define init_thread_info (init_thread_union.thread_info)
+7
-2
arch/nios2/include/uapi/asm/ptrace.h
+7
-2
arch/nios2/include/uapi/asm/ptrace.h
···
60
60
#define PTR_IPENDING 37
61
61
#define PTR_CPUID 38
62
62
#define PTR_CTL6 39
63
-
#define PTR_CTL7 40
63
+
#define PTR_EXCEPTION 40
64
64
#define PTR_PTEADDR 41
65
65
#define PTR_TLBACC 42
66
66
#define PTR_TLBMISC 43
67
+
#define PTR_ECCINJ 44
68
+
#define PTR_BADADDR 45
69
+
#define PTR_CONFIG 46
70
+
#define PTR_MPUBASE 47
71
+
#define PTR_MPUACC 48
67
72
68
-
#define NUM_PTRACE_REG (PTR_TLBMISC + 1)
73
+
#define NUM_PTRACE_REG (PTR_MPUACC + 1)
69
74
70
75
/* User structures for general purpose registers. */
71
76
struct user_pt_regs {
+1
-1
arch/nios2/kernel/entry.S
+1
-1
arch/nios2/kernel/entry.S
···
161
161
***********************************************************************
162
162
*/
163
163
ENTRY(handle_trap)
164
-
ldw r24, -4(ea) /* instruction that caused the exception */
164
+
ldwio r24, -4(ea) /* instruction that caused the exception */
165
165
srli r24, r24, 4
166
166
andi r24, r24, 0x7c
167
167
movia r9,trap_table
+1
-1
arch/nios2/kernel/signal.c
+1
-1
arch/nios2/kernel/signal.c
···
43
43
int err;
44
44
45
45
/* Always make any pending restarted system calls return -EINTR */
46
-
current_thread_info()->restart_block.fn = do_no_restart_syscall;
46
+
current->restart_block.fn = do_no_restart_syscall;
47
47
48
48
err = __get_user(temp, &uc->uc_mcontext.version);
49
49
if (temp != MCONTEXT_VERSION)
-3
arch/nios2/mm/cacheflush.c
-3
arch/nios2/mm/cacheflush.c
···
23
23
end += (cpuinfo.dcache_line_size - 1);
24
24
end &= ~(cpuinfo.dcache_line_size - 1);
25
25
26
-
if (end > start + cpuinfo.dcache_size)
27
-
end = start + cpuinfo.dcache_size;
28
-
29
26
for (addr = start; addr < end; addr += cpuinfo.dcache_line_size) {
30
27
__asm__ __volatile__ (" flushda 0(%0)\n"
31
28
: /* Outputs */