Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 3a32e92..fd2f9bf 100644 (file)
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -16,17 +16,16 @@ struct sys_timer;
 
 struct machine_desc {
        /*
-        * Note! The first five elements are used
+        * Note! The first four elements are used
         * by assembler code in head-armv.S
         */
        unsigned int            nr;             /* architecture number  */
-       unsigned int            phys_ram;       /* start of physical ram */
        unsigned int            phys_io;        /* start of physical io */
        unsigned int            io_pg_offst;    /* byte offset for io 
                                                 * page tabe entry      */
 
        const char              *name;          /* architecture name    */
-       unsigned int            param_offset;   /* parameter page       */
+       unsigned long           boot_params;    /* tagged list          */
 
        unsigned int            video_start;    /* start of video RAM   */
        unsigned int            video_end;      /* end of video RAM     */
@@ -48,44 +47,13 @@ struct machine_desc {
  * Set of macros to define architecture features.  This is built into
  * a table by the linker.
  */
-#define MACHINE_START(_type,_name)             \
-const struct machine_desc __mach_desc_##_type  \
- __attribute__((__section__(".arch.info"))) = {        \
-       .nr             = MACH_TYPE_##_type,    \
+#define MACHINE_START(_type,_name)                     \
+static const struct machine_desc __mach_desc_##_type   \
+ __attribute_used__                                    \
+ __attribute__((__section__(".arch.info.init"))) = {   \
+       .nr             = MACH_TYPE_##_type,            \
        .name           = _name,
 
-#define MAINTAINER(n)
-
-#define BOOT_MEM(_pram,_pio,_vio)              \
-       .phys_ram       = _pram,                \
-       .phys_io        = _pio,                 \
-       .io_pg_offst    = ((_vio)>>18)&0xfffc,
-
-#define BOOT_PARAMS(_params)                   \
-       .param_offset   = _params,
-
-#define VIDEO(_start,_end)                     \
-       .video_start    = _start,               \
-       .video_end      = _end,
-
-#define DISABLE_PARPORT(_n)                    \
-       .reserve_lp##_n = 1,
-
-#define SOFT_REBOOT                            \
-       .soft_reboot    = 1,
-
-#define FIXUP(_func)                           \
-       .fixup          = _func,
-
-#define MAPIO(_func)                           \
-       .map_io         = _func,
-
-#define INITIRQ(_func)                         \
-       .init_irq       = _func,
-
-#define INIT_MACHINE(_func)                    \
-       .init_machine   = _func,
-
 #define MACHINE_END                            \
 };