diff --git a/[refs] b/[refs] index a99c89ea5f74..849437361d0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f12bfe5a498747a9a66f135a67aa8e1caa819dc +refs/heads/master: 7c2740f1c1a7ff2767a92042f39edad7fad95c92 diff --git a/trunk/include/asm-mips/mach-ip27/mmzone.h b/trunk/include/asm-mips/mach-ip27/mmzone.h index d3f566362e9d..986a3b9b59a7 100644 --- a/trunk/include/asm-mips/mach-ip27/mmzone.h +++ b/trunk/include/asm-mips/mach-ip27/mmzone.h @@ -10,7 +10,6 @@ #define LEVELS_PER_SLICE 128 struct slice_data { - unsigned long irq_alloc_mask[2]; unsigned long irq_enable_mask[2]; int level_to_irq[LEVELS_PER_SLICE]; }; @@ -20,6 +19,7 @@ struct hub_data { DECLARE_BITMAP(h_bigwin_used, HUB_NUM_BIG_WINDOW); cpumask_t h_cpus; unsigned long slice_map; + unsigned long irq_alloc_mask[2]; struct slice_data slice[2]; };