diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-27 21:36:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-27 21:36:50 -0400 |
| commit | 1857a5b65c52be3e8837cc68d0ee3f4741c5c45f (patch) | |
| tree | 1cde27c608ae0457df529f1d483f3ae3ea2dc2b7 /arch/arc/kernel/devtree.c | |
| parent | 8dd68eb3cae6ec74ffbbe592ec7780e6e16e3913 (diff) | |
| parent | 2328af0c9ce89d3ec121ba832c4e6faeff9e70ac (diff) | |
Merge tag 'arc-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
"Some SMP changes, a ptrace request for NPTL debugging, bunch of build
breakages/warnings"
* tag 'arc-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [SMP] Enable icache coherency
ARC: [SMP] Fix IPI IRQ registration
ARC: Implement ptrace(PTRACE_GET_THREAD_AREA)
ARC: optimize kernel bss clearing in early boot code
ARC: Fix build breakage for !CONFIG_ARC_DW2_UNWIND
ARC: fix build warning in devtree
ARC: remove checks for CONFIG_ARC_MMU_V4
Diffstat (limited to 'arch/arc/kernel/devtree.c')
| -rw-r--r-- | arch/arc/kernel/devtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c index 0b3ef4025d89..fffdb5e41b20 100644 --- a/arch/arc/kernel/devtree.c +++ b/arch/arc/kernel/devtree.c | |||
| @@ -41,7 +41,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt) | |||
| 41 | { | 41 | { |
| 42 | const struct machine_desc *mdesc; | 42 | const struct machine_desc *mdesc; |
| 43 | unsigned long dt_root; | 43 | unsigned long dt_root; |
| 44 | void *clk; | 44 | const void *clk; |
| 45 | int len; | 45 | int len; |
| 46 | 46 | ||
| 47 | if (!early_init_dt_scan(dt)) | 47 | if (!early_init_dt_scan(dt)) |