aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/mach/arch.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-04 12:13:06 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-04 12:13:06 +0200
commit710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch)
treef9b09b722bf511841539173d946f90a20fc2e59a /arch/arm/include/asm/mach/arch.h
parent74c355fbdfedd3820046dba4f537876cea54c207 (diff)
parentb273fa9716aa1564bee88ceee62f9042981cdc81 (diff)
downloadkernel_samsung_crespo-710054ba25c0d1f8f41c22ce13ba336503fb5318.zip
kernel_samsung_crespo-710054ba25c0d1f8f41c22ce13ba336503fb5318.tar.gz
kernel_samsung_crespo-710054ba25c0d1f8f41c22ce13ba336503fb5318.tar.bz2
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'arch/arm/include/asm/mach/arch.h')
-rw-r--r--arch/arm/include/asm/mach/arch.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index bf13b81..946f4d7 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -18,6 +18,8 @@ struct machine_desc {
unsigned int nr; /* architecture number */
const char *name; /* architecture name */
unsigned long boot_params; /* tagged list */
+ const char **dt_compat; /* array of device tree
+ * 'compatible' strings */
unsigned int nr_irqs; /* number of IRQs */
@@ -48,6 +50,13 @@ struct machine_desc {
extern struct machine_desc *machine_desc;
/*
+ * Machine type table - also only accessible during boot
+ */
+extern struct machine_desc __arch_info_begin[], __arch_info_end[];
+#define for_each_machine_desc(p) \
+ for (p = __arch_info_begin; p < __arch_info_end; p++)
+
+/*
* Set of macros to define architecture features. This is built into
* a table by the linker.
*/