mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
b1286f4e9a
Pull ARM updates from Russell King: "Here's the updates for ARM for this merge window, which cover quite a variety of areas. There's a bunch of patch series from Will tackling various bugs like the PROT_NONE handling, ASID allocation, cluster boot protocol and ASID TLB tagging updates. We move to a build-time sorted exception table rather than doing the sorting at run-time, add support for the secure computing filter, and some updates to the perf code. We also have sorted out the placement of some headers, fixed some build warnings, fixed some hotplug problems with the per-cpu TWD code." * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (73 commits) ARM: 7594/1: Add .smp entry for REALVIEW_EB ARM: 7599/1: head: Remove boot-time HYP mode check for v5 and below ARM: 7598/1: net: bpf_jit_32: fix sp-relative load/stores offsets. ARM: 7595/1: syscall: rework ordering in syscall_trace_exit ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep ARM: 7597/1: net: bpf_jit_32: fix kzalloc gfp/size mismatch. ARM: 7593/1: nommu: do not enable DCACHE_WORD_ACCESS when !CONFIG_MMU ARM: 7592/1: nommu: prevent generation of kernel unaligned memory accesses ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH < v6 ARM: 7590/1: /proc/interrupts: limit the display of IPIs to online CPUs only ARM: 7587/1: implement optimized percpu variable access ARM: 7589/1: integrator: pass the lm resource to amba ARM: 7588/1: amba: create a resource parent registrator ARM: 7582/2: rename kvm_seq to vmalloc_seq so to avoid confusion with KVM ARM: 7585/1: kernel: fix nr_cpu_ids check in DT logical map init ARM: 7584/1: perf: fix link error when CONFIG_HW_PERF_EVENTS is not selected ARM: gic: use a private mapping for CPU target interfaces ARM: kernel: add logical mappings look-up ARM: kernel: add cpu logical map DT init in setup_arch ARM: kernel: add device tree init map function ...
34 lines
833 B
C
34 lines
833 B
C
/*
|
|
* arch/arm/include/asm/prom.h
|
|
*
|
|
* Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
#ifndef __ASMARM_PROM_H
|
|
#define __ASMARM_PROM_H
|
|
|
|
#define HAVE_ARCH_DEVTREE_FIXUPS
|
|
|
|
#ifdef CONFIG_OF
|
|
|
|
extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
|
|
extern void arm_dt_memblock_reserve(void);
|
|
extern void __init arm_dt_init_cpu_maps(void);
|
|
|
|
#else /* CONFIG_OF */
|
|
|
|
static inline struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void arm_dt_memblock_reserve(void) { }
|
|
static inline void arm_dt_init_cpu_maps(void) { }
|
|
|
|
#endif /* CONFIG_OF */
|
|
#endif /* ASMARM_PROM_H */
|