Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[sfrench/cifs-2.6.git] / arch / arm / include / asm / mach / arch.h

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index c43473afde8a0bb1073b5d84eed95c8d21a439d8..060a75e99263dd3613fb40eb1bf43998cae433d1 100644 (file)
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -44,6 +44,9 @@ struct machine_desc {
        unsigned char           reserve_lp1 :1; /* never has lp1        */
        unsigned char           reserve_lp2 :1; /* never has lp2        */
        enum reboot_mode        reboot_mode;    /* default restart mode */
        unsigned char           reserve_lp1 :1; /* never has lp1        */
        unsigned char           reserve_lp2 :1; /* never has lp2        */
        enum reboot_mode        reboot_mode;    /* default restart mode */

+       unsigned                l2c_aux_val;    /* L2 cache aux value   */
+       unsigned                l2c_aux_mask;   /* L2 cache aux mask    */
+       void                    (*l2c_write_sec)(unsigned long, unsigned);

        struct smp_operations   *smp;           /* SMP operations       */
        bool                    (*smp_init)(void);
        void                    (*fixup)(struct tag *, char **);
        struct smp_operations   *smp;           /* SMP operations       */
        bool                    (*smp_init)(void);
        void                    (*fixup)(struct tag *, char **);